正在显示
131 个修改的文件
包含
883 行增加
和
1827 行删除
| @@ -43,9 +43,15 @@ public class MainActivity extends AppCompatActivity { | @@ -43,9 +43,15 @@ public class MainActivity extends AppCompatActivity { | ||
| 43 | super.onCreate(savedInstanceState); | 43 | super.onCreate(savedInstanceState); |
| 44 | setContentView(R.layout.activity_main); | 44 | setContentView(R.layout.activity_main); |
| 45 | ButterKnife.bind(this); | 45 | ButterKnife.bind(this); |
| 46 | + rl_home_close.setOnClickListener(new View.OnClickListener() { | ||
| 47 | + @Override | ||
| 48 | + public void onClick(View v) { | ||
| 49 | + finish(); | ||
| 50 | + } | ||
| 51 | + }); | ||
| 46 | } | 52 | } |
| 47 | 53 | ||
| 48 | - @OnClick({R.id.btn_home_enter_class,R.id.btn_home_enter_publisher,R.id.rl_home_close}) | 54 | + @OnClick({R.id.btn_home_enter_class,R.id.btn_home_enter_publisher}) |
| 49 | public void onViewClicked(View view) { | 55 | public void onViewClicked(View view) { |
| 50 | if(TextUtils.isEmpty(joinClass())){ | 56 | if(TextUtils.isEmpty(joinClass())){ |
| 51 | return; | 57 | return; |
| @@ -69,9 +75,7 @@ public class MainActivity extends AppCompatActivity { | @@ -69,9 +75,7 @@ public class MainActivity extends AppCompatActivity { | ||
| 69 | intents.putStringArrayListExtra("init",arrayList); | 75 | intents.putStringArrayListExtra("init",arrayList); |
| 70 | startActivity(intents); | 76 | startActivity(intents); |
| 71 | break; | 77 | break; |
| 72 | - case R.id.rl_home_close: | ||
| 73 | - this.finish(); | ||
| 74 | - break; | 78 | + |
| 75 | } | 79 | } |
| 76 | } | 80 | } |
| 77 | private String classId=""; | 81 | private String classId=""; |
| @@ -10,6 +10,7 @@ import android.support.design.widget.TabLayout; | @@ -10,6 +10,7 @@ import android.support.design.widget.TabLayout; | ||
| 10 | import android.support.v7.app.AlertDialog; | 10 | import android.support.v7.app.AlertDialog; |
| 11 | import android.support.v7.app.AppCompatActivity; | 11 | import android.support.v7.app.AppCompatActivity; |
| 12 | import android.text.TextUtils; | 12 | import android.text.TextUtils; |
| 13 | +import android.util.DisplayMetrics; | ||
| 13 | import android.util.Log; | 14 | import android.util.Log; |
| 14 | import android.view.SurfaceHolder; | 15 | import android.view.SurfaceHolder; |
| 15 | import android.view.SurfaceView; | 16 | import android.view.SurfaceView; |
| @@ -424,6 +425,38 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList | @@ -424,6 +425,38 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList | ||
| 424 | if(!checkPermission()){ | 425 | if(!checkPermission()){ |
| 425 | return; | 426 | return; |
| 426 | } | 427 | } |
| 428 | + | ||
| 429 | + DisplayMetrics dm = new DisplayMetrics(); | ||
| 430 | + getWindowManager().getDefaultDisplay().getMetrics(dm); | ||
| 431 | + int widthPixels = dm.widthPixels; | ||
| 432 | + int heightPixels = dm.heightPixels; | ||
| 433 | + if(surfaceviewPlayVideo!=null){ | ||
| 434 | +// int margin = (mSurfaceViewWidth - w) / 2; | ||
| 435 | + SurfaceHolder surfaceHolder=surfaceviewPlayVideo.getHolder(); | ||
| 436 | + RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams( | ||
| 437 | + RelativeLayout.LayoutParams.MATCH_PARENT, | ||
| 438 | + RelativeLayout.LayoutParams.MATCH_PARENT); | ||
| 439 | + int setWidth=640; | ||
| 440 | + int setHeight=480; | ||
| 441 | + int leftW=0; | ||
| 442 | + int leftH=0; | ||
| 443 | + int width=surfaceviewPlayVideo.getWidth(); | ||
| 444 | + int height=surfaceviewPlayVideo.getHeight(); | ||
| 445 | + if(width>height){ | ||
| 446 | + setWidth=width; | ||
| 447 | + setHeight=height*(4/3); | ||
| 448 | + leftH=0; | ||
| 449 | + leftW=(widthPixels-setHeight)/2; | ||
| 450 | + }else{ | ||
| 451 | + | ||
| 452 | + } | ||
| 453 | + lp.setMargins(leftW, 0, leftW, 0); | ||
| 454 | +// surfaceHolder.setFixedSize(640,480); | ||
| 455 | + XdyLogUtil.e("surface 高度计算:",surfaceviewPlayVideo.getWidth()+"高:"+surfaceviewPlayVideo.getHeight()); | ||
| 456 | + surfaceviewPlayVideo.setLayoutParams(lp); | ||
| 457 | + XdyLogUtil.e("surface 设置后的高度的高度计算:",surfaceviewPlayVideo.getWidth()+"高:"+surfaceviewPlayVideo.getHeight()); | ||
| 458 | + | ||
| 459 | + } | ||
| 427 | xdySdk.api("playVideo", response + "", surfaceviewPlayVideo, VideoPlayActivity.this); | 460 | xdySdk.api("playVideo", response + "", surfaceviewPlayVideo, VideoPlayActivity.this); |
| 428 | // img_playVideo_novideo.setVisibility(View.GONE); | 461 | // img_playVideo_novideo.setVisibility(View.GONE); |
| 429 | img_playVideo_novideo.setImageResource(R.mipmap.no_video); | 462 | img_playVideo_novideo.setImageResource(R.mipmap.no_video); |
| @@ -518,6 +551,11 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList | @@ -518,6 +551,11 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList | ||
| 518 | case "301": | 551 | case "301": |
| 519 | progressDialogDismiss(); | 552 | progressDialogDismiss(); |
| 520 | break; | 553 | break; |
| 554 | + case "911": | ||
| 555 | + progressDialogDismiss(); | ||
| 556 | + exit(); | ||
| 557 | + ToastUtil.showToastshort(errorEntity.getReson(),this); | ||
| 558 | + break; | ||
| 521 | case "10000": | 559 | case "10000": |
| 522 | ToastUtil.showToastshort(errorEntity.getReson(), this); | 560 | ToastUtil.showToastshort(errorEntity.getReson(), this); |
| 523 | break; | 561 | break; |
| @@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
| 44 | style="@style/home_input_edit_style" | 44 | style="@style/home_input_edit_style" |
| 45 | android:hint="请输入课堂号" | 45 | android:hint="请输入课堂号" |
| 46 | android:inputType="number" | 46 | android:inputType="number" |
| 47 | - android:text="748222373"/> | 47 | + android:text="763307927"/> |
| 48 | 48 | ||
| 49 | <View | 49 | <View |
| 50 | style="@style/ui_divider_line_horizontal" | 50 | style="@style/ui_divider_line_horizontal" |
| @@ -92,6 +92,7 @@ | @@ -92,6 +92,7 @@ | ||
| 92 | android:background="@mipmap/audio_mode" | 92 | android:background="@mipmap/audio_mode" |
| 93 | android:visibility="gone" | 93 | android:visibility="gone" |
| 94 | tools:visibility="visible" | 94 | tools:visibility="visible" |
| 95 | + android:scaleType="fitCenter" | ||
| 95 | android:layout_alignParentRight="true" | 96 | android:layout_alignParentRight="true" |
| 96 | android:layout_alignParentBottom="true" | 97 | android:layout_alignParentBottom="true" |
| 97 | /> | 98 | /> |
| @@ -187,4 +188,154 @@ | @@ -187,4 +188,154 @@ | ||
| 187 | android:layout_width="match_parent" | 188 | android:layout_width="match_parent" |
| 188 | android:layout_height="wrap_content"/> | 189 | android:layout_height="wrap_content"/> |
| 189 | </FrameLayout> | 190 | </FrameLayout> |
| 191 | + | ||
| 192 | + <FrameLayout | ||
| 193 | + android:layout_width="match_parent" | ||
| 194 | + android:layout_height="@dimen/ui_titlebar_height"> | ||
| 195 | + <RelativeLayout | ||
| 196 | + android:layout_width="match_parent" | ||
| 197 | + android:layout_height="match_parent"> | ||
| 198 | + <!--倒计时--> | ||
| 199 | + <RelativeLayout | ||
| 200 | + android:id="@+id/ll_home_tv_exam_countdown" | ||
| 201 | + android:layout_width="wrap_content" | ||
| 202 | + android:layout_height="match_parent" | ||
| 203 | + android:orientation="vertical"> | ||
| 204 | + <TextView | ||
| 205 | + android:id="@+id/tv_exam_countdown" | ||
| 206 | + android:layout_width="wrap_content" | ||
| 207 | + android:layout_height="wrap_content" | ||
| 208 | + android:layout_marginRight="5dp" | ||
| 209 | + android:layout_alignParentLeft="true" | ||
| 210 | + android:text="30s" | ||
| 211 | + android:textColor="@color/actionsheet_red" | ||
| 212 | + android:background="@color/white" | ||
| 213 | + /> | ||
| 214 | + </RelativeLayout> | ||
| 215 | + <RelativeLayout | ||
| 216 | + android:layout_marginLeft="5dp" | ||
| 217 | + android:layout_toRightOf="@+id/ll_home_tv_exam_countdown" | ||
| 218 | + android:layout_width="match_parent" | ||
| 219 | + android:layout_height="match_parent" | ||
| 220 | + > | ||
| 221 | + <!--单选多选--> | ||
| 222 | + <LinearLayout | ||
| 223 | + android:layout_width="match_parent" | ||
| 224 | + android:layout_height="match_parent" | ||
| 225 | + android:layout_toLeftOf="@+id/ll_exam_submit" | ||
| 226 | + android:gravity="center" | ||
| 227 | + android:visibility="gone" | ||
| 228 | + android:orientation="horizontal" | ||
| 229 | + > | ||
| 230 | + <CheckBox | ||
| 231 | + android:id="@+id/rb_exam_A" | ||
| 232 | + style="@style/exam_cb_style" | ||
| 233 | + android:drawableLeft="@drawable/selector_exam" | ||
| 234 | + android:text="A" /> | ||
| 235 | + | ||
| 236 | + <CheckBox | ||
| 237 | + android:id="@+id/rb_exam_B" | ||
| 238 | + style="@style/exam_cb_style" | ||
| 239 | + android:drawableLeft="@drawable/selector_exam" | ||
| 240 | + android:text="B" /> | ||
| 241 | + | ||
| 242 | + <CheckBox | ||
| 243 | + android:id="@+id/rb_exam_C" | ||
| 244 | + style="@style/exam_cb_style" | ||
| 245 | + android:drawableLeft="@drawable/selector_exam" | ||
| 246 | + android:text="C" /> | ||
| 247 | + | ||
| 248 | + <CheckBox | ||
| 249 | + android:id="@+id/rb_exam_D" | ||
| 250 | + style="@style/exam_cb_style" | ||
| 251 | + android:drawableLeft="@drawable/selector_exam" | ||
| 252 | + android:text="D" /> | ||
| 253 | + </LinearLayout> | ||
| 254 | + <!--对错--> | ||
| 255 | + <LinearLayout | ||
| 256 | + android:id="@+id/ll_exam_selectRightOrWrong" | ||
| 257 | + android:layout_width="match_parent" | ||
| 258 | + android:layout_height="match_parent" | ||
| 259 | + android:layout_toLeftOf="@+id/ll_exam_submit" | ||
| 260 | + android:gravity="center" | ||
| 261 | + android:visibility="gone" | ||
| 262 | + android:orientation="horizontal" | ||
| 263 | + > | ||
| 264 | + <CheckBox | ||
| 265 | + android:id="@+id/cb_exam_R" | ||
| 266 | + style="@style/exam_cb_style" | ||
| 267 | + android:drawableLeft="@drawable/selector_exam" | ||
| 268 | + android:text="正确" /> | ||
| 269 | + | ||
| 270 | + <CheckBox | ||
| 271 | + android:id="@+id/cb_exam_W" | ||
| 272 | + style="@style/exam_cb_style" | ||
| 273 | + android:drawableLeft="@drawable/selector_exam" | ||
| 274 | + android:text="错误" /> | ||
| 275 | + </LinearLayout> | ||
| 276 | + | ||
| 277 | + <LinearLayout | ||
| 278 | + android:id="@+id/ll_exam_filling" | ||
| 279 | + android:layout_width="match_parent" | ||
| 280 | + android:layout_height="match_parent" | ||
| 281 | + android:layout_toLeftOf="@+id/ll_exam_submit" | ||
| 282 | + android:gravity="center" | ||
| 283 | + android:orientation="horizontal" | ||
| 284 | + > | ||
| 285 | + <EditText | ||
| 286 | + android:layout_width="wrap_content" | ||
| 287 | + android:layout_height="wrap_content" | ||
| 288 | + android:layout_weight="1" | ||
| 289 | + android:hint="一" | ||
| 290 | + /> | ||
| 291 | + <EditText | ||
| 292 | + android:layout_width="wrap_content" | ||
| 293 | + android:layout_height="wrap_content" | ||
| 294 | + android:layout_weight="1" | ||
| 295 | + android:hint="二" | ||
| 296 | + /> | ||
| 297 | + | ||
| 298 | + <EditText | ||
| 299 | + android:layout_width="wrap_content" | ||
| 300 | + android:layout_height="wrap_content" | ||
| 301 | + android:layout_weight="1" | ||
| 302 | + android:hint="输入答案" | ||
| 303 | + /> | ||
| 304 | + </LinearLayout> | ||
| 305 | + <!--提交--> | ||
| 306 | + <LinearLayout | ||
| 307 | + android:id="@+id/ll_exam_submit" | ||
| 308 | + android:layout_width="wrap_content" | ||
| 309 | + android:layout_height="match_parent" | ||
| 310 | + android:orientation="horizontal" | ||
| 311 | + android:gravity="center" | ||
| 312 | + android:layout_marginLeft="10dp" | ||
| 313 | + android:layout_alignParentRight="true" | ||
| 314 | + > | ||
| 315 | + <TextView | ||
| 316 | + android:id="@+id/tv_exam_up" | ||
| 317 | + android:layout_width="match_parent" | ||
| 318 | + android:layout_height="wrap_content" | ||
| 319 | + android:layout_weight="1" | ||
| 320 | + android:text="提交" | ||
| 321 | + android:layout_gravity="center_vertical" | ||
| 322 | + android:textColor="@android:color/white" | ||
| 323 | + android:background="@drawable/shape_bg_full_circle_blue" | ||
| 324 | + android:layout_marginRight="10dp" | ||
| 325 | + /> | ||
| 326 | + <TextView | ||
| 327 | + android:id="@+id/tv_exam_cancle" | ||
| 328 | + android:layout_width="match_parent" | ||
| 329 | + android:layout_height="wrap_content" | ||
| 330 | + android:layout_weight="1" | ||
| 331 | + android:text="放弃" | ||
| 332 | + android:layout_gravity="center_vertical" | ||
| 333 | + android:textColor="@android:color/white" | ||
| 334 | + android:background="@drawable/shape_bg_full_circle_blue" | ||
| 335 | + android:layout_marginRight="10dp" | ||
| 336 | + /> | ||
| 337 | + </LinearLayout> | ||
| 338 | + </RelativeLayout> | ||
| 339 | + </RelativeLayout> | ||
| 340 | + </FrameLayout> | ||
| 190 | </LinearLayout> | 341 | </LinearLayout> |
| @@ -182,4 +182,6 @@ | @@ -182,4 +182,6 @@ | ||
| 182 | 182 | ||
| 183 | <!--WheelView 遮盖未选中item的蒙层--> | 183 | <!--WheelView 遮盖未选中item的蒙层--> |
| 184 | <color name="wheel_unselect_color">#B1FFFFFF</color> | 184 | <color name="wheel_unselect_color">#B1FFFFFF</color> |
| 185 | + | ||
| 186 | + <color name="colorSkyBlue">#3dd1ff</color> | ||
| 185 | </resources> | 187 | </resources> |
| @@ -152,4 +152,18 @@ | @@ -152,4 +152,18 @@ | ||
| 152 | <item name="android:background">@null</item> | 152 | <item name="android:background">@null</item> |
| 153 | 153 | ||
| 154 | </style> | 154 | </style> |
| 155 | + | ||
| 156 | + <!--答题卡--> | ||
| 157 | + <style name="exam_cb_style"> | ||
| 158 | + <item name="android:layout_width">wrap_content</item> | ||
| 159 | + <item name="android:layout_height">wrap_content</item> | ||
| 160 | + <item name="android:layout_weight">1</item> | ||
| 161 | + <item name="android:button">@null</item> | ||
| 162 | + <item name="android:drawablePadding">3dp</item> | ||
| 163 | + <item name="android:gravity">center</item> | ||
| 164 | + <item name="android:layout_gravity">center_vertical</item> | ||
| 165 | + <item name="android:padding">5dp</item> | ||
| 166 | + <item name="android:textSize">12sp</item> | ||
| 167 | + <item name="android:textColor">@color/colorSkyBlue</item> | ||
| 168 | + </style> | ||
| 155 | </resources> | 169 | </resources> |
| 1 | -/** | ||
| 2 | - * Automatically generated file. DO NOT MODIFY | ||
| 3 | - */ | ||
| 4 | -package zhangphil.iosdialog.test; | ||
| 5 | - | ||
| 6 | -public final class BuildConfig { | ||
| 7 | - public static final boolean DEBUG = Boolean.parseBoolean("true"); | ||
| 8 | - public static final String APPLICATION_ID = "zhangphil.iosdialog.test"; | ||
| 9 | - public static final String BUILD_TYPE = "debug"; | ||
| 10 | - public static final String FLAVOR = ""; | ||
| 11 | - public static final int VERSION_CODE = -1; | ||
| 12 | - public static final String VERSION_NAME = ""; | ||
| 13 | -} |
| 1 | -/** | ||
| 2 | - * Automatically generated file. DO NOT MODIFY | ||
| 3 | - */ | ||
| 4 | -package zhangphil.iosdialog; | ||
| 5 | - | ||
| 6 | -public final class BuildConfig { | ||
| 7 | - public static final boolean DEBUG = Boolean.parseBoolean("true"); | ||
| 8 | - public static final String APPLICATION_ID = "zhangphil.iosdialog"; | ||
| 9 | - public static final String BUILD_TYPE = "debug"; | ||
| 10 | - public static final String FLAVOR = ""; | ||
| 11 | - public static final int VERSION_CODE = 1; | ||
| 12 | - public static final String VERSION_NAME = "1.0"; | ||
| 13 | -} |
MyApplication/iOS_Dialog_Library/build/generated/source/r/debug/zhangphil/iosdialog/R.java
已删除
100644 → 0
| 1 | -/* AUTO-GENERATED FILE. DO NOT MODIFY. | ||
| 2 | - * | ||
| 3 | - * This class was automatically generated by the | ||
| 4 | - * aapt tool from the resource data it found. It | ||
| 5 | - * should not be modified by hand. | ||
| 6 | - */ | ||
| 7 | - | ||
| 8 | -package zhangphil.iosdialog; | ||
| 9 | - | ||
| 10 | -public final class R { | ||
| 11 | - public static final class anim { | ||
| 12 | - public static int actionsheet_dialog_in=0x7f040000; | ||
| 13 | - public static int actionsheet_dialog_out=0x7f040001; | ||
| 14 | - } | ||
| 15 | - public static final class attr { | ||
| 16 | - } | ||
| 17 | - public static final class color { | ||
| 18 | - public static int actionsheet_blue=0x7f060000; | ||
| 19 | - public static int actionsheet_gray=0x7f060001; | ||
| 20 | - public static int actionsheet_red=0x7f060002; | ||
| 21 | - public static int alertdialog_line=0x7f060003; | ||
| 22 | - public static int black=0x7f060004; | ||
| 23 | - public static int trans=0x7f060005; | ||
| 24 | - } | ||
| 25 | - public static final class dimen { | ||
| 26 | - public static int activity_horizontal_margin=0x7f070000; | ||
| 27 | - public static int activity_vertical_margin=0x7f070001; | ||
| 28 | - } | ||
| 29 | - public static final class drawable { | ||
| 30 | - public static int actionsheet_bottom_normal=0x7f020000; | ||
| 31 | - public static int actionsheet_bottom_pressed=0x7f020001; | ||
| 32 | - public static int actionsheet_bottom_selector=0x7f020002; | ||
| 33 | - public static int actionsheet_middle_normal=0x7f020003; | ||
| 34 | - public static int actionsheet_middle_pressed=0x7f020004; | ||
| 35 | - public static int actionsheet_middle_selector=0x7f020005; | ||
| 36 | - public static int actionsheet_single_normal=0x7f020006; | ||
| 37 | - public static int actionsheet_single_pressed=0x7f020007; | ||
| 38 | - public static int actionsheet_single_selector=0x7f020008; | ||
| 39 | - public static int actionsheet_top_normal=0x7f020009; | ||
| 40 | - public static int actionsheet_top_pressed=0x7f02000a; | ||
| 41 | - public static int actionsheet_top_selector=0x7f02000b; | ||
| 42 | - public static int alert_bg=0x7f02000c; | ||
| 43 | - public static int alert_btn_left_pressed=0x7f02000d; | ||
| 44 | - public static int alert_btn_right_pressed=0x7f02000e; | ||
| 45 | - public static int alert_btn_single_pressed=0x7f02000f; | ||
| 46 | - public static int alertdialog_left_selector=0x7f020010; | ||
| 47 | - public static int alertdialog_right_selector=0x7f020011; | ||
| 48 | - public static int alertdialog_single_selector=0x7f020012; | ||
| 49 | - public static int app_icon1=0x7f020013; | ||
| 50 | - public static int trans_bg=0x7f020014; | ||
| 51 | - } | ||
| 52 | - public static final class id { | ||
| 53 | - public static int btn1=0x7f090000; | ||
| 54 | - public static int btn2=0x7f090001; | ||
| 55 | - public static int btn3=0x7f090002; | ||
| 56 | - public static int btn4=0x7f090003; | ||
| 57 | - public static int btn5=0x7f090004; | ||
| 58 | - public static int btn_neg=0x7f09000b; | ||
| 59 | - public static int btn_pos=0x7f09000d; | ||
| 60 | - public static int img_line=0x7f09000c; | ||
| 61 | - public static int lLayout_bg=0x7f090009; | ||
| 62 | - public static int lLayout_content=0x7f090007; | ||
| 63 | - public static int sLayout_content=0x7f090006; | ||
| 64 | - public static int txt_cancel=0x7f090008; | ||
| 65 | - public static int txt_msg=0x7f09000a; | ||
| 66 | - public static int txt_title=0x7f090005; | ||
| 67 | - } | ||
| 68 | - public static final class layout { | ||
| 69 | - public static int activity_main=0x7f030000; | ||
| 70 | - public static int view_actionsheet=0x7f030001; | ||
| 71 | - public static int view_alertdialog=0x7f030002; | ||
| 72 | - } | ||
| 73 | - public static final class string { | ||
| 74 | - public static int app_name=0x7f080000; | ||
| 75 | - } | ||
| 76 | - public static final class style { | ||
| 77 | - public static int ActionSheetDialogAnimation=0x7f050001; | ||
| 78 | - public static int ActionSheetDialogStyle=0x7f050002; | ||
| 79 | - public static int AlertDialogStyle=0x7f050003; | ||
| 80 | - /** API 11 theme customizations can go here. | ||
| 81 | - API 14 theme customizations can go here. | ||
| 82 | - */ | ||
| 83 | - public static int AppBaseTheme=0x7f050000; | ||
| 84 | - public static int AppTheme=0x7f050004; | ||
| 85 | - } | ||
| 86 | -} |
MyApplication/iOS_Dialog_Library/build/intermediates/blame/res/debug/multi/values-v11.json
已删除
100644 → 0
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "outputFile": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v11\\values-v11.xml", | ||
| 4 | - "map": [ | ||
| 5 | - { | ||
| 6 | - "to": { | ||
| 7 | - "startLine": 2, | ||
| 8 | - "startColumn": 4, | ||
| 9 | - "startOffset": 55, | ||
| 10 | - "endLine": 4, | ||
| 11 | - "endColumn": 12, | ||
| 12 | - "endOffset": 199 | ||
| 13 | - }, | ||
| 14 | - "from": { | ||
| 15 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values-v11\\styles.xml", | ||
| 16 | - "position": { | ||
| 17 | - "startLine": 6, | ||
| 18 | - "startColumn": 4, | ||
| 19 | - "startOffset": 182, | ||
| 20 | - "endLine": 8, | ||
| 21 | - "endColumn": 12, | ||
| 22 | - "endOffset": 328 | ||
| 23 | - } | ||
| 24 | - } | ||
| 25 | - } | ||
| 26 | - ] | ||
| 27 | - } | ||
| 28 | -] |
MyApplication/iOS_Dialog_Library/build/intermediates/blame/res/debug/multi/values-v14.json
已删除
100644 → 0
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "outputFile": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v14\\values-v14.xml", | ||
| 4 | - "map": [ | ||
| 5 | - { | ||
| 6 | - "to": { | ||
| 7 | - "startLine": 2, | ||
| 8 | - "startColumn": 4, | ||
| 9 | - "startOffset": 55, | ||
| 10 | - "endLine": 4, | ||
| 11 | - "endColumn": 12, | ||
| 12 | - "endOffset": 200 | ||
| 13 | - }, | ||
| 14 | - "from": { | ||
| 15 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values-v14\\styles.xml", | ||
| 16 | - "position": { | ||
| 17 | - "startLine": 7, | ||
| 18 | - "startColumn": 4, | ||
| 19 | - "startOffset": 225, | ||
| 20 | - "endLine": 9, | ||
| 21 | - "endColumn": 12, | ||
| 22 | - "endOffset": 372 | ||
| 23 | - } | ||
| 24 | - } | ||
| 25 | - } | ||
| 26 | - ] | ||
| 27 | - } | ||
| 28 | -] |
MyApplication/iOS_Dialog_Library/build/intermediates/blame/res/debug/multi/values.json
已删除
100644 → 0
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "outputFile": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", | ||
| 4 | - "map": [ | ||
| 5 | - { | ||
| 6 | - "to": { | ||
| 7 | - "startLine": 2, | ||
| 8 | - "startColumn": 4, | ||
| 9 | - "startOffset": 55, | ||
| 10 | - "endColumn": 50, | ||
| 11 | - "endOffset": 101 | ||
| 12 | - }, | ||
| 13 | - "from": { | ||
| 14 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\color.xml", | ||
| 15 | - "position": { | ||
| 16 | - "startLine": 6, | ||
| 17 | - "startColumn": 4, | ||
| 18 | - "startOffset": 195, | ||
| 19 | - "endColumn": 50, | ||
| 20 | - "endOffset": 241 | ||
| 21 | - } | ||
| 22 | - } | ||
| 23 | - }, | ||
| 24 | - { | ||
| 25 | - "to": { | ||
| 26 | - "startLine": 3, | ||
| 27 | - "startColumn": 4, | ||
| 28 | - "startOffset": 106, | ||
| 29 | - "endColumn": 50, | ||
| 30 | - "endOffset": 152 | ||
| 31 | - }, | ||
| 32 | - "from": { | ||
| 33 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\color.xml", | ||
| 34 | - "position": { | ||
| 35 | - "startLine": 8, | ||
| 36 | - "startColumn": 4, | ||
| 37 | - "startOffset": 298, | ||
| 38 | - "endColumn": 50, | ||
| 39 | - "endOffset": 344 | ||
| 40 | - } | ||
| 41 | - } | ||
| 42 | - }, | ||
| 43 | - { | ||
| 44 | - "to": { | ||
| 45 | - "startLine": 4, | ||
| 46 | - "startColumn": 4, | ||
| 47 | - "startOffset": 157, | ||
| 48 | - "endColumn": 49, | ||
| 49 | - "endOffset": 202 | ||
| 50 | - }, | ||
| 51 | - "from": { | ||
| 52 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\color.xml", | ||
| 53 | - "position": { | ||
| 54 | - "startLine": 7, | ||
| 55 | - "startColumn": 4, | ||
| 56 | - "startOffset": 247, | ||
| 57 | - "endColumn": 49, | ||
| 58 | - "endOffset": 292 | ||
| 59 | - } | ||
| 60 | - } | ||
| 61 | - }, | ||
| 62 | - { | ||
| 63 | - "to": { | ||
| 64 | - "startLine": 5, | ||
| 65 | - "startColumn": 4, | ||
| 66 | - "startOffset": 207, | ||
| 67 | - "endColumn": 50, | ||
| 68 | - "endOffset": 253 | ||
| 69 | - }, | ||
| 70 | - "from": { | ||
| 71 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\color.xml", | ||
| 72 | - "position": { | ||
| 73 | - "startLine": 5, | ||
| 74 | - "startColumn": 4, | ||
| 75 | - "startOffset": 143, | ||
| 76 | - "endColumn": 50, | ||
| 77 | - "endOffset": 189 | ||
| 78 | - } | ||
| 79 | - } | ||
| 80 | - }, | ||
| 81 | - { | ||
| 82 | - "to": { | ||
| 83 | - "startLine": 6, | ||
| 84 | - "startColumn": 4, | ||
| 85 | - "startOffset": 258, | ||
| 86 | - "endColumn": 39, | ||
| 87 | - "endOffset": 293 | ||
| 88 | - }, | ||
| 89 | - "from": { | ||
| 90 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\color.xml", | ||
| 91 | - "position": { | ||
| 92 | - "startLine": 4, | ||
| 93 | - "startColumn": 4, | ||
| 94 | - "startOffset": 102, | ||
| 95 | - "endColumn": 39, | ||
| 96 | - "endOffset": 137 | ||
| 97 | - } | ||
| 98 | - } | ||
| 99 | - }, | ||
| 100 | - { | ||
| 101 | - "to": { | ||
| 102 | - "startLine": 7, | ||
| 103 | - "startColumn": 4, | ||
| 104 | - "startOffset": 298, | ||
| 105 | - "endColumn": 41, | ||
| 106 | - "endOffset": 335 | ||
| 107 | - }, | ||
| 108 | - "from": { | ||
| 109 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\color.xml", | ||
| 110 | - "position": { | ||
| 111 | - "startLine": 3, | ||
| 112 | - "startColumn": 4, | ||
| 113 | - "startOffset": 59, | ||
| 114 | - "endColumn": 41, | ||
| 115 | - "endOffset": 96 | ||
| 116 | - } | ||
| 117 | - } | ||
| 118 | - }, | ||
| 119 | - { | ||
| 120 | - "to": { | ||
| 121 | - "startLine": 8, | ||
| 122 | - "startColumn": 4, | ||
| 123 | - "startOffset": 340, | ||
| 124 | - "endColumn": 57, | ||
| 125 | - "endOffset": 393 | ||
| 126 | - }, | ||
| 127 | - "from": { | ||
| 128 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\dimens.xml", | ||
| 129 | - "position": { | ||
| 130 | - "startLine": 3, | ||
| 131 | - "startColumn": 4, | ||
| 132 | - "startOffset": 92, | ||
| 133 | - "endColumn": 57, | ||
| 134 | - "endOffset": 145 | ||
| 135 | - } | ||
| 136 | - } | ||
| 137 | - }, | ||
| 138 | - { | ||
| 139 | - "to": { | ||
| 140 | - "startLine": 9, | ||
| 141 | - "startColumn": 4, | ||
| 142 | - "startOffset": 398, | ||
| 143 | - "endColumn": 55, | ||
| 144 | - "endOffset": 449 | ||
| 145 | - }, | ||
| 146 | - "from": { | ||
| 147 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\dimens.xml", | ||
| 148 | - "position": { | ||
| 149 | - "startLine": 4, | ||
| 150 | - "startColumn": 4, | ||
| 151 | - "startOffset": 151, | ||
| 152 | - "endColumn": 55, | ||
| 153 | - "endOffset": 202 | ||
| 154 | - } | ||
| 155 | - } | ||
| 156 | - }, | ||
| 157 | - { | ||
| 158 | - "to": { | ||
| 159 | - "startLine": 10, | ||
| 160 | - "startColumn": 4, | ||
| 161 | - "startOffset": 454, | ||
| 162 | - "endColumn": 46, | ||
| 163 | - "endOffset": 496 | ||
| 164 | - }, | ||
| 165 | - "from": { | ||
| 166 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\strings.xml", | ||
| 167 | - "position": { | ||
| 168 | - "startLine": 3, | ||
| 169 | - "startColumn": 4, | ||
| 170 | - "startOffset": 58, | ||
| 171 | - "endColumn": 46, | ||
| 172 | - "endOffset": 100 | ||
| 173 | - } | ||
| 174 | - } | ||
| 175 | - }, | ||
| 176 | - { | ||
| 177 | - "to": { | ||
| 178 | - "startLine": 11, | ||
| 179 | - "startColumn": 4, | ||
| 180 | - "startOffset": 501, | ||
| 181 | - "endLine": 14, | ||
| 182 | - "endColumn": 12, | ||
| 183 | - "endOffset": 766 | ||
| 184 | - }, | ||
| 185 | - "from": { | ||
| 186 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", | ||
| 187 | - "position": { | ||
| 188 | - "startLine": 38, | ||
| 189 | - "startColumn": 4, | ||
| 190 | - "startOffset": 1627, | ||
| 191 | - "endLine": 41, | ||
| 192 | - "endColumn": 12, | ||
| 193 | - "endOffset": 1895 | ||
| 194 | - } | ||
| 195 | - } | ||
| 196 | - }, | ||
| 197 | - { | ||
| 198 | - "to": { | ||
| 199 | - "startLine": 15, | ||
| 200 | - "startColumn": 4, | ||
| 201 | - "startOffset": 771, | ||
| 202 | - "endLine": 32, | ||
| 203 | - "endColumn": 12, | ||
| 204 | - "endOffset": 1561 | ||
| 205 | - }, | ||
| 206 | - "from": { | ||
| 207 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", | ||
| 208 | - "position": { | ||
| 209 | - "startLine": 18, | ||
| 210 | - "startColumn": 4, | ||
| 211 | - "startOffset": 782, | ||
| 212 | - "endLine": 35, | ||
| 213 | - "endColumn": 12, | ||
| 214 | - "endOffset": 1589 | ||
| 215 | - } | ||
| 216 | - } | ||
| 217 | - }, | ||
| 218 | - { | ||
| 219 | - "to": { | ||
| 220 | - "startLine": 33, | ||
| 221 | - "startColumn": 4, | ||
| 222 | - "startOffset": 1566, | ||
| 223 | - "endLine": 41, | ||
| 224 | - "endColumn": 12, | ||
| 225 | - "endOffset": 2080 | ||
| 226 | - }, | ||
| 227 | - "from": { | ||
| 228 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", | ||
| 229 | - "position": { | ||
| 230 | - "startLine": 7, | ||
| 231 | - "startColumn": 4, | ||
| 232 | - "startOffset": 200, | ||
| 233 | - "endLine": 15, | ||
| 234 | - "endColumn": 12, | ||
| 235 | - "endOffset": 722 | ||
| 236 | - } | ||
| 237 | - } | ||
| 238 | - }, | ||
| 239 | - { | ||
| 240 | - "to": { | ||
| 241 | - "startLine": 42, | ||
| 242 | - "startColumn": 4, | ||
| 243 | - "startOffset": 2085, | ||
| 244 | - "endColumn": 72, | ||
| 245 | - "endOffset": 2153 | ||
| 246 | - }, | ||
| 247 | - "from": { | ||
| 248 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", | ||
| 249 | - "position": { | ||
| 250 | - "startLine": 2, | ||
| 251 | - "startColumn": 4, | ||
| 252 | - "startOffset": 19, | ||
| 253 | - "endColumn": 79, | ||
| 254 | - "endOffset": 94 | ||
| 255 | - } | ||
| 256 | - } | ||
| 257 | - }, | ||
| 258 | - { | ||
| 259 | - "to": { | ||
| 260 | - "startLine": 43, | ||
| 261 | - "startColumn": 4, | ||
| 262 | - "startOffset": 2158, | ||
| 263 | - "endColumn": 50, | ||
| 264 | - "endOffset": 2204 | ||
| 265 | - }, | ||
| 266 | - "from": { | ||
| 267 | - "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", | ||
| 268 | - "position": { | ||
| 269 | - "startLine": 4, | ||
| 270 | - "startColumn": 4, | ||
| 271 | - "startOffset": 102, | ||
| 272 | - "endColumn": 57, | ||
| 273 | - "endOffset": 155 | ||
| 274 | - } | ||
| 275 | - } | ||
| 276 | - } | ||
| 277 | - ] | ||
| 278 | - } | ||
| 279 | -] |
MyApplication/iOS_Dialog_Library/build/intermediates/blame/res/debug/single/anim.json
已删除
100644 → 0
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\anim\\actionsheet_dialog_in.xml", | ||
| 4 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_in.xml" | ||
| 5 | - }, | ||
| 6 | - { | ||
| 7 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\anim\\actionsheet_dialog_out.xml", | ||
| 8 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml" | ||
| 9 | - } | ||
| 10 | -] |
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_middle_normal.9.png", | ||
| 4 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_normal.9.png" | ||
| 5 | - }, | ||
| 6 | - { | ||
| 7 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_bottom_normal.9.png", | ||
| 8 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_normal.9.png" | ||
| 9 | - }, | ||
| 10 | - { | ||
| 11 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png", | ||
| 12 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png" | ||
| 13 | - }, | ||
| 14 | - { | ||
| 15 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_bg.9.png", | ||
| 16 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_bg.9.png" | ||
| 17 | - }, | ||
| 18 | - { | ||
| 19 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\app_icon1.png", | ||
| 20 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png" | ||
| 21 | - }, | ||
| 22 | - { | ||
| 23 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_single_normal.9.png", | ||
| 24 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png" | ||
| 25 | - }, | ||
| 26 | - { | ||
| 27 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_top_normal.9.png", | ||
| 28 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png" | ||
| 29 | - }, | ||
| 30 | - { | ||
| 31 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png", | ||
| 32 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png" | ||
| 33 | - }, | ||
| 34 | - { | ||
| 35 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png", | ||
| 36 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png" | ||
| 37 | - }, | ||
| 38 | - { | ||
| 39 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_btn_single_pressed.9.png", | ||
| 40 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_single_pressed.9.png" | ||
| 41 | - }, | ||
| 42 | - { | ||
| 43 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png", | ||
| 44 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png" | ||
| 45 | - }, | ||
| 46 | - { | ||
| 47 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\trans_bg.png", | ||
| 48 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png" | ||
| 49 | - }, | ||
| 50 | - { | ||
| 51 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png", | ||
| 52 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png" | ||
| 53 | - }, | ||
| 54 | - { | ||
| 55 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png", | ||
| 56 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png" | ||
| 57 | - } | ||
| 58 | -] |
MyApplication/iOS_Dialog_Library/build/intermediates/blame/res/debug/single/drawable.json
已删除
100644 → 0
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\alertdialog_single_selector.xml", | ||
| 4 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml" | ||
| 5 | - }, | ||
| 6 | - { | ||
| 7 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_single_selector.xml", | ||
| 8 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_single_selector.xml" | ||
| 9 | - }, | ||
| 10 | - { | ||
| 11 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_top_selector.xml", | ||
| 12 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_top_selector.xml" | ||
| 13 | - }, | ||
| 14 | - { | ||
| 15 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_middle_selector.xml", | ||
| 16 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_middle_selector.xml" | ||
| 17 | - }, | ||
| 18 | - { | ||
| 19 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_bottom_selector.xml", | ||
| 20 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml" | ||
| 21 | - }, | ||
| 22 | - { | ||
| 23 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\alertdialog_right_selector.xml", | ||
| 24 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_right_selector.xml" | ||
| 25 | - }, | ||
| 26 | - { | ||
| 27 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\alertdialog_left_selector.xml", | ||
| 28 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_left_selector.xml" | ||
| 29 | - } | ||
| 30 | -] |
MyApplication/iOS_Dialog_Library/build/intermediates/blame/res/debug/single/layout.json
已删除
100644 → 0
| 1 | -[ | ||
| 2 | - { | ||
| 3 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\layout\\view_actionsheet.xml", | ||
| 4 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_actionsheet.xml" | ||
| 5 | - }, | ||
| 6 | - { | ||
| 7 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\layout\\activity_main.xml", | ||
| 8 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml" | ||
| 9 | - }, | ||
| 10 | - { | ||
| 11 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\layout\\view_alertdialog.xml", | ||
| 12 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml" | ||
| 13 | - } | ||
| 14 | -] |
| @@ -36,14 +36,14 @@ | @@ -36,14 +36,14 @@ | ||
| 36 | "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png" | 36 | "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png" |
| 37 | }, | 37 | }, |
| 38 | { | 38 | { |
| 39 | - "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png", | ||
| 40 | - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png" | ||
| 41 | - }, | ||
| 42 | - { | ||
| 43 | "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_top_normal.9.png", | 39 | "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_top_normal.9.png", |
| 44 | "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png" | 40 | "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png" |
| 45 | }, | 41 | }, |
| 46 | { | 42 | { |
| 43 | + "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png", | ||
| 44 | + "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png" | ||
| 45 | + }, | ||
| 46 | + { | ||
| 47 | "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png", | 47 | "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png", |
| 48 | "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png" | 48 | "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png" |
| 49 | }, | 49 | }, |
MyApplication/iOS_Dialog_Library/build/intermediates/bundles/debug/AndroidManifest.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - package="zhangphil.iosdialog" | ||
| 4 | - android:versionCode="1" | ||
| 5 | - android:versionName="1.0" > | ||
| 6 | - | ||
| 7 | - <uses-sdk | ||
| 8 | - android:minSdkVersion="15" | ||
| 9 | - android:targetSdkVersion="22" /> | ||
| 10 | - | ||
| 11 | - <!-- | ||
| 12 | - <application | ||
| 13 | - android:allowBackup="true" | ||
| 14 | - android:icon="@drawable/app_icon" | ||
| 15 | - android:label="@string/app_name" | ||
| 16 | - android:theme="@style/AppTheme" > | ||
| 17 | - <activity | ||
| 18 | - android:name="zhangphil.iosdialog.MainActivity" | ||
| 19 | - android:label="@string/app_name" > | ||
| 20 | - <intent-filter> | ||
| 21 | - <action android:name="android.intent.action.MAIN" /> | ||
| 22 | - | ||
| 23 | - <category android:name="android.intent.category.LAUNCHER" /> | ||
| 24 | - </intent-filter> | ||
| 25 | - </activity> | ||
| 26 | - </application> | ||
| 27 | - --> | ||
| 28 | - | ||
| 29 | -</manifest> |
| 1 | -int anim actionsheet_dialog_in 0x7f040000 | ||
| 2 | -int anim actionsheet_dialog_out 0x7f040001 | ||
| 3 | -int color actionsheet_blue 0x7f060000 | ||
| 4 | -int color actionsheet_gray 0x7f060001 | ||
| 5 | -int color actionsheet_red 0x7f060002 | ||
| 6 | -int color alertdialog_line 0x7f060003 | ||
| 7 | -int color black 0x7f060004 | ||
| 8 | -int color trans 0x7f060005 | ||
| 9 | -int dimen activity_horizontal_margin 0x7f070000 | ||
| 10 | -int dimen activity_vertical_margin 0x7f070001 | ||
| 11 | -int drawable actionsheet_bottom_normal 0x7f020000 | ||
| 12 | -int drawable actionsheet_bottom_pressed 0x7f020001 | ||
| 13 | -int drawable actionsheet_bottom_selector 0x7f020002 | ||
| 14 | -int drawable actionsheet_middle_normal 0x7f020003 | ||
| 15 | -int drawable actionsheet_middle_pressed 0x7f020004 | ||
| 16 | -int drawable actionsheet_middle_selector 0x7f020005 | ||
| 17 | -int drawable actionsheet_single_normal 0x7f020006 | ||
| 18 | -int drawable actionsheet_single_pressed 0x7f020007 | ||
| 19 | -int drawable actionsheet_single_selector 0x7f020008 | ||
| 20 | -int drawable actionsheet_top_normal 0x7f020009 | ||
| 21 | -int drawable actionsheet_top_pressed 0x7f02000a | ||
| 22 | -int drawable actionsheet_top_selector 0x7f02000b | ||
| 23 | -int drawable alert_bg 0x7f02000c | ||
| 24 | -int drawable alert_btn_left_pressed 0x7f02000d | ||
| 25 | -int drawable alert_btn_right_pressed 0x7f02000e | ||
| 26 | -int drawable alert_btn_single_pressed 0x7f02000f | ||
| 27 | -int drawable alertdialog_left_selector 0x7f020010 | ||
| 28 | -int drawable alertdialog_right_selector 0x7f020011 | ||
| 29 | -int drawable alertdialog_single_selector 0x7f020012 | ||
| 30 | -int drawable app_icon1 0x7f020013 | ||
| 31 | -int drawable trans_bg 0x7f020014 | ||
| 32 | -int id btn1 0x7f090000 | ||
| 33 | -int id btn2 0x7f090001 | ||
| 34 | -int id btn3 0x7f090002 | ||
| 35 | -int id btn4 0x7f090003 | ||
| 36 | -int id btn5 0x7f090004 | ||
| 37 | -int id btn_neg 0x7f09000b | ||
| 38 | -int id btn_pos 0x7f09000d | ||
| 39 | -int id img_line 0x7f09000c | ||
| 40 | -int id lLayout_bg 0x7f090009 | ||
| 41 | -int id lLayout_content 0x7f090007 | ||
| 42 | -int id sLayout_content 0x7f090006 | ||
| 43 | -int id txt_cancel 0x7f090008 | ||
| 44 | -int id txt_msg 0x7f09000a | ||
| 45 | -int id txt_title 0x7f090005 | ||
| 46 | -int layout activity_main 0x7f030000 | ||
| 47 | -int layout view_actionsheet 0x7f030001 | ||
| 48 | -int layout view_alertdialog 0x7f030002 | ||
| 49 | -int string app_name 0x7f080000 | ||
| 50 | -int style ActionSheetDialogAnimation 0x7f050001 | ||
| 51 | -int style ActionSheetDialogStyle 0x7f050002 | ||
| 52 | -int style AlertDialogStyle 0x7f050003 | ||
| 53 | -int style AppBaseTheme 0x7f050000 | ||
| 54 | -int style AppTheme 0x7f050004 |
272 字节
275 字节
183 字节
187 字节
318 字节
321 字节
232 字节
256 字节
421 字节
392 字节
388 字节
570 字节
9.9 KB
141 字节
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_bottom_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_bottom_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_middle_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_middle_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_single_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_single_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
MyApplication/iOS_Dialog_Library/build/intermediates/bundles/debug/res/layout/activity_main.xml
已删除
100644 → 0
| 1 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 2 | - xmlns:tools="http://schemas.android.com/tools" | ||
| 3 | - android:layout_width="match_parent" | ||
| 4 | - android:layout_height="match_parent" | ||
| 5 | - android:orientation="vertical" > | ||
| 6 | - | ||
| 7 | - <Button | ||
| 8 | - android:id="@+id/btn1" | ||
| 9 | - android:layout_width="match_parent" | ||
| 10 | - android:layout_height="wrap_content" | ||
| 11 | - android:text="消息" /> | ||
| 12 | - | ||
| 13 | - <Button | ||
| 14 | - android:id="@+id/btn2" | ||
| 15 | - android:layout_width="match_parent" | ||
| 16 | - android:layout_height="wrap_content" | ||
| 17 | - android:text="图片" /> | ||
| 18 | - | ||
| 19 | - <Button | ||
| 20 | - android:id="@+id/btn3" | ||
| 21 | - android:layout_width="match_parent" | ||
| 22 | - android:layout_height="wrap_content" | ||
| 23 | - android:text="列表" /> | ||
| 24 | - | ||
| 25 | - <Button | ||
| 26 | - android:id="@+id/btn4" | ||
| 27 | - android:layout_width="match_parent" | ||
| 28 | - android:layout_height="wrap_content" | ||
| 29 | - android:text="按钮一" /> | ||
| 30 | - | ||
| 31 | - <Button | ||
| 32 | - android:id="@+id/btn5" | ||
| 33 | - android:layout_width="match_parent" | ||
| 34 | - android:layout_height="wrap_content" | ||
| 35 | - android:text="按钮二" /> | ||
| 36 | - | ||
| 37 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:layout_width="match_parent" | ||
| 4 | - android:layout_height="wrap_content" | ||
| 5 | - android:orientation="vertical" | ||
| 6 | - android:padding="8dp" > | ||
| 7 | - | ||
| 8 | - <TextView | ||
| 9 | - android:id="@+id/txt_title" | ||
| 10 | - android:layout_width="match_parent" | ||
| 11 | - android:layout_height="wrap_content" | ||
| 12 | - android:background="@drawable/actionsheet_top_normal" | ||
| 13 | - android:gravity="center" | ||
| 14 | - android:minHeight="45dp" | ||
| 15 | - android:paddingTop="10dp" | ||
| 16 | - android:paddingBottom="10dp" | ||
| 17 | - android:paddingLeft="15dp" | ||
| 18 | - android:paddingRight="15dp" | ||
| 19 | - android:textColor="@color/actionsheet_gray" | ||
| 20 | - android:textSize="13sp" | ||
| 21 | - android:visibility="gone" /> | ||
| 22 | - | ||
| 23 | - <ScrollView | ||
| 24 | - android:id="@+id/sLayout_content" | ||
| 25 | - android:layout_width="match_parent" | ||
| 26 | - android:layout_height="wrap_content" | ||
| 27 | - android:fadingEdge="none" | ||
| 28 | - > | ||
| 29 | - | ||
| 30 | - <LinearLayout | ||
| 31 | - android:id="@+id/lLayout_content" | ||
| 32 | - android:layout_width="match_parent" | ||
| 33 | - android:layout_height="wrap_content" | ||
| 34 | - android:orientation="vertical" > | ||
| 35 | - </LinearLayout> | ||
| 36 | - </ScrollView> | ||
| 37 | - | ||
| 38 | - <TextView | ||
| 39 | - android:id="@+id/txt_cancel" | ||
| 40 | - android:layout_width="match_parent" | ||
| 41 | - android:layout_height="45dp" | ||
| 42 | - android:layout_marginTop="8dp" | ||
| 43 | - android:background="@drawable/actionsheet_single_selector" | ||
| 44 | - android:gravity="center" | ||
| 45 | - android:text="取消" | ||
| 46 | - android:textColor="@color/actionsheet_blue" | ||
| 47 | - android:textSize="18sp" | ||
| 48 | - android:textStyle="bold" /> | ||
| 49 | - | ||
| 50 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:id="@+id/lLayout_bg" | ||
| 4 | - android:layout_width="match_parent" | ||
| 5 | - android:layout_height="wrap_content" | ||
| 6 | - android:background="@drawable/alert_bg" | ||
| 7 | - android:orientation="vertical" > | ||
| 8 | - | ||
| 9 | - <TextView | ||
| 10 | - android:id="@+id/txt_title" | ||
| 11 | - android:layout_width="match_parent" | ||
| 12 | - android:layout_height="wrap_content" | ||
| 13 | - android:layout_marginLeft="15dp" | ||
| 14 | - android:layout_marginRight="15dp" | ||
| 15 | - android:layout_marginTop="15dp" | ||
| 16 | - android:gravity="center" | ||
| 17 | - android:textColor="@color/black" | ||
| 18 | - android:textSize="18sp" | ||
| 19 | - android:textStyle="bold" /> | ||
| 20 | - | ||
| 21 | - <TextView | ||
| 22 | - android:id="@+id/txt_msg" | ||
| 23 | - android:layout_width="match_parent" | ||
| 24 | - android:layout_height="wrap_content" | ||
| 25 | - android:layout_marginLeft="15dp" | ||
| 26 | - android:layout_marginRight="15dp" | ||
| 27 | - android:layout_marginTop="15dp" | ||
| 28 | - android:gravity="center" | ||
| 29 | - android:textColor="@color/black" | ||
| 30 | - android:textSize="16sp" /> | ||
| 31 | - | ||
| 32 | - <ImageView | ||
| 33 | - android:layout_width="match_parent" | ||
| 34 | - android:layout_height="0.5dp" | ||
| 35 | - android:layout_marginTop="10dp" | ||
| 36 | - android:background="@color/alertdialog_line" /> | ||
| 37 | - | ||
| 38 | - <LinearLayout | ||
| 39 | - android:layout_width="match_parent" | ||
| 40 | - android:layout_height="wrap_content" | ||
| 41 | - android:orientation="horizontal" > | ||
| 42 | - | ||
| 43 | - <Button | ||
| 44 | - android:id="@+id/btn_neg" | ||
| 45 | - android:layout_width="wrap_content" | ||
| 46 | - android:layout_height="43dp" | ||
| 47 | - android:layout_weight="1" | ||
| 48 | - android:background="@drawable/alertdialog_left_selector" | ||
| 49 | - android:gravity="center" | ||
| 50 | - android:textColor="@color/actionsheet_blue" | ||
| 51 | - android:textSize="16sp" /> | ||
| 52 | - | ||
| 53 | - <ImageView | ||
| 54 | - android:id="@+id/img_line" | ||
| 55 | - android:layout_width="0.5dp" | ||
| 56 | - android:layout_height="43dp" | ||
| 57 | - android:background="@color/alertdialog_line" /> | ||
| 58 | - | ||
| 59 | - <Button | ||
| 60 | - android:id="@+id/btn_pos" | ||
| 61 | - android:layout_width="wrap_content" | ||
| 62 | - android:layout_height="43dp" | ||
| 63 | - android:layout_weight="1" | ||
| 64 | - android:background="@drawable/alertdialog_right_selector" | ||
| 65 | - android:gravity="center" | ||
| 66 | - android:textColor="@color/actionsheet_blue" | ||
| 67 | - android:textSize="16sp" | ||
| 68 | - android:textStyle="bold" /> | ||
| 69 | - </LinearLayout> | ||
| 70 | - | ||
| 71 | -</LinearLayout> |
MyApplication/iOS_Dialog_Library/build/intermediates/bundles/debug/res/values/values.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<resources> | ||
| 3 | - <color name="actionsheet_blue">#037BFF</color> | ||
| 4 | - <color name="actionsheet_gray">#8F8F8F</color> | ||
| 5 | - <color name="actionsheet_red">#FD4A2E</color> | ||
| 6 | - <color name="alertdialog_line">#c6c6c6</color> | ||
| 7 | - <color name="black">#000000</color> | ||
| 8 | - <color name="trans">#00000000</color> | ||
| 9 | - <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 10 | - <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 11 | - <string name="app_name">IOSDialog</string> | ||
| 12 | - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 13 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 14 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 15 | - </style> | ||
| 16 | - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 17 | - | ||
| 18 | - <!-- 背景透明 --> | ||
| 19 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 20 | - <item name="android:windowContentOverlay">@null</item> | ||
| 21 | - <!-- 浮于Activity之上 --> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <!-- 边框 --> | ||
| 24 | - <item name="android:windowFrame">@null</item> | ||
| 25 | - <!-- Dialog以外的区域模糊效果 --> | ||
| 26 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 27 | - <!-- 无标题 --> | ||
| 28 | - <item name="android:windowNoTitle">true</item> | ||
| 29 | - <!-- 半透明 --> | ||
| 30 | - <item name="android:windowIsTranslucent">true</item> | ||
| 31 | - <!-- Dialog进入及退出动画 --> | ||
| 32 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 33 | - </style> | ||
| 34 | - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 35 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 36 | - <item name="android:windowContentOverlay">@null</item> | ||
| 37 | - <item name="android:windowIsFloating">true</item> | ||
| 38 | - <item name="android:windowFrame">@null</item> | ||
| 39 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 40 | - <item name="android:windowNoTitle">true</item> | ||
| 41 | - <item name="android:windowIsTranslucent">true</item> | ||
| 42 | - </style> | ||
| 43 | - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> | ||
| 44 | - <style name="AppTheme" parent="AppBaseTheme"/> | ||
| 45 | -</resources> |
不能预览此文件类型
不能预览此文件类型
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<resources> | ||
| 3 | - <color name="actionsheet_blue">#037BFF</color> | ||
| 4 | - <color name="actionsheet_gray">#8F8F8F</color> | ||
| 5 | - <color name="actionsheet_red">#FD4A2E</color> | ||
| 6 | - <color name="alertdialog_line">#c6c6c6</color> | ||
| 7 | - <color name="black">#000000</color> | ||
| 8 | - <color name="trans">#00000000</color> | ||
| 9 | - <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 10 | - <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 11 | - <string name="app_name">IOSDialog</string> | ||
| 12 | - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 13 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 14 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 15 | - </style> | ||
| 16 | - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 17 | - | ||
| 18 | - <!-- 背景透明 --> | ||
| 19 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 20 | - <item name="android:windowContentOverlay">@null</item> | ||
| 21 | - <!-- 浮于Activity之上 --> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <!-- 边框 --> | ||
| 24 | - <item name="android:windowFrame">@null</item> | ||
| 25 | - <!-- Dialog以外的区域模糊效果 --> | ||
| 26 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 27 | - <!-- 无标题 --> | ||
| 28 | - <item name="android:windowNoTitle">true</item> | ||
| 29 | - <!-- 半透明 --> | ||
| 30 | - <item name="android:windowIsTranslucent">true</item> | ||
| 31 | - <!-- Dialog进入及退出动画 --> | ||
| 32 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 33 | - </style> | ||
| 34 | - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 35 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 36 | - <item name="android:windowContentOverlay">@null</item> | ||
| 37 | - <item name="android:windowIsFloating">true</item> | ||
| 38 | - <item name="android:windowFrame">@null</item> | ||
| 39 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 40 | - <item name="android:windowNoTitle">true</item> | ||
| 41 | - <item name="android:windowIsTranslucent">true</item> | ||
| 42 | - </style> | ||
| 43 | - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> | ||
| 44 | - <style name="AppTheme" parent="AppBaseTheme"/> | ||
| 45 | -</resources> |
MyApplication/iOS_Dialog_Library/build/intermediates/incremental/mergeDebugAssets/merger.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<merger version="3"><dataSet config="main"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\assets"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\debug\assets"/></dataSet></merger> |
| 1 | -#Thu May 04 17:02:32 CST 2017 | ||
| 2 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png | ||
| 3 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_single_normal.9.png | ||
| 4 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\anim\\actionsheet_dialog_out.xml | ||
| 5 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_btn_single_pressed.9.png | ||
| 6 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_middle_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_middle_selector.xml | ||
| 7 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_in.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\anim\\actionsheet_dialog_in.xml | ||
| 8 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_left_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\alertdialog_left_selector.xml | ||
| 9 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png | ||
| 10 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\trans_bg.png | ||
| 11 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_bottom_selector.xml | ||
| 12 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png | ||
| 13 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png | ||
| 14 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_top_normal.9.png | ||
| 15 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_middle_normal.9.png | ||
| 16 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_right_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\alertdialog_right_selector.xml | ||
| 17 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_actionsheet.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\layout\\view_actionsheet.xml | ||
| 18 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_bottom_normal.9.png | ||
| 19 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_top_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_top_selector.xml | ||
| 20 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_bg.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\alert_bg.9.png | ||
| 21 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\actionsheet_single_selector.xml | ||
| 22 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\layout\\view_alertdialog.xml | ||
| 23 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png | ||
| 24 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\alertdialog_single_selector.xml | ||
| 25 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\layout\\activity_main.xml | ||
| 26 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\app_icon1.png | ||
| 27 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<resources> | ||
| 3 | - <color name="actionsheet_blue">#037BFF</color> | ||
| 4 | - <color name="actionsheet_gray">#8F8F8F</color> | ||
| 5 | - <color name="actionsheet_red">#FD4A2E</color> | ||
| 6 | - <color name="alertdialog_line">#c6c6c6</color> | ||
| 7 | - <color name="black">#000000</color> | ||
| 8 | - <color name="trans">#00000000</color> | ||
| 9 | - <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 10 | - <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 11 | - <string name="app_name">IOSDialog</string> | ||
| 12 | - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 13 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 14 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 15 | - </style> | ||
| 16 | - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 17 | - | ||
| 18 | - <!-- 背景透明 --> | ||
| 19 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 20 | - <item name="android:windowContentOverlay">@null</item> | ||
| 21 | - <!-- 浮于Activity之上 --> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <!-- 边框 --> | ||
| 24 | - <item name="android:windowFrame">@null</item> | ||
| 25 | - <!-- Dialog以外的区域模糊效果 --> | ||
| 26 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 27 | - <!-- 无标题 --> | ||
| 28 | - <item name="android:windowNoTitle">true</item> | ||
| 29 | - <!-- 半透明 --> | ||
| 30 | - <item name="android:windowIsTranslucent">true</item> | ||
| 31 | - <!-- Dialog进入及退出动画 --> | ||
| 32 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 33 | - </style> | ||
| 34 | - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 35 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 36 | - <item name="android:windowContentOverlay">@null</item> | ||
| 37 | - <item name="android:windowIsFloating">true</item> | ||
| 38 | - <item name="android:windowFrame">@null</item> | ||
| 39 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 40 | - <item name="android:windowNoTitle">true</item> | ||
| 41 | - <item name="android:windowIsTranslucent">true</item> | ||
| 42 | - </style> | ||
| 43 | - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> | ||
| 44 | - <style name="AppTheme" parent="AppBaseTheme"/> | ||
| 45 | -</resources> |
MyApplication/iOS_Dialog_Library/build/intermediates/incremental/mergeDebugResources/merger.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<merger version="3"><dataSet config="22.2.1$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.1\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\debug"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\debug\res"/></dataSet><dataSet config="22.2.1" from-dependency="true" generated-set="22.2.1$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.1\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"><file name="actionsheet_dialog_in" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_in.xml" qualifiers="" type="anim"/><file name="actionsheet_dialog_out" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_out.xml" qualifiers="" type="anim"/><file name="actionsheet_bottom_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_bottom_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_middle_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_middle_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_top_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_top_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_left_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_left_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_right_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_right_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_bottom_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_bottom_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_left_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_left_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_right_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_right_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="app_icon1" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\app_icon1.png" qualifiers="hdpi-v4" type="drawable"/><file name="trans_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\trans_bg.png" qualifiers="hdpi-v4" type="drawable"/><file name="activity_main" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="view_actionsheet" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_actionsheet.xml" qualifiers="" type="layout"/><file name="view_alertdialog" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_alertdialog.xml" qualifiers="" type="layout"/><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\color.xml" qualifiers=""><color name="trans">#00000000</color><color name="alertdialog_line">#c6c6c6</color><color name="actionsheet_gray">#8F8F8F</color><color name="actionsheet_red">#FD4A2E</color><color name="actionsheet_blue">#037BFF</color><color name="black">#000000</color></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">IOSDialog</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\styles.xml" qualifiers=""><style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 3 | - | ||
| 4 | - | ||
| 5 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 6 | - <item name="android:windowContentOverlay">@null</item> | ||
| 7 | - | ||
| 8 | - <item name="android:windowIsFloating">true</item> | ||
| 9 | - | ||
| 10 | - <item name="android:windowFrame">@null</item> | ||
| 11 | - | ||
| 12 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 13 | - | ||
| 14 | - <item name="android:windowNoTitle">true</item> | ||
| 15 | - | ||
| 16 | - <item name="android:windowIsTranslucent">true</item> | ||
| 17 | - | ||
| 18 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 19 | - </style><style name="AppTheme" parent="AppBaseTheme"/><style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 20 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 21 | - <item name="android:windowContentOverlay">@null</item> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <item name="android:windowFrame">@null</item> | ||
| 24 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 25 | - <item name="android:windowNoTitle">true</item> | ||
| 26 | - <item name="android:windowIsTranslucent">true</item> | ||
| 27 | - </style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 28 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 29 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 30 | - </style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v11\styles.xml" qualifiers="v11"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar"> | ||
| 31 | - | ||
| 32 | - </style></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v14\styles.xml" qualifiers="v14"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar"> | ||
| 33 | - | ||
| 34 | - </style></file></source><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\debug"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\debug\res"/></dataSet><mergedItems/></merger> |
MyApplication/iOS_Dialog_Library/build/intermediates/incremental/mergeDebugShaders/merger.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<merger version="3"><dataSet config="main"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\debug\shaders"/></dataSet></merger> |
| 1 | -#Thu May 04 17:02:56 CST 2017 | 1 | +#Fri May 05 18:08:22 CST 2017 |
| 2 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png | 2 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png |
| 3 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_normal.9.png | 3 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_normal.9.png |
| 4 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\anim\\actionsheet_dialog_out.xml | 4 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\anim\\actionsheet_dialog_out.xml |
| @@ -22,6 +22,6 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a | @@ -22,6 +22,6 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a | ||
| 22 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\layout\\view_alertdialog.xml | 22 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\layout\\view_alertdialog.xml |
| 23 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png | 23 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png |
| 24 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable\\alertdialog_single_selector.xml | 24 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable\\alertdialog_single_selector.xml |
| 25 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png | ||
| 26 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\app_icon1.png | ||
| 27 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\layout\\activity_main.xml | 25 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\layout\\activity_main.xml |
| 26 | +D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\app_icon1.png | ||
| 27 | +D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png |
| 1 | -#Thu May 04 17:02:32 CST 2017 | ||
| 2 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png | ||
| 3 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_single_normal.9.png | ||
| 4 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\actionsheet_dialog_out.xml | ||
| 5 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\alert_btn_single_pressed.9.png | ||
| 6 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_middle_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\actionsheet_middle_selector.xml | ||
| 7 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_in.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\anim\\actionsheet_dialog_in.xml | ||
| 8 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_left_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\alertdialog_left_selector.xml | ||
| 9 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png | ||
| 10 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\trans_bg.png | ||
| 11 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\actionsheet_bottom_selector.xml | ||
| 12 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png | ||
| 13 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png | ||
| 14 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_top_normal.9.png | ||
| 15 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_middle_normal.9.png | ||
| 16 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_right_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\alertdialog_right_selector.xml | ||
| 17 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_actionsheet.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\view_actionsheet.xml | ||
| 18 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_bottom_normal.9.png | ||
| 19 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_top_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\actionsheet_top_selector.xml | ||
| 20 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_bg.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\alert_bg.9.png | ||
| 21 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\actionsheet_single_selector.xml | ||
| 22 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\view_alertdialog.xml | ||
| 23 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png | ||
| 24 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\alertdialog_single_selector.xml | ||
| 25 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\activity_main.xml | ||
| 26 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\app_icon1.png | ||
| 27 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<resources> | ||
| 3 | - <color name="actionsheet_blue">#037BFF</color> | ||
| 4 | - <color name="actionsheet_gray">#8F8F8F</color> | ||
| 5 | - <color name="actionsheet_red">#FD4A2E</color> | ||
| 6 | - <color name="alertdialog_line">#c6c6c6</color> | ||
| 7 | - <color name="black">#000000</color> | ||
| 8 | - <color name="trans">#00000000</color> | ||
| 9 | - <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 10 | - <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 11 | - <string name="app_name">IOSDialog</string> | ||
| 12 | - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 13 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 14 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 15 | - </style> | ||
| 16 | - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 17 | - | ||
| 18 | - <!-- 背景透明 --> | ||
| 19 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 20 | - <item name="android:windowContentOverlay">@null</item> | ||
| 21 | - <!-- 浮于Activity之上 --> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <!-- 边框 --> | ||
| 24 | - <item name="android:windowFrame">@null</item> | ||
| 25 | - <!-- Dialog以外的区域模糊效果 --> | ||
| 26 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 27 | - <!-- 无标题 --> | ||
| 28 | - <item name="android:windowNoTitle">true</item> | ||
| 29 | - <!-- 半透明 --> | ||
| 30 | - <item name="android:windowIsTranslucent">true</item> | ||
| 31 | - <!-- Dialog进入及退出动画 --> | ||
| 32 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 33 | - </style> | ||
| 34 | - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 35 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 36 | - <item name="android:windowContentOverlay">@null</item> | ||
| 37 | - <item name="android:windowIsFloating">true</item> | ||
| 38 | - <item name="android:windowFrame">@null</item> | ||
| 39 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 40 | - <item name="android:windowNoTitle">true</item> | ||
| 41 | - <item name="android:windowIsTranslucent">true</item> | ||
| 42 | - </style> | ||
| 43 | - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> | ||
| 44 | - <style name="AppTheme" parent="AppBaseTheme"/> | ||
| 45 | -</resources> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\debug"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res"><file name="actionsheet_dialog_in" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_in.xml" qualifiers="" type="anim"/><file name="actionsheet_dialog_out" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\anim\actionsheet_dialog_out.xml" qualifiers="" type="anim"/><file name="actionsheet_bottom_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_bottom_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_middle_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_middle_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_top_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\actionsheet_top_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_left_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_left_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_right_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_right_selector.xml" qualifiers="" type="drawable"/><file name="alertdialog_single_selector" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable\alertdialog_single_selector.xml" qualifiers="" type="drawable"/><file name="actionsheet_bottom_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_bottom_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_bottom_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_middle_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_middle_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_normal" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_normal.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="actionsheet_top_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\actionsheet_top_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_left_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_left_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_right_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_right_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="alert_btn_single_pressed" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\alert_btn_single_pressed.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="app_icon1" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\app_icon1.png" qualifiers="hdpi-v4" type="drawable"/><file name="trans_bg" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\drawable-hdpi\trans_bg.png" qualifiers="hdpi-v4" type="drawable"/><file name="activity_main" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="view_actionsheet" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_actionsheet.xml" qualifiers="" type="layout"/><file name="view_alertdialog" path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\layout\view_alertdialog.xml" qualifiers="" type="layout"/><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\color.xml" qualifiers=""><color name="trans">#00000000</color><color name="alertdialog_line">#c6c6c6</color><color name="actionsheet_gray">#8F8F8F</color><color name="actionsheet_red">#FD4A2E</color><color name="actionsheet_blue">#037BFF</color><color name="black">#000000</color></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_vertical_margin">16dp</dimen><dimen name="activity_horizontal_margin">16dp</dimen></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">IOSDialog</string></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values\styles.xml" qualifiers=""><style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 3 | - | ||
| 4 | - | ||
| 5 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 6 | - <item name="android:windowContentOverlay">@null</item> | ||
| 7 | - | ||
| 8 | - <item name="android:windowIsFloating">true</item> | ||
| 9 | - | ||
| 10 | - <item name="android:windowFrame">@null</item> | ||
| 11 | - | ||
| 12 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 13 | - | ||
| 14 | - <item name="android:windowNoTitle">true</item> | ||
| 15 | - | ||
| 16 | - <item name="android:windowIsTranslucent">true</item> | ||
| 17 | - | ||
| 18 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 19 | - </style><style name="AppTheme" parent="AppBaseTheme"/><style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 20 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 21 | - <item name="android:windowContentOverlay">@null</item> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <item name="android:windowFrame">@null</item> | ||
| 24 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 25 | - <item name="android:windowNoTitle">true</item> | ||
| 26 | - <item name="android:windowIsTranslucent">true</item> | ||
| 27 | - </style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 28 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 29 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 30 | - </style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v11\styles.xml" qualifiers="v11"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar"> | ||
| 31 | - | ||
| 32 | - </style></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-v14\styles.xml" qualifiers="v14"><style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar"> | ||
| 33 | - | ||
| 34 | - </style></file></source><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\rs\debug"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\debug\res"/></dataSet><mergedItems/></merger> |
| 1 | -#Thu May 04 16:56:29 CST 2017 | 1 | +#Fri May 05 18:04:58 CST 2017 |
| 2 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png | 2 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_bottom_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_bottom_pressed.9.png |
| 3 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_single_normal.9.png | 3 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_single_normal.9.png |
| 4 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\anim\\actionsheet_dialog_out.xml | 4 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\anim\\actionsheet_dialog_out.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\anim\\actionsheet_dialog_out.xml |
| @@ -9,8 +9,8 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a | @@ -9,8 +9,8 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a | ||
| 9 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\trans_bg.png | 9 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\trans_bg.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\trans_bg.png |
| 10 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png | 10 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_middle_pressed.9.png |
| 11 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\actionsheet_bottom_selector.xml | 11 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\actionsheet_bottom_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\actionsheet_bottom_selector.xml |
| 12 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png | ||
| 13 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png | 12 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_right_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\alert_btn_right_pressed.9.png |
| 13 | +D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png | ||
| 14 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_top_normal.9.png | 14 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_top_normal.9.png |
| 15 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_middle_normal.9.png | 15 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_middle_normal.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_middle_normal.9.png |
| 16 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_right_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\alertdialog_right_selector.xml | 16 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_right_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\alertdialog_right_selector.xml |
| @@ -22,6 +22,6 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a | @@ -22,6 +22,6 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\a | ||
| 22 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\layout\\view_alertdialog.xml | 22 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\view_alertdialog.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\layout\\view_alertdialog.xml |
| 23 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png | 23 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_top_pressed.9.png |
| 24 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\alertdialog_single_selector.xml | 24 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable\\alertdialog_single_selector.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable\\alertdialog_single_selector.xml |
| 25 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png | ||
| 26 | -D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\app_icon1.png | ||
| 27 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\layout\\activity_main.xml | 25 | D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\layout\\activity_main.xml=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\layout\\activity_main.xml |
| 26 | +D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\app_icon1.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\app_icon1.png | ||
| 27 | +D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_single_pressed.9.png=D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\bundles\\release\\res\\drawable-hdpi-v4\\actionsheet_single_pressed.9.png |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - package="zhangphil.iosdialog.test" > | ||
| 4 | - | ||
| 5 | - <uses-sdk | ||
| 6 | - android:minSdkVersion="15" | ||
| 7 | - android:targetSdkVersion="22" /> | ||
| 8 | - | ||
| 9 | - <instrumentation | ||
| 10 | - android:name="android.test.InstrumentationTestRunner" | ||
| 11 | - android:functionalTest="false" | ||
| 12 | - android:handleProfiling="false" | ||
| 13 | - android:label="Tests for zhangphil.iosdialog.test" | ||
| 14 | - android:targetPackage="zhangphil.iosdialog.test" /> | ||
| 15 | - | ||
| 16 | - <application> | ||
| 17 | - <uses-library android:name="android.test.runner" /> | ||
| 18 | - </application> | ||
| 19 | - | ||
| 20 | -</manifest> |
MyApplication/iOS_Dialog_Library/build/intermediates/manifests/aapt/debug/AndroidManifest.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - package="zhangphil.iosdialog" | ||
| 4 | - android:versionCode="1" | ||
| 5 | - android:versionName="1.0" > | ||
| 6 | - | ||
| 7 | - <uses-sdk | ||
| 8 | - android:minSdkVersion="15" | ||
| 9 | - android:targetSdkVersion="22" /> | ||
| 10 | - | ||
| 11 | - <!-- | ||
| 12 | - <application | ||
| 13 | - android:allowBackup="true" | ||
| 14 | - android:icon="@drawable/app_icon" | ||
| 15 | - android:label="@string/app_name" | ||
| 16 | - android:theme="@style/AppTheme" > | ||
| 17 | - <activity | ||
| 18 | - android:name="zhangphil.iosdialog.MainActivity" | ||
| 19 | - android:label="@string/app_name" > | ||
| 20 | - <intent-filter> | ||
| 21 | - <action android:name="android.intent.action.MAIN" /> | ||
| 22 | - | ||
| 23 | - <category android:name="android.intent.category.LAUNCHER" /> | ||
| 24 | - </intent-filter> | ||
| 25 | - </activity> | ||
| 26 | - </application> | ||
| 27 | - --> | ||
| 28 | - | ||
| 29 | -</manifest> |
403 字节
400 字节
292 字节
294 字节
491 字节
500 字节
379 字节
406 字节
722 字节
527 字节
512 字节
703 字节
99 字节
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_bottom_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_bottom_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_middle_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_middle_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_single_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_single_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 2 | - xmlns:tools="http://schemas.android.com/tools" | ||
| 3 | - android:layout_width="match_parent" | ||
| 4 | - android:layout_height="match_parent" | ||
| 5 | - android:orientation="vertical" > | ||
| 6 | - | ||
| 7 | - <Button | ||
| 8 | - android:id="@+id/btn1" | ||
| 9 | - android:layout_width="match_parent" | ||
| 10 | - android:layout_height="wrap_content" | ||
| 11 | - android:text="消息" /> | ||
| 12 | - | ||
| 13 | - <Button | ||
| 14 | - android:id="@+id/btn2" | ||
| 15 | - android:layout_width="match_parent" | ||
| 16 | - android:layout_height="wrap_content" | ||
| 17 | - android:text="图片" /> | ||
| 18 | - | ||
| 19 | - <Button | ||
| 20 | - android:id="@+id/btn3" | ||
| 21 | - android:layout_width="match_parent" | ||
| 22 | - android:layout_height="wrap_content" | ||
| 23 | - android:text="列表" /> | ||
| 24 | - | ||
| 25 | - <Button | ||
| 26 | - android:id="@+id/btn4" | ||
| 27 | - android:layout_width="match_parent" | ||
| 28 | - android:layout_height="wrap_content" | ||
| 29 | - android:text="按钮一" /> | ||
| 30 | - | ||
| 31 | - <Button | ||
| 32 | - android:id="@+id/btn5" | ||
| 33 | - android:layout_width="match_parent" | ||
| 34 | - android:layout_height="wrap_content" | ||
| 35 | - android:text="按钮二" /> | ||
| 36 | - | ||
| 37 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:layout_width="match_parent" | ||
| 4 | - android:layout_height="wrap_content" | ||
| 5 | - android:orientation="vertical" | ||
| 6 | - android:padding="8dp" > | ||
| 7 | - | ||
| 8 | - <TextView | ||
| 9 | - android:id="@+id/txt_title" | ||
| 10 | - android:layout_width="match_parent" | ||
| 11 | - android:layout_height="wrap_content" | ||
| 12 | - android:background="@drawable/actionsheet_top_normal" | ||
| 13 | - android:gravity="center" | ||
| 14 | - android:minHeight="45dp" | ||
| 15 | - android:paddingTop="10dp" | ||
| 16 | - android:paddingBottom="10dp" | ||
| 17 | - android:paddingLeft="15dp" | ||
| 18 | - android:paddingRight="15dp" | ||
| 19 | - android:textColor="@color/actionsheet_gray" | ||
| 20 | - android:textSize="13sp" | ||
| 21 | - android:visibility="gone" /> | ||
| 22 | - | ||
| 23 | - <ScrollView | ||
| 24 | - android:id="@+id/sLayout_content" | ||
| 25 | - android:layout_width="match_parent" | ||
| 26 | - android:layout_height="wrap_content" | ||
| 27 | - android:fadingEdge="none" | ||
| 28 | - > | ||
| 29 | - | ||
| 30 | - <LinearLayout | ||
| 31 | - android:id="@+id/lLayout_content" | ||
| 32 | - android:layout_width="match_parent" | ||
| 33 | - android:layout_height="wrap_content" | ||
| 34 | - android:orientation="vertical" > | ||
| 35 | - </LinearLayout> | ||
| 36 | - </ScrollView> | ||
| 37 | - | ||
| 38 | - <TextView | ||
| 39 | - android:id="@+id/txt_cancel" | ||
| 40 | - android:layout_width="match_parent" | ||
| 41 | - android:layout_height="45dp" | ||
| 42 | - android:layout_marginTop="8dp" | ||
| 43 | - android:background="@drawable/actionsheet_single_selector" | ||
| 44 | - android:gravity="center" | ||
| 45 | - android:text="取消" | ||
| 46 | - android:textColor="@color/actionsheet_blue" | ||
| 47 | - android:textSize="18sp" | ||
| 48 | - android:textStyle="bold" /> | ||
| 49 | - | ||
| 50 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:id="@+id/lLayout_bg" | ||
| 4 | - android:layout_width="match_parent" | ||
| 5 | - android:layout_height="wrap_content" | ||
| 6 | - android:background="@drawable/alert_bg" | ||
| 7 | - android:orientation="vertical" > | ||
| 8 | - | ||
| 9 | - <TextView | ||
| 10 | - android:id="@+id/txt_title" | ||
| 11 | - android:layout_width="match_parent" | ||
| 12 | - android:layout_height="wrap_content" | ||
| 13 | - android:layout_marginLeft="15dp" | ||
| 14 | - android:layout_marginRight="15dp" | ||
| 15 | - android:layout_marginTop="15dp" | ||
| 16 | - android:gravity="center" | ||
| 17 | - android:textColor="@color/black" | ||
| 18 | - android:textSize="18sp" | ||
| 19 | - android:textStyle="bold" /> | ||
| 20 | - | ||
| 21 | - <TextView | ||
| 22 | - android:id="@+id/txt_msg" | ||
| 23 | - android:layout_width="match_parent" | ||
| 24 | - android:layout_height="wrap_content" | ||
| 25 | - android:layout_marginLeft="15dp" | ||
| 26 | - android:layout_marginRight="15dp" | ||
| 27 | - android:layout_marginTop="15dp" | ||
| 28 | - android:gravity="center" | ||
| 29 | - android:textColor="@color/black" | ||
| 30 | - android:textSize="16sp" /> | ||
| 31 | - | ||
| 32 | - <ImageView | ||
| 33 | - android:layout_width="match_parent" | ||
| 34 | - android:layout_height="0.5dp" | ||
| 35 | - android:layout_marginTop="10dp" | ||
| 36 | - android:background="@color/alertdialog_line" /> | ||
| 37 | - | ||
| 38 | - <LinearLayout | ||
| 39 | - android:layout_width="match_parent" | ||
| 40 | - android:layout_height="wrap_content" | ||
| 41 | - android:orientation="horizontal" > | ||
| 42 | - | ||
| 43 | - <Button | ||
| 44 | - android:id="@+id/btn_neg" | ||
| 45 | - android:layout_width="wrap_content" | ||
| 46 | - android:layout_height="43dp" | ||
| 47 | - android:layout_weight="1" | ||
| 48 | - android:background="@drawable/alertdialog_left_selector" | ||
| 49 | - android:gravity="center" | ||
| 50 | - android:textColor="@color/actionsheet_blue" | ||
| 51 | - android:textSize="16sp" /> | ||
| 52 | - | ||
| 53 | - <ImageView | ||
| 54 | - android:id="@+id/img_line" | ||
| 55 | - android:layout_width="0.5dp" | ||
| 56 | - android:layout_height="43dp" | ||
| 57 | - android:background="@color/alertdialog_line" /> | ||
| 58 | - | ||
| 59 | - <Button | ||
| 60 | - android:id="@+id/btn_pos" | ||
| 61 | - android:layout_width="wrap_content" | ||
| 62 | - android:layout_height="43dp" | ||
| 63 | - android:layout_weight="1" | ||
| 64 | - android:background="@drawable/alertdialog_right_selector" | ||
| 65 | - android:gravity="center" | ||
| 66 | - android:textColor="@color/actionsheet_blue" | ||
| 67 | - android:textSize="16sp" | ||
| 68 | - android:textStyle="bold" /> | ||
| 69 | - </LinearLayout> | ||
| 70 | - | ||
| 71 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<resources> | ||
| 3 | - <color name="actionsheet_blue">#037BFF</color> | ||
| 4 | - <color name="actionsheet_gray">#8F8F8F</color> | ||
| 5 | - <color name="actionsheet_red">#FD4A2E</color> | ||
| 6 | - <color name="alertdialog_line">#c6c6c6</color> | ||
| 7 | - <color name="black">#000000</color> | ||
| 8 | - <color name="trans">#00000000</color> | ||
| 9 | - <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 10 | - <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 11 | - <string name="app_name">IOSDialog</string> | ||
| 12 | - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 13 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 14 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 15 | - </style> | ||
| 16 | - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 17 | - | ||
| 18 | - <!-- 背景透明 --> | ||
| 19 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 20 | - <item name="android:windowContentOverlay">@null</item> | ||
| 21 | - <!-- 浮于Activity之上 --> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <!-- 边框 --> | ||
| 24 | - <item name="android:windowFrame">@null</item> | ||
| 25 | - <!-- Dialog以外的区域模糊效果 --> | ||
| 26 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 27 | - <!-- 无标题 --> | ||
| 28 | - <item name="android:windowNoTitle">true</item> | ||
| 29 | - <!-- 半透明 --> | ||
| 30 | - <item name="android:windowIsTranslucent">true</item> | ||
| 31 | - <!-- Dialog进入及退出动画 --> | ||
| 32 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 33 | - </style> | ||
| 34 | - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 35 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 36 | - <item name="android:windowContentOverlay">@null</item> | ||
| 37 | - <item name="android:windowIsFloating">true</item> | ||
| 38 | - <item name="android:windowFrame">@null</item> | ||
| 39 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 40 | - <item name="android:windowNoTitle">true</item> | ||
| 41 | - <item name="android:windowIsTranslucent">true</item> | ||
| 42 | - </style> | ||
| 43 | - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> | ||
| 44 | - <style name="AppTheme" parent="AppBaseTheme"/> | ||
| 45 | -</resources> |
272 字节
275 字节
183 字节
187 字节
318 字节
321 字节
232 字节
256 字节
421 字节
392 字节
388 字节
570 字节
9.9 KB
141 字节
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_bottom_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_bottom_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_middle_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_middle_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - | ||
| 4 | - <item android:drawable="@drawable/actionsheet_single_pressed" android:state_pressed="true"/> | ||
| 5 | - <item android:drawable="@drawable/actionsheet_single_normal"/> | ||
| 6 | - | ||
| 7 | -</selector> |
MyApplication/iOS_Dialog_Library/build/intermediates/res/merged/debug/layout/activity_main.xml
已删除
100644 → 0
| 1 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 2 | - xmlns:tools="http://schemas.android.com/tools" | ||
| 3 | - android:layout_width="match_parent" | ||
| 4 | - android:layout_height="match_parent" | ||
| 5 | - android:orientation="vertical" > | ||
| 6 | - | ||
| 7 | - <Button | ||
| 8 | - android:id="@+id/btn1" | ||
| 9 | - android:layout_width="match_parent" | ||
| 10 | - android:layout_height="wrap_content" | ||
| 11 | - android:text="消息" /> | ||
| 12 | - | ||
| 13 | - <Button | ||
| 14 | - android:id="@+id/btn2" | ||
| 15 | - android:layout_width="match_parent" | ||
| 16 | - android:layout_height="wrap_content" | ||
| 17 | - android:text="图片" /> | ||
| 18 | - | ||
| 19 | - <Button | ||
| 20 | - android:id="@+id/btn3" | ||
| 21 | - android:layout_width="match_parent" | ||
| 22 | - android:layout_height="wrap_content" | ||
| 23 | - android:text="列表" /> | ||
| 24 | - | ||
| 25 | - <Button | ||
| 26 | - android:id="@+id/btn4" | ||
| 27 | - android:layout_width="match_parent" | ||
| 28 | - android:layout_height="wrap_content" | ||
| 29 | - android:text="按钮一" /> | ||
| 30 | - | ||
| 31 | - <Button | ||
| 32 | - android:id="@+id/btn5" | ||
| 33 | - android:layout_width="match_parent" | ||
| 34 | - android:layout_height="wrap_content" | ||
| 35 | - android:text="按钮二" /> | ||
| 36 | - | ||
| 37 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:layout_width="match_parent" | ||
| 4 | - android:layout_height="wrap_content" | ||
| 5 | - android:orientation="vertical" | ||
| 6 | - android:padding="8dp" > | ||
| 7 | - | ||
| 8 | - <TextView | ||
| 9 | - android:id="@+id/txt_title" | ||
| 10 | - android:layout_width="match_parent" | ||
| 11 | - android:layout_height="wrap_content" | ||
| 12 | - android:background="@drawable/actionsheet_top_normal" | ||
| 13 | - android:gravity="center" | ||
| 14 | - android:minHeight="45dp" | ||
| 15 | - android:paddingTop="10dp" | ||
| 16 | - android:paddingBottom="10dp" | ||
| 17 | - android:paddingLeft="15dp" | ||
| 18 | - android:paddingRight="15dp" | ||
| 19 | - android:textColor="@color/actionsheet_gray" | ||
| 20 | - android:textSize="13sp" | ||
| 21 | - android:visibility="gone" /> | ||
| 22 | - | ||
| 23 | - <ScrollView | ||
| 24 | - android:id="@+id/sLayout_content" | ||
| 25 | - android:layout_width="match_parent" | ||
| 26 | - android:layout_height="wrap_content" | ||
| 27 | - android:fadingEdge="none" | ||
| 28 | - > | ||
| 29 | - | ||
| 30 | - <LinearLayout | ||
| 31 | - android:id="@+id/lLayout_content" | ||
| 32 | - android:layout_width="match_parent" | ||
| 33 | - android:layout_height="wrap_content" | ||
| 34 | - android:orientation="vertical" > | ||
| 35 | - </LinearLayout> | ||
| 36 | - </ScrollView> | ||
| 37 | - | ||
| 38 | - <TextView | ||
| 39 | - android:id="@+id/txt_cancel" | ||
| 40 | - android:layout_width="match_parent" | ||
| 41 | - android:layout_height="45dp" | ||
| 42 | - android:layout_marginTop="8dp" | ||
| 43 | - android:background="@drawable/actionsheet_single_selector" | ||
| 44 | - android:gravity="center" | ||
| 45 | - android:text="取消" | ||
| 46 | - android:textColor="@color/actionsheet_blue" | ||
| 47 | - android:textSize="18sp" | ||
| 48 | - android:textStyle="bold" /> | ||
| 49 | - | ||
| 50 | -</LinearLayout> |
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:id="@+id/lLayout_bg" | ||
| 4 | - android:layout_width="match_parent" | ||
| 5 | - android:layout_height="wrap_content" | ||
| 6 | - android:background="@drawable/alert_bg" | ||
| 7 | - android:orientation="vertical" > | ||
| 8 | - | ||
| 9 | - <TextView | ||
| 10 | - android:id="@+id/txt_title" | ||
| 11 | - android:layout_width="match_parent" | ||
| 12 | - android:layout_height="wrap_content" | ||
| 13 | - android:layout_marginLeft="15dp" | ||
| 14 | - android:layout_marginRight="15dp" | ||
| 15 | - android:layout_marginTop="15dp" | ||
| 16 | - android:gravity="center" | ||
| 17 | - android:textColor="@color/black" | ||
| 18 | - android:textSize="18sp" | ||
| 19 | - android:textStyle="bold" /> | ||
| 20 | - | ||
| 21 | - <TextView | ||
| 22 | - android:id="@+id/txt_msg" | ||
| 23 | - android:layout_width="match_parent" | ||
| 24 | - android:layout_height="wrap_content" | ||
| 25 | - android:layout_marginLeft="15dp" | ||
| 26 | - android:layout_marginRight="15dp" | ||
| 27 | - android:layout_marginTop="15dp" | ||
| 28 | - android:gravity="center" | ||
| 29 | - android:textColor="@color/black" | ||
| 30 | - android:textSize="16sp" /> | ||
| 31 | - | ||
| 32 | - <ImageView | ||
| 33 | - android:layout_width="match_parent" | ||
| 34 | - android:layout_height="0.5dp" | ||
| 35 | - android:layout_marginTop="10dp" | ||
| 36 | - android:background="@color/alertdialog_line" /> | ||
| 37 | - | ||
| 38 | - <LinearLayout | ||
| 39 | - android:layout_width="match_parent" | ||
| 40 | - android:layout_height="wrap_content" | ||
| 41 | - android:orientation="horizontal" > | ||
| 42 | - | ||
| 43 | - <Button | ||
| 44 | - android:id="@+id/btn_neg" | ||
| 45 | - android:layout_width="wrap_content" | ||
| 46 | - android:layout_height="43dp" | ||
| 47 | - android:layout_weight="1" | ||
| 48 | - android:background="@drawable/alertdialog_left_selector" | ||
| 49 | - android:gravity="center" | ||
| 50 | - android:textColor="@color/actionsheet_blue" | ||
| 51 | - android:textSize="16sp" /> | ||
| 52 | - | ||
| 53 | - <ImageView | ||
| 54 | - android:id="@+id/img_line" | ||
| 55 | - android:layout_width="0.5dp" | ||
| 56 | - android:layout_height="43dp" | ||
| 57 | - android:background="@color/alertdialog_line" /> | ||
| 58 | - | ||
| 59 | - <Button | ||
| 60 | - android:id="@+id/btn_pos" | ||
| 61 | - android:layout_width="wrap_content" | ||
| 62 | - android:layout_height="43dp" | ||
| 63 | - android:layout_weight="1" | ||
| 64 | - android:background="@drawable/alertdialog_right_selector" | ||
| 65 | - android:gravity="center" | ||
| 66 | - android:textColor="@color/actionsheet_blue" | ||
| 67 | - android:textSize="16sp" | ||
| 68 | - android:textStyle="bold" /> | ||
| 69 | - </LinearLayout> | ||
| 70 | - | ||
| 71 | -</LinearLayout> |
MyApplication/iOS_Dialog_Library/build/intermediates/res/merged/debug/values/values.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<resources> | ||
| 3 | - <color name="actionsheet_blue">#037BFF</color> | ||
| 4 | - <color name="actionsheet_gray">#8F8F8F</color> | ||
| 5 | - <color name="actionsheet_red">#FD4A2E</color> | ||
| 6 | - <color name="alertdialog_line">#c6c6c6</color> | ||
| 7 | - <color name="black">#000000</color> | ||
| 8 | - <color name="trans">#00000000</color> | ||
| 9 | - <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 10 | - <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 11 | - <string name="app_name">IOSDialog</string> | ||
| 12 | - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> | ||
| 13 | - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> | ||
| 14 | - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> | ||
| 15 | - </style> | ||
| 16 | - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 17 | - | ||
| 18 | - <!-- 背景透明 --> | ||
| 19 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 20 | - <item name="android:windowContentOverlay">@null</item> | ||
| 21 | - <!-- 浮于Activity之上 --> | ||
| 22 | - <item name="android:windowIsFloating">true</item> | ||
| 23 | - <!-- 边框 --> | ||
| 24 | - <item name="android:windowFrame">@null</item> | ||
| 25 | - <!-- Dialog以外的区域模糊效果 --> | ||
| 26 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 27 | - <!-- 无标题 --> | ||
| 28 | - <item name="android:windowNoTitle">true</item> | ||
| 29 | - <!-- 半透明 --> | ||
| 30 | - <item name="android:windowIsTranslucent">true</item> | ||
| 31 | - <!-- Dialog进入及退出动画 --> | ||
| 32 | - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> | ||
| 33 | - </style> | ||
| 34 | - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> | ||
| 35 | - <item name="android:windowBackground">@android:color/transparent</item> | ||
| 36 | - <item name="android:windowContentOverlay">@null</item> | ||
| 37 | - <item name="android:windowIsFloating">true</item> | ||
| 38 | - <item name="android:windowFrame">@null</item> | ||
| 39 | - <item name="android:backgroundDimEnabled">true</item> | ||
| 40 | - <item name="android:windowNoTitle">true</item> | ||
| 41 | - <item name="android:windowIsTranslucent">true</item> | ||
| 42 | - </style> | ||
| 43 | - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> | ||
| 44 | - <style name="AppTheme" parent="AppBaseTheme"/> | ||
| 45 | -</resources> |
不能预览此文件类型
| @@ -598,7 +598,7 @@ public class XdySdk implements SubjectListener{ | @@ -598,7 +598,7 @@ public class XdySdk implements SubjectListener{ | ||
| 598 | * TODO 只有一个boolean | 598 | * TODO 只有一个boolean |
| 599 | * 开始isPublish 为false | 599 | * 开始isPublish 为false |
| 600 | * 开始推流初始化后onresume 就是开始 | 600 | * 开始推流初始化后onresume 就是开始 |
| 601 | - * @deprecated 大牛 sdk处理的更好 | 601 | + * 大牛 sdk处理的更好 |
| 602 | */ | 602 | */ |
| 603 | public void onPublisherResume(){ | 603 | public void onPublisherResume(){ |
| 604 | if(!isPublisher){ | 604 | if(!isPublisher){ |
| 1 | +package com.mang.xdy.play; | ||
| 2 | + | ||
| 3 | +import android.content.Context; | ||
| 4 | +import android.util.Log; | ||
| 5 | +import android.view.SurfaceView; | ||
| 6 | + | ||
| 7 | +import com.daniulive.smartplayer.SmartPlayerJni; | ||
| 8 | +import com.eventhandle.SmartEventCallback; | ||
| 9 | +import com.mang.xdy.utils.XdyLogUtil; | ||
| 10 | + | ||
| 11 | +/** | ||
| 12 | + * Created by abao on 2017/4/5. | ||
| 13 | + */ | ||
| 14 | + | ||
| 15 | +/** | ||
| 16 | + * 播放视频的方法核心方法(供内部调用,外部继续封装) | ||
| 17 | + */ | ||
| 18 | +public class XdyPlayer { | ||
| 19 | + | ||
| 20 | + private long playerHandle = 0; | ||
| 21 | + private static final int PORTRAIT = 1; //竖屏 | ||
| 22 | + private static final int LANDSCAPE = 2; //横屏 | ||
| 23 | + private static final String TAG = "XdyPlayer"; | ||
| 24 | + | ||
| 25 | + private SmartPlayerJni libPlayer = null; | ||
| 26 | + private Context mContext; | ||
| 27 | + /*是否正在播放,如果正在播放设置为TRUE,防止多次被实例化,*/ | ||
| 28 | + private boolean isPlaying=false; | ||
| 29 | + private static XdyPlayer mXdyPlayer; | ||
| 30 | + static { | ||
| 31 | + System.loadLibrary("SmartPlayer"); | ||
| 32 | + } | ||
| 33 | + protected XdyPlayer(String rtmpUrl, Context mContext) { | ||
| 34 | + this.mContext=mContext; | ||
| 35 | + } | ||
| 36 | + public static XdyPlayer getXdyPlayerCore(String rtmpUrl, Context mContext){ | ||
| 37 | + if(mXdyPlayer ==null){ | ||
| 38 | + synchronized (XdyPlayer.class){ | ||
| 39 | + if(mXdyPlayer ==null){ | ||
| 40 | + mXdyPlayer =new XdyPlayer(rtmpUrl, mContext); | ||
| 41 | + } | ||
| 42 | + } | ||
| 43 | + } | ||
| 44 | + return mXdyPlayer; | ||
| 45 | + } | ||
| 46 | + | ||
| 47 | + /** | ||
| 48 | + * 播放视频的的调用的方法 | ||
| 49 | + * 如果surfaceView 为null则播放Audio | ||
| 50 | + * @param rtmpUrl | ||
| 51 | + * @param surfaceView | ||
| 52 | + */ | ||
| 53 | + public void playVideo(String rtmpUrl, SurfaceView surfaceView,SmartEventCallback smartEventCallback) { | ||
| 54 | +// if (isPlaying) { | ||
| 55 | +// return; | ||
| 56 | +// } | ||
| 57 | + if(libPlayer==null) { | ||
| 58 | + libPlayer = new SmartPlayerJni(); | ||
| 59 | + } | ||
| 60 | + playerHandle = libPlayer.SmartPlayerInit(mContext); | ||
| 61 | + if (playerHandle == 0) { | ||
| 62 | + XdyLogUtil.e(TAG, "视频初始化失败 "); | ||
| 63 | + return; | ||
| 64 | + } | ||
| 65 | + libPlayer.SetSmartPlayerEventCallback(playerHandle, smartEventCallback); | ||
| 66 | + libPlayer.SmartPlayerSetSurface(playerHandle, surfaceView); | ||
| 67 | + libPlayer.SmartPlayerSetAudioOutputType(playerHandle, 0); | ||
| 68 | + libPlayer.SmartPlayerSetBuffer(playerHandle, 200); | ||
| 69 | + int isPlaySuccessful = libPlayer.SmartPlayerStartPlayback(playerHandle, rtmpUrl); | ||
| 70 | + if (isPlaySuccessful != 0) { | ||
| 71 | + XdyLogUtil.e(TAG, "视频播放失败" + rtmpUrl); | ||
| 72 | + } | ||
| 73 | +// XdySdk.getXdyInstance().notifyObserver("video_success",""); | ||
| 74 | + XdyLogUtil.e(TAG, "视频播放成功" + rtmpUrl); | ||
| 75 | +// isPlaying = true; | ||
| 76 | + | ||
| 77 | + } | ||
| 78 | + | ||
| 79 | + /** | ||
| 80 | + * 播放音频 | ||
| 81 | + * @param rtmpUrl | ||
| 82 | + * @param smartEventCallback | ||
| 83 | + */ | ||
| 84 | + public void playAudio(String rtmpUrl,SmartEventCallback smartEventCallback) { | ||
| 85 | + if(libPlayer==null){ | ||
| 86 | + libPlayer = new SmartPlayerJni(); | ||
| 87 | + } | ||
| 88 | + //TODO | ||
| 89 | + if(playerHandle==0) { | ||
| 90 | + playerHandle = libPlayer.SmartPlayerInit(mContext); | ||
| 91 | + } | ||
| 92 | + XdyLogUtil.e(TAG, "playVideoId" + playerHandle); | ||
| 93 | + if (playerHandle == 0) { | ||
| 94 | + XdyLogUtil.e(TAG, "音频初始化失败"); | ||
| 95 | + return; | ||
| 96 | + } | ||
| 97 | + libPlayer.SetSmartPlayerEventCallback(playerHandle, smartEventCallback); | ||
| 98 | + //播放音频 | ||
| 99 | + libPlayer.SmartPlayerSetSurface(playerHandle, null); | ||
| 100 | + int isPlaySuccessful = libPlayer.SmartPlayerStartPlayback(playerHandle, rtmpUrl); | ||
| 101 | + if (isPlaySuccessful != 0) { | ||
| 102 | + XdyLogUtil.e(TAG, "音频播放失败" + rtmpUrl); | ||
| 103 | + } | ||
| 104 | + XdyLogUtil.e(TAG, "音频播放成功" + rtmpUrl); | ||
| 105 | + } | ||
| 106 | + class EventHande implements SmartEventCallback { | ||
| 107 | + @Override | ||
| 108 | + public void onCallback(int code, long param1, long param2, String param3, String param4, Object param5) { | ||
| 109 | + switch (code) { | ||
| 110 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_STARTED: | ||
| 111 | + Log.i(TAG, "开始。。"); | ||
| 112 | + break; | ||
| 113 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTING: | ||
| 114 | + Log.i(TAG, "连接中。。"); | ||
| 115 | + break; | ||
| 116 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTION_FAILED: | ||
| 117 | + Log.i(TAG, "连接失败。。"); | ||
| 118 | + break; | ||
| 119 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTED: | ||
| 120 | + Log.i(TAG, "连接成功。。"); | ||
| 121 | + break; | ||
| 122 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_DISCONNECTED: | ||
| 123 | + Log.i(TAG, "连接断开。。"); | ||
| 124 | + break; | ||
| 125 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_STOP: | ||
| 126 | + Log.i(TAG, "关闭。。"); | ||
| 127 | + break; | ||
| 128 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_RESOLUTION_INFO: | ||
| 129 | + Log.i(TAG, "分辨率信息: width: " + param1 + ", height: " + param2); | ||
| 130 | + break; | ||
| 131 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_NO_MEDIADATA_RECEIVED: | ||
| 132 | + Log.i(TAG, "收不到媒体数据,可能是url错误。。"); | ||
| 133 | + } | ||
| 134 | + | ||
| 135 | + } | ||
| 136 | + } | ||
| 137 | + | ||
| 138 | + /** | ||
| 139 | + * 结束时调用 | ||
| 140 | + */ | ||
| 141 | + public void onDestroy() | ||
| 142 | + { | ||
| 143 | + XdyLogUtil.i(TAG, "Run into destory++"); | ||
| 144 | + | ||
| 145 | + if(playerHandle!=0) | ||
| 146 | + { | ||
| 147 | + libPlayer.SmartPlayerClose(playerHandle); | ||
| 148 | + playerHandle = 0; | ||
| 149 | + } | ||
| 150 | + } | ||
| 151 | + | ||
| 152 | + /** | ||
| 153 | + * 暂停方法 | ||
| 154 | + */ | ||
| 155 | + public void onPause(){ | ||
| 156 | + if(playerHandle!=0) | ||
| 157 | + { | ||
| 158 | + libPlayer.SmartPlayerClose(playerHandle); | ||
| 159 | + playerHandle = 0; | ||
| 160 | + } | ||
| 161 | + isPlaying = false; | ||
| 162 | + } | ||
| 163 | + /** | ||
| 164 | + * 停止播放,重置正在播放标识 | ||
| 165 | + */ | ||
| 166 | + public void onStopPlay() { | ||
| 167 | + if(playerHandle!=0) | ||
| 168 | + { | ||
| 169 | + libPlayer.SmartPlayerClose(playerHandle); | ||
| 170 | + playerHandle = 0; | ||
| 171 | + } | ||
| 172 | + isPlaying = false; | ||
| 173 | + } | ||
| 174 | +} |
| 1 | +package com.mang.xdy.play; | ||
| 2 | + | ||
| 3 | + | ||
| 4 | +import android.annotation.SuppressLint; | ||
| 5 | +import android.app.Activity; | ||
| 6 | +import android.graphics.ImageFormat; | ||
| 7 | +import android.graphics.PixelFormat; | ||
| 8 | +import android.hardware.Camera; | ||
| 9 | +import android.util.Log; | ||
| 10 | +import android.view.Surface; | ||
| 11 | +import android.view.SurfaceHolder; | ||
| 12 | +import android.view.SurfaceView; | ||
| 13 | + | ||
| 14 | +import com.daniulive.smartpublisher.SmartPublisherJni; | ||
| 15 | +import com.eventhandle.SmartEventCallback; | ||
| 16 | +import com.mang.xdy.utils.XdyLogUtil; | ||
| 17 | +import com.voiceengine.NTAudioRecord; | ||
| 18 | + | ||
| 19 | +import java.io.IOException; | ||
| 20 | +import java.util.List; | ||
| 21 | + | ||
| 22 | +/** | ||
| 23 | + * Created by abao on 2017/4/6. | ||
| 24 | + */ | ||
| 25 | +@SuppressWarnings("deprecation") | ||
| 26 | +public class XdyPublisher implements SurfaceHolder.Callback, Camera.PreviewCallback { | ||
| 27 | + private SurfaceView mSurfaceView; | ||
| 28 | + private SurfaceHolder pubSurfaceViewHolder; | ||
| 29 | + Activity mActivity; | ||
| 30 | + private SmartPublisherJni xdyPublisher; | ||
| 31 | + private Camera.AutoFocusCallback myAutoFocusCallback = null; | ||
| 32 | + NTAudioRecord audioRecord_ = null; | ||
| 33 | + private static final int BACK = 2; | ||
| 34 | + private static final int FRONT = 1; //前置摄像头标记 | ||
| 35 | + private int currentCameraType = BACK; //当前打开的摄像头标记 | ||
| 36 | + private Camera mCamera = null; | ||
| 37 | + private boolean mPreviewRunning = false; | ||
| 38 | + private int curCameraIndex = -1; | ||
| 39 | + private int frameCount = 0; | ||
| 40 | + private static String TAG="XdyPublisher"; | ||
| 41 | + private static final int PORTRAIT = 1; //竖屏 | ||
| 42 | + private static final int LANDSCAPE = 2; //横屏 | ||
| 43 | + private int currentOrigentation = PORTRAIT; | ||
| 44 | + //默认都推送 0不推送 1推送 | ||
| 45 | + protected int audio_opt = 1; | ||
| 46 | + protected int video_opt = 1; | ||
| 47 | + int videoWidth = 640; | ||
| 48 | + private int videoHight = 480; | ||
| 49 | + /*是否推流的标志,true 开始推送,false不推送*/ | ||
| 50 | + private boolean isStart = false; | ||
| 51 | + /*是否支持硬编码 默认不支持*/ | ||
| 52 | + private boolean is_hardware_encoder = false; | ||
| 53 | + | ||
| 54 | + static { | ||
| 55 | + System.loadLibrary("SmartPublisher"); | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + public XdyPublisher(int audio_opt, int video_opt, Activity mActivity) { | ||
| 59 | + this.audio_opt=audio_opt; | ||
| 60 | + this.video_opt=video_opt; | ||
| 61 | + this.mActivity = mActivity; | ||
| 62 | + } | ||
| 63 | + /** | ||
| 64 | + * 开始推流(视频) | ||
| 65 | + * | ||
| 66 | + * @param rtmpUrls | ||
| 67 | + */ | ||
| 68 | + public void publisher(String rtmpUrls, SurfaceView pubSurfaceView,SmartEventCallback smartEventCallback) { | ||
| 69 | +// if(isStart){ | ||
| 70 | +// return; | ||
| 71 | +// } | ||
| 72 | + mPreviewRunning = false; | ||
| 73 | + this.mSurfaceView=pubSurfaceView; | ||
| 74 | + if (xdyPublisher == null) { | ||
| 75 | + xdyPublisher = new SmartPublisherJni(); | ||
| 76 | + } | ||
| 77 | + isStart=true; | ||
| 78 | + if(pubSurfaceViewHolder==null) { | ||
| 79 | + pubSurfaceViewHolder = mSurfaceView.getHolder(); | ||
| 80 | + pubSurfaceViewHolder.addCallback(this); | ||
| 81 | + pubSurfaceViewHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS); | ||
| 82 | + } | ||
| 83 | + Log.i(TAG, "surfaceCreated.."); | ||
| 84 | + try { | ||
| 85 | + currentCameraType = FRONT; | ||
| 86 | + | ||
| 87 | + if (mCamera == null) { | ||
| 88 | + mCamera = openCamera(currentCameraType); | ||
| 89 | + mCamera.stopPreview(); | ||
| 90 | + initCamera(pubSurfaceViewHolder); | ||
| 91 | + } | ||
| 92 | + } catch (Exception e) { | ||
| 93 | + e.printStackTrace(); | ||
| 94 | + Log.e(TAG, "surfaceCreated: 异常了"+e.getMessage()); | ||
| 95 | + } | ||
| 96 | + int i = xdyPublisher.SmartPublisherInit(mActivity, audio_opt,video_opt, videoWidth, videoHight); | ||
| 97 | + XdyLogUtil.e(TAG, ": " + i); | ||
| 98 | + xdyPublisher.SetSmartPublisherEventCallback(new EventHande()); | ||
| 99 | + XdyLogUtil.e(TAG,"url:"+rtmpUrls); | ||
| 100 | + if (xdyPublisher.SmartPublisherSetURL(rtmpUrls) != 0) { | ||
| 101 | + XdyLogUtil.e(TAG, "Failed to set publish stream URL.."); | ||
| 102 | + } | ||
| 103 | + int isStarted = xdyPublisher.SmartPublisherStart(); // 0 成功 | ||
| 104 | + if (isStarted != 0) { | ||
| 105 | + XdyLogUtil.e(TAG, "Failed to publish stream.."); | ||
| 106 | + } else { | ||
| 107 | + XdyLogUtil.e(TAG, "publish successful"); | ||
| 108 | +// isStart = true; | ||
| 109 | + } | ||
| 110 | + CheckInitAudioRecorder(); | ||
| 111 | + } | ||
| 112 | + | ||
| 113 | + /** | ||
| 114 | + * 开始推流(只有音频) | ||
| 115 | + * | ||
| 116 | + * @param rtmpUrl | ||
| 117 | + */ | ||
| 118 | + public void publisherAudio(String rtmpUrl,SmartEventCallback smartEventCallback) { | ||
| 119 | +// if(isStart){ | ||
| 120 | +// return; | ||
| 121 | +// } | ||
| 122 | + if (xdyPublisher == null) { | ||
| 123 | + xdyPublisher = new SmartPublisherJni(); | ||
| 124 | + } | ||
| 125 | + isStart=true; | ||
| 126 | + XdyLogUtil.e(TAG, "surfaceCreated.."); | ||
| 127 | + | ||
| 128 | + int i = xdyPublisher.SmartPublisherInit(mActivity, audio_opt,video_opt, videoWidth, videoHight); | ||
| 129 | + if(i!=0){ | ||
| 130 | + XdyLogUtil.e(TAG, "SmartPublisherInit:初始化返回值是0成功: " + i); | ||
| 131 | + return; | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + xdyPublisher.SetSmartPublisherEventCallback(smartEventCallback); | ||
| 135 | + if (xdyPublisher.SmartPublisherSetURL(rtmpUrl) != 0) { | ||
| 136 | + XdyLogUtil.e(TAG, "Failed to set publish stream URL.."); | ||
| 137 | + } | ||
| 138 | + | ||
| 139 | + if (0 != xdyPublisher.SmartPublisherSetRecorder(0)) { | ||
| 140 | + XdyLogUtil.e(TAG, "SmartPublisherSetRecoder failed."); | ||
| 141 | + return; | ||
| 142 | + } | ||
| 143 | + int isStarted = xdyPublisher.SmartPublisherStart(); // 0 成功 | ||
| 144 | + if (isStarted != 0) { | ||
| 145 | + Log.e(TAG, "Failed to publish stream.."); | ||
| 146 | + } else { | ||
| 147 | + Log.e(TAG, "publish successful"); | ||
| 148 | +// isStart = true; | ||
| 149 | + } | ||
| 150 | + CheckInitAudioRecorder(); | ||
| 151 | + } | ||
| 152 | + void CheckInitAudioRecorder() { | ||
| 153 | + if (audioRecord_ == null) { | ||
| 154 | + audioRecord_ = new NTAudioRecord(mActivity, 1); | ||
| 155 | + } | ||
| 156 | + | ||
| 157 | + if (audioRecord_ != null) { | ||
| 158 | + Log.e(TAG, "onCreate, call executeAudioRecordMethod.."); | ||
| 159 | + audioRecord_.executeAudioRecordMethod(); | ||
| 160 | + } | ||
| 161 | + } | ||
| 162 | + /*abao 连接相机,打开前置还是后置摄像头*/ | ||
| 163 | + @SuppressLint("NewApi") | ||
| 164 | + private Camera openCamera(int type) { | ||
| 165 | + int frontIndex = -1; | ||
| 166 | + int backIndex = -1; | ||
| 167 | + //返回可用相机数量 | ||
| 168 | + int cameraCount = Camera.getNumberOfCameras(); | ||
| 169 | + Log.i(TAG, "cameraCount: " + cameraCount); | ||
| 170 | + | ||
| 171 | + Camera.CameraInfo info = new Camera.CameraInfo(); | ||
| 172 | + for (int cameraIndex = 0; cameraIndex < cameraCount; cameraIndex++) { | ||
| 173 | + Camera.getCameraInfo(cameraIndex, info); | ||
| 174 | + | ||
| 175 | + if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { | ||
| 176 | + frontIndex = cameraIndex; | ||
| 177 | + } else if (info.facing == Camera.CameraInfo.CAMERA_FACING_BACK) { | ||
| 178 | + backIndex = cameraIndex; | ||
| 179 | + } | ||
| 180 | + } | ||
| 181 | + | ||
| 182 | + currentCameraType = type; | ||
| 183 | + if (type == FRONT && frontIndex != -1) { | ||
| 184 | + curCameraIndex = frontIndex; | ||
| 185 | + return Camera.open(frontIndex); | ||
| 186 | + } else if (type == BACK && backIndex != -1) { | ||
| 187 | + curCameraIndex = backIndex; | ||
| 188 | + return Camera.open(backIndex); | ||
| 189 | + } | ||
| 190 | + return null; | ||
| 191 | + } | ||
| 192 | + private void initCamera(SurfaceHolder holder) { | ||
| 193 | + Log.i(TAG, "initCamera.."); | ||
| 194 | + | ||
| 195 | + if (mPreviewRunning) { | ||
| 196 | + if(mCamera!=null) | ||
| 197 | + mCamera.stopPreview(); | ||
| 198 | + } | ||
| 199 | + | ||
| 200 | + Camera.Parameters parameters; | ||
| 201 | + try { | ||
| 202 | + parameters = mCamera.getParameters(); | ||
| 203 | + } catch (Exception e) { | ||
| 204 | + // TODO Auto-generated catch block | ||
| 205 | + e.printStackTrace(); | ||
| 206 | + return; | ||
| 207 | + } | ||
| 208 | + | ||
| 209 | + parameters.setPreviewSize(videoWidth, videoHight); | ||
| 210 | + parameters.setPictureFormat(PixelFormat.JPEG); | ||
| 211 | + parameters.setPreviewFormat(PixelFormat.YCbCr_420_SP); | ||
| 212 | + setCameraDisplayOrientation(mActivity, curCameraIndex, mCamera); | ||
| 213 | + mCamera.setParameters(parameters); | ||
| 214 | + int bufferSize = (((videoWidth | 0xf) + 1) * videoHight * ImageFormat.getBitsPerPixel(parameters.getPreviewFormat())) / 8; | ||
| 215 | + mCamera.addCallbackBuffer(new byte[bufferSize]); | ||
| 216 | + | ||
| 217 | + mCamera.setPreviewCallbackWithBuffer(this); | ||
| 218 | + try { | ||
| 219 | + mCamera.setPreviewDisplay(holder); | ||
| 220 | + } catch (Exception ex) { | ||
| 221 | + // TODO Auto-generated catch block | ||
| 222 | + if (null != mCamera) { | ||
| 223 | + mCamera.release(); | ||
| 224 | + mCamera = null; | ||
| 225 | + } | ||
| 226 | + ex.printStackTrace(); | ||
| 227 | + } | ||
| 228 | + mCamera.startPreview(); | ||
| 229 | + mCamera.autoFocus(myAutoFocusCallback); | ||
| 230 | + mPreviewRunning = true; | ||
| 231 | + } | ||
| 232 | + | ||
| 233 | + | ||
| 234 | + @Override | ||
| 235 | + public void surfaceCreated(SurfaceHolder holder) { | ||
| 236 | + XdyLogUtil.e(TAG,"holder Create"); | ||
| 237 | + | ||
| 238 | + } | ||
| 239 | + | ||
| 240 | + @Override | ||
| 241 | + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { | ||
| 242 | + initCamera(holder); | ||
| 243 | + } | ||
| 244 | + | ||
| 245 | + @Override | ||
| 246 | + public void surfaceDestroyed(SurfaceHolder holder) { | ||
| 247 | + | ||
| 248 | + } | ||
| 249 | + @Override | ||
| 250 | + public void onPreviewFrame(byte[] data, Camera camera) { | ||
| 251 | + frameCount++; | ||
| 252 | + if (frameCount % 3000 == 0) { | ||
| 253 | + XdyLogUtil.i("OnPre", "gc+"); | ||
| 254 | + System.gc(); | ||
| 255 | + XdyLogUtil.i("OnPre", "gc-"); | ||
| 256 | + } | ||
| 257 | + | ||
| 258 | + if (data == null) { | ||
| 259 | + Camera.Parameters params = camera.getParameters(); | ||
| 260 | + Camera.Size size = params.getPreviewSize(); | ||
| 261 | + int bufferSize = (((size.width | 0x1f) + 1) * size.height * ImageFormat.getBitsPerPixel(params.getPreviewFormat())) / 8; | ||
| 262 | + camera.addCallbackBuffer(new byte[bufferSize]); | ||
| 263 | + } else { | ||
| 264 | + if (isStart) { | ||
| 265 | + xdyPublisher.SmartPublisherOnCaptureVideoData(data, data.length, currentCameraType, currentOrigentation); | ||
| 266 | + } | ||
| 267 | + camera.addCallbackBuffer(data); | ||
| 268 | + } | ||
| 269 | + | ||
| 270 | + } | ||
| 271 | + | ||
| 272 | + //Check if it has back camera | ||
| 273 | + public int findBackCamera() { | ||
| 274 | + int cameraCount = 0; | ||
| 275 | + Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); | ||
| 276 | + cameraCount = Camera.getNumberOfCameras(); | ||
| 277 | + | ||
| 278 | + for (int camIdx = 0; camIdx < cameraCount; camIdx++) { | ||
| 279 | + Camera.getCameraInfo(camIdx, cameraInfo); | ||
| 280 | + if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) { | ||
| 281 | + return camIdx; | ||
| 282 | + } | ||
| 283 | + } | ||
| 284 | + return -1; | ||
| 285 | + } | ||
| 286 | + | ||
| 287 | + //Check if it has front camera | ||
| 288 | + private int findFrontCamera() { | ||
| 289 | + int cameraCount = 0; | ||
| 290 | + Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); | ||
| 291 | + cameraCount = Camera.getNumberOfCameras(); | ||
| 292 | + | ||
| 293 | + for (int camIdx = 0; camIdx < cameraCount; camIdx++) { | ||
| 294 | + Camera.getCameraInfo(camIdx, cameraInfo); | ||
| 295 | + if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { | ||
| 296 | + return camIdx; | ||
| 297 | + } | ||
| 298 | + } | ||
| 299 | + return -1; | ||
| 300 | + } | ||
| 301 | + private void switchCamera() throws IOException { | ||
| 302 | + mCamera.setPreviewCallback(null); | ||
| 303 | + mCamera.stopPreview(); | ||
| 304 | + mCamera.release(); | ||
| 305 | + if (currentCameraType == FRONT) { | ||
| 306 | + mCamera = openCamera(BACK); | ||
| 307 | + } else if (currentCameraType == BACK) { | ||
| 308 | + mCamera = openCamera(FRONT); | ||
| 309 | + } | ||
| 310 | + | ||
| 311 | + initCamera(pubSurfaceViewHolder); | ||
| 312 | + } | ||
| 313 | + private void SetCameraFPS(Camera.Parameters parameters) { | ||
| 314 | + if (parameters == null) | ||
| 315 | + return; | ||
| 316 | + | ||
| 317 | + int[] findRange = null; | ||
| 318 | + | ||
| 319 | + int defFPS = 20 * 1000; | ||
| 320 | + | ||
| 321 | + List<int[]> fpsList = parameters.getSupportedPreviewFpsRange(); | ||
| 322 | + if (fpsList != null && fpsList.size() > 0) { | ||
| 323 | + for (int i = 0; i < fpsList.size(); ++i) { | ||
| 324 | + int[] range = fpsList.get(i); | ||
| 325 | + if (range != null | ||
| 326 | + && Camera.Parameters.PREVIEW_FPS_MIN_INDEX < range.length | ||
| 327 | + && Camera.Parameters.PREVIEW_FPS_MAX_INDEX < range.length) { | ||
| 328 | + XdyLogUtil.i(TAG, "Camera index:" + i + " support min fps:" + range[Camera.Parameters.PREVIEW_FPS_MIN_INDEX]); | ||
| 329 | + | ||
| 330 | + XdyLogUtil.i(TAG, "Camera index:" + i + " support max fps:" + range[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]); | ||
| 331 | + | ||
| 332 | + if (findRange == null) { | ||
| 333 | + if (defFPS <= range[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]) { | ||
| 334 | + findRange = range; | ||
| 335 | + | ||
| 336 | + XdyLogUtil.i(TAG, "Camera found appropriate fps, min fps:" + range[Camera.Parameters.PREVIEW_FPS_MIN_INDEX] | ||
| 337 | + + " ,max fps:" + range[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]); | ||
| 338 | + } | ||
| 339 | + } | ||
| 340 | + } | ||
| 341 | + } | ||
| 342 | + } | ||
| 343 | + | ||
| 344 | + if (findRange != null) { | ||
| 345 | + parameters.setPreviewFpsRange(findRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX], findRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]); | ||
| 346 | + } | ||
| 347 | + } | ||
| 348 | + | ||
| 349 | + class EventHande implements SmartEventCallback { | ||
| 350 | + @Override | ||
| 351 | + public void onCallback(int code, long param1, long param2, String param3, String param4, Object param5) { | ||
| 352 | + switch (code) { | ||
| 353 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_STARTED: | ||
| 354 | + XdyLogUtil.i(TAG, "开始。。"); | ||
| 355 | + break; | ||
| 356 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTING: | ||
| 357 | + XdyLogUtil.i(TAG, "连接中。。"); | ||
| 358 | + break; | ||
| 359 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTION_FAILED: | ||
| 360 | + XdyLogUtil.i(TAG, "连接失败。。"); | ||
| 361 | + break; | ||
| 362 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_CONNECTED: | ||
| 363 | + XdyLogUtil.i(TAG, "连接成功。。"); | ||
| 364 | + //TODO | ||
| 365 | + break; | ||
| 366 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_DISCONNECTED: | ||
| 367 | + XdyLogUtil.i(TAG, "连接断开。。"); | ||
| 368 | + break; | ||
| 369 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_STOP: | ||
| 370 | + XdyLogUtil.i(TAG, "关闭。。"); | ||
| 371 | + break; | ||
| 372 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_RESOLUTION_INFO: | ||
| 373 | + XdyLogUtil.i(TAG, "分辨率信息: width: " + param1 + ", height: " + param2); | ||
| 374 | + break; | ||
| 375 | + case EVENTID.EVENT_DANIULIVE_ERC_PLAYER_NO_MEDIADATA_RECEIVED: | ||
| 376 | + XdyLogUtil.i(TAG, "收不到媒体数据,可能是url错误。。"); | ||
| 377 | + } | ||
| 378 | + | ||
| 379 | + } | ||
| 380 | + } | ||
| 381 | + /*abao 让相机的图像显示在同一个方向上显示*/ | ||
| 382 | + private void setCameraDisplayOrientation(Activity activity, int cameraId, android.hardware.Camera camera) { | ||
| 383 | + android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo(); | ||
| 384 | + android.hardware.Camera.getCameraInfo(cameraId, info); | ||
| 385 | + int rotation = activity.getWindowManager().getDefaultDisplay().getRotation(); | ||
| 386 | + int degrees = 0; | ||
| 387 | + switch (rotation) { | ||
| 388 | + case Surface.ROTATION_0: | ||
| 389 | + degrees = 0; | ||
| 390 | + break; | ||
| 391 | + case Surface.ROTATION_90: | ||
| 392 | + degrees = 90; | ||
| 393 | + break; | ||
| 394 | + case Surface.ROTATION_180: | ||
| 395 | + degrees = 180; | ||
| 396 | + break; | ||
| 397 | + case Surface.ROTATION_270: | ||
| 398 | + degrees = 270; | ||
| 399 | + break; | ||
| 400 | + } | ||
| 401 | + int result; | ||
| 402 | + if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { | ||
| 403 | + result = (info.orientation + degrees) % 360; | ||
| 404 | + result = (360 - result) % 360; | ||
| 405 | + } else { | ||
| 406 | + // back-facing | ||
| 407 | + result = (info.orientation - degrees + 360) % 360; | ||
| 408 | + } | ||
| 409 | + | ||
| 410 | + XdyLogUtil.i(TAG, "curDegree: " + result); | ||
| 411 | + | ||
| 412 | + camera.setDisplayOrientation(result); | ||
| 413 | + } | ||
| 414 | + | ||
| 415 | + /** | ||
| 416 | + * 停止推流 | ||
| 417 | + */ | ||
| 418 | + public void onStopPublisher() { | ||
| 419 | + if (audioRecord_ != null) { | ||
| 420 | + XdyLogUtil.i(TAG, "surfaceDestroyed, call StopRecording.."); | ||
| 421 | + audioRecord_.StopRecording(); | ||
| 422 | + audioRecord_ = null; | ||
| 423 | + } | ||
| 424 | + if (xdyPublisher != null) { | ||
| 425 | + xdyPublisher.SmartPublisherStop(); | ||
| 426 | + } | ||
| 427 | + if(mCamera!=null){ | ||
| 428 | + mCamera.release();//释放相机资源 | ||
| 429 | + mCamera=null; | ||
| 430 | + } | ||
| 431 | + XdyLogUtil.e("audio","执行"); | ||
| 432 | + isStart=false; | ||
| 433 | + } | ||
| 434 | + /** | ||
| 435 | + * onPause 方法调用,不释放相机资源 | ||
| 436 | + */ | ||
| 437 | + public void onPausePublisher(){ | ||
| 438 | + isStart=false; | ||
| 439 | + if (audioRecord_ != null) { | ||
| 440 | + XdyLogUtil.i(TAG, "surfaceDestroyed, call StopRecording.."); | ||
| 441 | + audioRecord_.StopRecording(); | ||
| 442 | + audioRecord_ = null; | ||
| 443 | + } | ||
| 444 | + if (xdyPublisher != null) { | ||
| 445 | + xdyPublisher.SmartPublisherStop(); | ||
| 446 | + } | ||
| 447 | +// if(mCamera!=null) { | ||
| 448 | +// mCamera.stopPreview(); | ||
| 449 | +// } | ||
| 450 | + if (mCamera != null) { | ||
| 451 | + mCamera.release(); | ||
| 452 | + mCamera = null; | ||
| 453 | + } | ||
| 454 | + | ||
| 455 | + } | ||
| 456 | + public void onResumePublisher(){ | ||
| 457 | + isStart=true; | ||
| 458 | + } | ||
| 459 | + | ||
| 460 | + public int setHardwareEncoderKbps(int width, int height) | ||
| 461 | + { | ||
| 462 | + int hwEncoderKpbs = 0; | ||
| 463 | + | ||
| 464 | + switch(width) { | ||
| 465 | + case 176: | ||
| 466 | + hwEncoderKpbs = 300; | ||
| 467 | + break; | ||
| 468 | + case 320: | ||
| 469 | + hwEncoderKpbs = 500; | ||
| 470 | + break; | ||
| 471 | + case 640: | ||
| 472 | + hwEncoderKpbs = 1000; | ||
| 473 | + break; | ||
| 474 | + case 1280: | ||
| 475 | + hwEncoderKpbs = 1700; | ||
| 476 | + break; | ||
| 477 | + default: | ||
| 478 | + hwEncoderKpbs = 1000; | ||
| 479 | + } | ||
| 480 | + | ||
| 481 | + return hwEncoderKpbs; | ||
| 482 | + } | ||
| 483 | +} |
-
请 注册 或 登录 后发表评论