huangxinbao / Android_Sdk

转到一个项目
Toggle navigation Toggle navigation pinning
huangxinbao
1a7e8942 1 parent 91cdd737

add key and Marshmallow fit

内嵌 并排对比
正在显示 39 个修改的文件 包含 443 行增加 和 95 行删除
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 <option name="modules"> 9 <option name="modules">
10 <set> 10 <set>
11 <option value="$PROJECT_DIR$" /> 11 <option value="$PROJECT_DIR$" />
12 - <option value="$PROJECT_DIR$/XdyDemo" />  
13 <option value="$PROJECT_DIR$/app" /> 12 <option value="$PROJECT_DIR$/app" />
14 <option value="$PROJECT_DIR$/easeUI_CN" /> 13 <option value="$PROJECT_DIR$/easeUI_CN" />
15 <option value="$PROJECT_DIR$/iOS_Dialog_Library" /> 14 <option value="$PROJECT_DIR$/iOS_Dialog_Library" />
@@ -18,6 +17,7 @@ @@ -18,6 +17,7 @@
18 <option value="$PROJECT_DIR$/sdklibraryssss" /> 17 <option value="$PROJECT_DIR$/sdklibraryssss" />
19 <option value="$PROJECT_DIR$/smartPlayer" /> 18 <option value="$PROJECT_DIR$/smartPlayer" />
20 <option value="$PROJECT_DIR$/xdy" /> 19 <option value="$PROJECT_DIR$/xdy" />
  20 + <option value="$PROJECT_DIR$/xuedianyun" />
21 </set> 21 </set>
22 </option> 22 </option>
23 <option name="resolveModulePerSourceSet" value="false" /> 23 <option name="resolveModulePerSourceSet" value="false" />
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 <component name="ProjectModuleManager"> 3 <component name="ProjectModuleManager">
4 <modules> 4 <modules>
5 <module fileurl="file://$PROJECT_DIR$/MyApplication.iml" filepath="$PROJECT_DIR$/MyApplication.iml" /> 5 <module fileurl="file://$PROJECT_DIR$/MyApplication.iml" filepath="$PROJECT_DIR$/MyApplication.iml" />
6 - <module fileurl="file://$PROJECT_DIR$/XdyDemo/XdyDemo.iml" filepath="$PROJECT_DIR$/XdyDemo/XdyDemo.iml" />  
7 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
8 <module fileurl="file://$PROJECT_DIR$/easeUI_CN/easeUI_CN.iml" filepath="$PROJECT_DIR$/easeUI_CN/easeUI_CN.iml" /> 7 <module fileurl="file://$PROJECT_DIR$/easeUI_CN/easeUI_CN.iml" filepath="$PROJECT_DIR$/easeUI_CN/easeUI_CN.iml" />
9 <module fileurl="file://$PROJECT_DIR$/iOS_Dialog_Library/iOS_Dialog_Library.iml" filepath="$PROJECT_DIR$/iOS_Dialog_Library/iOS_Dialog_Library.iml" /> 8 <module fileurl="file://$PROJECT_DIR$/iOS_Dialog_Library/iOS_Dialog_Library.iml" filepath="$PROJECT_DIR$/iOS_Dialog_Library/iOS_Dialog_Library.iml" />
@@ -12,6 +11,7 @@ @@ -12,6 +11,7 @@
12 <module fileurl="file://$PROJECT_DIR$/sdklibraryssss/sdklibraryssss.iml" filepath="$PROJECT_DIR$/sdklibraryssss/sdklibraryssss.iml" /> 11 <module fileurl="file://$PROJECT_DIR$/sdklibraryssss/sdklibraryssss.iml" filepath="$PROJECT_DIR$/sdklibraryssss/sdklibraryssss.iml" />
13 <module fileurl="file://$PROJECT_DIR$/smartPlayer/smartPlayer.iml" filepath="$PROJECT_DIR$/smartPlayer/smartPlayer.iml" /> 12 <module fileurl="file://$PROJECT_DIR$/smartPlayer/smartPlayer.iml" filepath="$PROJECT_DIR$/smartPlayer/smartPlayer.iml" />
14 <module fileurl="file://$PROJECT_DIR$/xdy/xdy.iml" filepath="$PROJECT_DIR$/xdy/xdy.iml" /> 13 <module fileurl="file://$PROJECT_DIR$/xdy/xdy.iml" filepath="$PROJECT_DIR$/xdy/xdy.iml" />
  14 + <module fileurl="file://$PROJECT_DIR$/xuedianyun/xuedianyun.iml" filepath="$PROJECT_DIR$/xuedianyun/xuedianyun.iml" />
15 </modules> 15 </modules>
16 </component> 16 </component>
17 </project> 17 </project>
@@ -13,12 +13,8 @@ import android.webkit.WebView; @@ -13,12 +13,8 @@ import android.webkit.WebView;
13 import android.widget.Button; 13 import android.widget.Button;
14 14
15 import com.eventhandle.SmartEventCallback; 15 import com.eventhandle.SmartEventCallback;
16 -import com.google.gson.Gson;  
17 import com.mang.xdy.core.XdySdk; 16 import com.mang.xdy.core.XdySdk;
18 -import com.mang.xdy.utils.XdyLogUtil;  
19 -import com.mang.xdy.utils.XdyStringUtils;  
20 17
21 -import xdycom.abao.myapplication.entity.LiveBean;  
22 import xdycom.abao.myapplication.utisl.StringUtils; 18 import xdycom.abao.myapplication.utisl.StringUtils;
23 19
24 import static xdycom.abao.myapplication.MainActivity.stringToJson; 20 import static xdycom.abao.myapplication.MainActivity.stringToJson;
@@ -13,7 +13,6 @@ import android.webkit.WebChromeClient; @@ -13,7 +13,6 @@ import android.webkit.WebChromeClient;
13 import android.webkit.WebSettings; 13 import android.webkit.WebSettings;
14 import android.webkit.WebView; 14 import android.webkit.WebView;
15 15
16 -import com.mang.xdy.core.APIContants;  
17 import com.mang.xdy.utils.XdyLogUtil; 16 import com.mang.xdy.utils.XdyLogUtil;
18 17
19 /** 18 /**
@@ -15,16 +15,16 @@ public final class R { @@ -15,16 +15,16 @@ public final class R {
15 public static final class attr { 15 public static final class attr {
16 } 16 }
17 public static final class color { 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; 18 + public static int actionsheet_blue=0x7f070000;
  19 + public static int actionsheet_gray=0x7f070001;
  20 + public static int actionsheet_red=0x7f070002;
  21 + public static int alertdialog_line=0x7f070003;
  22 + public static int black=0x7f070004;
  23 + public static int trans=0x7f070005;
24 } 24 }
25 public static final class dimen { 25 public static final class dimen {
26 - public static int activity_horizontal_margin=0x7f070000;  
27 - public static int activity_vertical_margin=0x7f070001; 26 + public static int activity_horizontal_margin=0x7f080000;
  27 + public static int activity_vertical_margin=0x7f080001;
28 } 28 }
29 public static final class drawable { 29 public static final class drawable {
30 public static int actionsheet_bottom_normal=0x7f020000; 30 public static int actionsheet_bottom_normal=0x7f020000;
@@ -71,17 +71,18 @@ public final class R { @@ -71,17 +71,18 @@ public final class R {
71 public static int view_alertdialog=0x7f030002; 71 public static int view_alertdialog=0x7f030002;
72 } 72 }
73 public static final class string { 73 public static final class string {
74 - public static int app_name=0x7f080000; 74 + public static int app_name=0x7f050001;
  75 + public static int dialog_cancle=0x7f050000;
75 } 76 }
76 public static final class style { 77 public static final class style {
77 - public static int ActionSheetDialogAnimation=0x7f050001;  
78 - public static int ActionSheetDialogStyle=0x7f050002;  
79 - public static int AlertDialogStyle=0x7f050003;  
80 - public static int AnswerSheetDialogStyle=0x7f050004; 78 + public static int ActionSheetDialogAnimation=0x7f060001;
  79 + public static int ActionSheetDialogStyle=0x7f060002;
  80 + public static int AlertDialogStyle=0x7f060003;
  81 + public static int AnswerSheetDialogStyle=0x7f060004;
81 /** API 11 theme customizations can go here. 82 /** API 11 theme customizations can go here.
82 API 14 theme customizations can go here. 83 API 14 theme customizations can go here.
83 */ 84 */
84 - public static int AppBaseTheme=0x7f050000;  
85 - public static int AppTheme=0x7f050005; 85 + public static int AppBaseTheme=0x7f060000;
  86 + public static int AppTheme=0x7f060005;
86 } 87 }
87 } 88 }
@@ -167,9 +167,9 @@ @@ -167,9 +167,9 @@
167 "position": { 167 "position": {
168 "startLine": 3, 168 "startLine": 3,
169 "startColumn": 4, 169 "startColumn": 4,
170 - "startOffset": 58, 170 + "startOffset": 59,
171 "endColumn": 46, 171 "endColumn": 46,
172 - "endOffset": 100 172 + "endOffset": 101
173 } 173 }
174 } 174 }
175 }, 175 },
@@ -178,9 +178,28 @@ @@ -178,9 +178,28 @@
178 "startLine": 11, 178 "startLine": 11,
179 "startColumn": 4, 179 "startColumn": 4,
180 "startOffset": 501, 180 "startOffset": 501,
181 - "endLine": 14, 181 + "endColumn": 44,
  182 + "endOffset": 541
  183 + },
  184 + "from": {
  185 + "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\strings.xml",
  186 + "position": {
  187 + "startLine": 4,
  188 + "startColumn": 4,
  189 + "startOffset": 107,
  190 + "endColumn": 44,
  191 + "endOffset": 147
  192 + }
  193 + }
  194 + },
  195 + {
  196 + "to": {
  197 + "startLine": 12,
  198 + "startColumn": 4,
  199 + "startOffset": 546,
  200 + "endLine": 15,
182 "endColumn": 12, 201 "endColumn": 12,
183 - "endOffset": 766 202 + "endOffset": 811
184 }, 203 },
185 "from": { 204 "from": {
186 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 205 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -196,12 +215,12 @@ @@ -196,12 +215,12 @@
196 }, 215 },
197 { 216 {
198 "to": { 217 "to": {
199 - "startLine": 15, 218 + "startLine": 16,
200 "startColumn": 4, 219 "startColumn": 4,
201 - "startOffset": 771,  
202 - "endLine": 32, 220 + "startOffset": 816,
  221 + "endLine": 33,
203 "endColumn": 12, 222 "endColumn": 12,
204 - "endOffset": 1561 223 + "endOffset": 1606
205 }, 224 },
206 "from": { 225 "from": {
207 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 226 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -217,12 +236,12 @@ @@ -217,12 +236,12 @@
217 }, 236 },
218 { 237 {
219 "to": { 238 "to": {
220 - "startLine": 33, 239 + "startLine": 34,
221 "startColumn": 4, 240 "startColumn": 4,
222 - "startOffset": 1566,  
223 - "endLine": 41, 241 + "startOffset": 1611,
  242 + "endLine": 42,
224 "endColumn": 12, 243 "endColumn": 12,
225 - "endOffset": 2080 244 + "endOffset": 2125
226 }, 245 },
227 "from": { 246 "from": {
228 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 247 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -238,12 +257,12 @@ @@ -238,12 +257,12 @@
238 }, 257 },
239 { 258 {
240 "to": { 259 "to": {
241 - "startLine": 42, 260 + "startLine": 43,
242 "startColumn": 4, 261 "startColumn": 4,
243 - "startOffset": 2085,  
244 - "endLine": 59, 262 + "startOffset": 2130,
  263 + "endLine": 60,
245 "endColumn": 12, 264 "endColumn": 12,
246 - "endOffset": 2876 265 + "endOffset": 2921
247 }, 266 },
248 "from": { 267 "from": {
249 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 268 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -259,11 +278,11 @@ @@ -259,11 +278,11 @@
259 }, 278 },
260 { 279 {
261 "to": { 280 "to": {
262 - "startLine": 60, 281 + "startLine": 61,
263 "startColumn": 4, 282 "startColumn": 4,
264 - "startOffset": 2881, 283 + "startOffset": 2926,
265 "endColumn": 72, 284 "endColumn": 72,
266 - "endOffset": 2949 285 + "endOffset": 2994
267 }, 286 },
268 "from": { 287 "from": {
269 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 288 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -278,11 +297,11 @@ @@ -278,11 +297,11 @@
278 }, 297 },
279 { 298 {
280 "to": { 299 "to": {
281 - "startLine": 61, 300 + "startLine": 62,
282 "startColumn": 4, 301 "startColumn": 4,
283 - "startOffset": 2954, 302 + "startOffset": 2999,
284 "endColumn": 50, 303 "endColumn": 50,
285 - "endOffset": 3000 304 + "endOffset": 3045
286 }, 305 },
287 "from": { 306 "from": {
288 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 307 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -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 },
1 int anim actionsheet_dialog_in 0x7f040000 1 int anim actionsheet_dialog_in 0x7f040000
2 int anim actionsheet_dialog_out 0x7f040001 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 3 +int color actionsheet_blue 0x7f070000
  4 +int color actionsheet_gray 0x7f070001
  5 +int color actionsheet_red 0x7f070002
  6 +int color alertdialog_line 0x7f070003
  7 +int color black 0x7f070004
  8 +int color trans 0x7f070005
  9 +int dimen activity_horizontal_margin 0x7f080000
  10 +int dimen activity_vertical_margin 0x7f080001
11 int drawable actionsheet_bottom_normal 0x7f020000 11 int drawable actionsheet_bottom_normal 0x7f020000
12 int drawable actionsheet_bottom_pressed 0x7f020001 12 int drawable actionsheet_bottom_pressed 0x7f020001
13 int drawable actionsheet_bottom_selector 0x7f020002 13 int drawable actionsheet_bottom_selector 0x7f020002
@@ -46,10 +46,11 @@ int id txt_title 0x7f090005 @@ -46,10 +46,11 @@ int id txt_title 0x7f090005
46 int layout activity_main 0x7f030000 46 int layout activity_main 0x7f030000
47 int layout view_actionsheet 0x7f030001 47 int layout view_actionsheet 0x7f030001
48 int layout view_alertdialog 0x7f030002 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 AnswerSheetDialogStyle 0x7f050004  
54 -int style AppBaseTheme 0x7f050000  
55 -int style AppTheme 0x7f050005 49 +int string app_name 0x7f050001
  50 +int string dialog_cancle 0x7f050000
  51 +int style ActionSheetDialogAnimation 0x7f060001
  52 +int style ActionSheetDialogStyle 0x7f060002
  53 +int style AlertDialogStyle 0x7f060003
  54 +int style AnswerSheetDialogStyle 0x7f060004
  55 +int style AppBaseTheme 0x7f060000
  56 +int style AppTheme 0x7f060005
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 android:layout_marginTop="8dp" 42 android:layout_marginTop="8dp"
43 android:background="@drawable/actionsheet_single_selector" 43 android:background="@drawable/actionsheet_single_selector"
44 android:gravity="center" 44 android:gravity="center"
45 - android:text="取消" 45 + android:text="@string/dialog_cancle"
46 android:textColor="@color/actionsheet_blue" 46 android:textColor="@color/actionsheet_blue"
47 android:textSize="18sp" 47 android:textSize="18sp"
48 android:textStyle="bold" /> 48 android:textStyle="bold" />
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 <dimen name="activity_horizontal_margin">16dp</dimen> 9 <dimen name="activity_horizontal_margin">16dp</dimen>
10 <dimen name="activity_vertical_margin">16dp</dimen> 10 <dimen name="activity_vertical_margin">16dp</dimen>
11 <string name="app_name">IOSDialog</string> 11 <string name="app_name">IOSDialog</string>
  12 + <string name="dialog_cancle">取消</string>
12 <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> 13 <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
13 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> 14 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
14 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> 15 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
1 -#Mon May 15 14:28:08 CST 2017 1 +#Thu May 18 19:02:27 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
@@ -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\\res\\merged\\release\\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\\res\\merged\\release\\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\\res\\merged\\release\\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\\res\\merged\\release\\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\\res\\merged\\release\\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\\res\\merged\\release\\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\\release\\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\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png 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\\res\\merged\\release\\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\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_right_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\\release\\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\\res\\merged\\release\\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\\release\\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\\res\\merged\\release\\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\\release\\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\\res\\merged\\release\\drawable\\alertdialog_right_selector.xml
1 <?xml version="1.0" encoding="utf-8"?> 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\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\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"> 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\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\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="dialog_cancle">取消</string><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 3
4 4
5 <item name="android:windowBackground">@android:color/transparent</item> 5 <item name="android:windowBackground">@android:color/transparent</item>
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> 44 </style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
45 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> 45 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
46 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> 46 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
47 - </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"> 47 + </style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-en-rUS\strings.xml" qualifiers="en-rUS"><string name="dialog_cancle">cancel</string></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">
48 48
49 </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"> 49 </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">
50 50
1 -#Mon May 15 14:27:37 CST 2017 1 +#Thu May 18 19:02:29 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
@@ -6,8 +6,8 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hd @@ -6,8 +6,8 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hd
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\\release\\res\\drawable\\actionsheet_middle_selector.xml 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\\release\\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\\release\\res\\anim\\actionsheet_dialog_in.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\\release\\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\\release\\res\\drawable\\alertdialog_left_selector.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\\release\\res\\drawable\\alertdialog_left_selector.xml
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 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\\release\\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\\release\\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\\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_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 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
1 <?xml version="1.0" encoding="utf-8"?> 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\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\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"> 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\release"/><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\release\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="dialog_cancle">取消</string><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 3
4 4
5 <item name="android:windowBackground">@android:color/transparent</item> 5 <item name="android:windowBackground">@android:color/transparent</item>
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> 44 </style><style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
45 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> 45 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
46 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> 46 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
47 - </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"> 47 + </style><style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/></file><file path="D:\Android_Sdk\MyApplication\iOS_Dialog_Library\src\main\res\values-en-rUS\strings.xml" qualifiers="en-rUS"><string name="dialog_cancle">cancel</string></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">
48 48
49 </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"> 49 </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">
50 50
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 android:layout_marginTop="8dp" 42 android:layout_marginTop="8dp"
43 android:background="@drawable/actionsheet_single_selector" 43 android:background="@drawable/actionsheet_single_selector"
44 android:gravity="center" 44 android:gravity="center"
45 - android:text="取消" 45 + android:text="@string/dialog_cancle"
46 android:textColor="@color/actionsheet_blue" 46 android:textColor="@color/actionsheet_blue"
47 android:textSize="18sp" 47 android:textSize="18sp"
48 android:textStyle="bold" /> 48 android:textStyle="bold" />
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 <dimen name="activity_horizontal_margin">16dp</dimen> 9 <dimen name="activity_horizontal_margin">16dp</dimen>
10 <dimen name="activity_vertical_margin">16dp</dimen> 10 <dimen name="activity_vertical_margin">16dp</dimen>
11 <string name="app_name">IOSDialog</string> 11 <string name="app_name">IOSDialog</string>
  12 + <string name="dialog_cancle">取消</string>
12 <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> 13 <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
13 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> 14 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>
14 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item> 15 <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>
@@ -92,7 +92,7 @@ public class AlertDialog { @@ -92,7 +92,7 @@ public class AlertDialog {
92 } 92 }
93 93
94 public AlertDialog setPositiveButton(String text, 94 public AlertDialog setPositiveButton(String text,
95 - final OnClickListener listener) { 95 + final OnClickListener listener) {
96 showPosBtn = true; 96 showPosBtn = true;
97 if ("".equals(text)) { 97 if ("".equals(text)) {
98 btn_pos.setText("确定"); 98 btn_pos.setText("确定");
@@ -110,7 +110,7 @@ public class AlertDialog { @@ -110,7 +110,7 @@ public class AlertDialog {
110 } 110 }
111 111
112 public AlertDialog setNegativeButton(String text, 112 public AlertDialog setNegativeButton(String text,
113 - final OnClickListener listener) { 113 + final OnClickListener listener) {
114 showNegBtn = true; 114 showNegBtn = true;
115 if ("".equals(text)) { 115 if ("".equals(text)) {
116 btn_neg.setText("取消"); 116 btn_neg.setText("取消");
@@ -144,7 +144,8 @@ public class AlertDialog { @@ -144,7 +144,8 @@ public class AlertDialog {
144 if (!showPosBtn && !showNegBtn) { 144 if (!showPosBtn && !showNegBtn) {
145 btn_pos.setText("确定"); 145 btn_pos.setText("确定");
146 btn_pos.setVisibility(View.VISIBLE); 146 btn_pos.setVisibility(View.VISIBLE);
147 - btn_pos.setBackgroundResource(R.drawable.alertdialog_single_selector); 147 + btn_pos.setBackgroundResource
  148 + (R.drawable.alertdialog_single_selector);
148 btn_pos.setOnClickListener(new OnClickListener() { 149 btn_pos.setOnClickListener(new OnClickListener() {
149 @Override 150 @Override
150 public void onClick(View v) { 151 public void onClick(View v) {
@@ -155,20 +156,24 @@ public class AlertDialog { @@ -155,20 +156,24 @@ public class AlertDialog {
155 156
156 if (showPosBtn && showNegBtn) { 157 if (showPosBtn && showNegBtn) {
157 btn_pos.setVisibility(View.VISIBLE); 158 btn_pos.setVisibility(View.VISIBLE);
158 - btn_pos.setBackgroundResource(R.drawable.alertdialog_right_selector); 159 + btn_pos.setBackgroundResource
  160 + (R.drawable.alertdialog_right_selector);
159 btn_neg.setVisibility(View.VISIBLE); 161 btn_neg.setVisibility(View.VISIBLE);
160 - btn_neg.setBackgroundResource(R.drawable.alertdialog_left_selector); 162 + btn_neg.setBackgroundResource
  163 + (R.drawable.alertdialog_left_selector);
161 img_line.setVisibility(View.VISIBLE); 164 img_line.setVisibility(View.VISIBLE);
162 } 165 }
163 166
164 if (showPosBtn && !showNegBtn) { 167 if (showPosBtn && !showNegBtn) {
165 btn_pos.setVisibility(View.VISIBLE); 168 btn_pos.setVisibility(View.VISIBLE);
166 - btn_pos.setBackgroundResource(R.drawable.alertdialog_single_selector); 169 + btn_pos.setBackgroundResource
  170 + (R.drawable.alertdialog_single_selector);
167 } 171 }
168 172
169 if (!showPosBtn && showNegBtn) { 173 if (!showPosBtn && showNegBtn) {
170 btn_neg.setVisibility(View.VISIBLE); 174 btn_neg.setVisibility(View.VISIBLE);
171 - btn_neg.setBackgroundResource(R.drawable.alertdialog_single_selector); 175 + btn_neg.setBackgroundResource
  176 + (R.drawable.alertdialog_single_selector);
172 } 177 }
173 } 178 }
174 179
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 android:layout_marginTop="8dp" 42 android:layout_marginTop="8dp"
43 android:background="@drawable/actionsheet_single_selector" 43 android:background="@drawable/actionsheet_single_selector"
44 android:gravity="center" 44 android:gravity="center"
45 - android:text="取消" 45 + android:text="@string/dialog_cancle"
46 android:textColor="@color/actionsheet_blue" 46 android:textColor="@color/actionsheet_blue"
47 android:textSize="18sp" 47 android:textSize="18sp"
48 android:textStyle="bold" /> 48 android:textStyle="bold" />
@@ -2,5 +2,6 @@ @@ -2,5 +2,6 @@
2 <resources> 2 <resources>
3 3
4 <string name="app_name">IOSDialog</string> 4 <string name="app_name">IOSDialog</string>
  5 + <string name="dialog_cancle">取消</string>
5 6
6 </resources> 7 </resources>
1 -include ':app', ':mylibrary', ':xdy', ':sdklibraryssss', ':easeUI_CN', ':smartPlayer', ':myapplication2', ':XdyDemo', ':iOS_Dialog_Library' 1 +include ':app', ':mylibrary', ':xdy', ':sdklibraryssss', ':easeUI_CN', ':smartPlayer', ':myapplication2', ':xuedianyun', ':iOS_Dialog_Library'
@@ -57,7 +57,6 @@ public class XdySdk implements SubjectListener { @@ -57,7 +57,6 @@ public class XdySdk implements SubjectListener {
57 private String currentPlayId=""; 57 private String currentPlayId="";
58 /*缓存管理*/ 58 /*缓存管理*/
59 private static ACache aCache; 59 private static ACache aCache;
60 - //TODO 拿不到同步的数据先保留信息(必须释放，否者内存泄漏)  
61 private SurfaceView mSurfaceView_Publish; 60 private SurfaceView mSurfaceView_Publish;
62 private Activity mActivity; 61 private Activity mActivity;
63 /*是否正在推流，mcu自动断开，onPause使用的时候使用,推流成功后才表示正在使用*/ 62 /*是否正在推流，mcu自动断开，onPause使用的时候使用,推流成功后才表示正在使用*/
@@ -77,7 +76,6 @@ public class XdySdk implements SubjectListener { @@ -77,7 +76,6 @@ public class XdySdk implements SubjectListener {
77 /*z正在播放视频 onStop 重置状态,是否是Host 在播放视频，这个优先级最高,1v1 产物*/ 76 /*z正在播放视频 onStop 重置状态,是否是Host 在播放视频，这个优先级最高,1v1 产物*/
78 private boolean isCurrentVideoHost=false; 77 private boolean isCurrentVideoHost=false;
79 private boolean isCurrentAudioHost=false; 78 private boolean isCurrentAudioHost=false;
80 -  
81 @Override 79 @Override
82 public void add(ObserverListener observerListener) { 80 public void add(ObserverListener observerListener) {
83 observerListenerList.add(observerListener); 81 observerListenerList.add(observerListener);
@@ -507,12 +505,6 @@ public class XdySdk implements SubjectListener { @@ -507,12 +505,6 @@ public class XdySdk implements SubjectListener {
507 ErrorCodeEntity errorCodeEntity =JsonUtil.parseJsonToBean(response,ErrorCodeEntity.class); 505 ErrorCodeEntity errorCodeEntity =JsonUtil.parseJsonToBean(response,ErrorCodeEntity.class);
508 if(errorCodeEntity!=null){ 506 if(errorCodeEntity!=null){
509 if(errorCodeEntity.getCode()==Constants.LEAVE_CLASS_CODE){ 507 if(errorCodeEntity.getCode()==Constants.LEAVE_CLASS_CODE){
510 - /**  
511 - * 方案 一 1，正在直播的时候mcu无故断开，需要重新连接  
512 - * 2，class exit 时候主动课堂停止，停止推流  
513 - * 利用mcu的生命周期，加入课堂成功后去请求数据  
514 - */  
515 - // 方案 二 mcu 断开，页面也断开，用户需要手动重新调用  
516 if(isPublisher) { 508 if(isPublisher) {
517 if(!NetWorkUtils.isNetworkConnected(mContext)){ 509 if(!NetWorkUtils.isNetworkConnected(mContext)){
518 //todo判断是否有网络，没有网络的话就让其退出 510 //todo判断是否有网络，没有网络的话就让其退出
  1 +apply plugin: 'com.android.application'
  2 +
  3 +android {
  4 + compileSdkVersion 25
  5 + buildToolsVersion '25.0.2'
  6 + aaptOptions.cruncherEnabled = false
  7 + aaptOptions.useNewCruncher = false
  8 + defaultConfig {
  9 + applicationId "com.mang.xdy.demo"
  10 + minSdkVersion 15
  11 + targetSdkVersion 23
  12 + versionCode 1
  13 + versionName "1.0"
  14 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  15 +
  16 + }
  17 + buildTypes {
  18 + release {
  19 + //是否混淆
  20 + minifyEnabled false
  21 + zipAlignEnabled true
  22 +// shrinkResources true//去除无用的resource文件，第一次使用
  23 + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  24 + }
  25 + }
  26 + repositories {
  27 + flatDir {
  28 + dirs 'libs'
  29 + }
  30 + }
  31 +}
  32 +
  33 +dependencies {
  34 + compile fileTree(include: ['*.jar'], dir: 'libs')
  35 + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
  36 + exclude group: 'com.android.support', module: 'support-annotations'
  37 + })
  38 + compile files('libs/pldroid-player-1.5.1.jar')
  39 + compile 'com.android.support:appcompat-v7:25.3.1'
  40 + compile 'com.jakewharton:butterknife:8.5.1'
  41 + compile 'com.android.support:design:25.3.1'
  42 + compile 'com.squareup.picasso:picasso:2.3.2'
  43 + compile 'com.github.bumptech.glide:glide:3.7.0'
  44 + compile 'com.rockerhieu.emojicon:library:1.3.1'
  45 + compile 'org.kymjs.kjframe:kjframe:2.6'
  46 + compile 'io.reactivex:rxjava:1.0.9'
  47 + compile 'io.reactivex:rxandroid:0.24.0'
  48 +// compile 'com.squareup.retrofit:retrofit:1.9.0'
  49 + compile 'com.nineoldandroids:library:2.4.0'
  50 + compile 'me.yokeyword:fragmentation:0.10.3'
  51 + compile 'com.qiniu:happy-dns:0.2.+'
  52 +// compile 'com.android.support:support-v4:25.3.1'
  53 + testCompile 'junit:junit:4.12'
  54 + annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
  55 + compile 'com.qiniu:happy-dns:0.2.+'
  56 + compile 'org.greenrobot:eventbus:3.0.0'
  57 + compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
  58 + compile project(':iOS_Dialog_Library')
  59 + compile project(':xdy')
  60 +}
  1 +appkey:android_xdy
  1 +# Add project specific ProGuard rules here.
  2 +# By default, the flags in this file are appended to flags specified
  3 +# in D:\sdk/tools/proguard/proguard-android.txt
  4 +# You can edit the include path and order by changing the proguardFiles
  5 +# directive in build.gradle.
  6 +#
  7 +# For more details, see
  8 +# http://developer.android.com/guide/developing/tools/proguard.html
  9 +
  10 +# Add any project specific keep options here:
  11 +
  12 +# If your project uses WebView with JS, uncomment the following
  13 +# and specify the fully qualified class name to the JavaScript interface
  14 +# class:
  15 +#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
  16 +# public *;
  17 +#}
  18 +
  19 +#指定代码的压缩级别
  20 + -optimizationpasses 5
  21 +
  22 + #包明不混合大小写
  23 + -dontusemixedcaseclassnames
  24 +
  25 + #不去忽略非公共的库类
  26 + -dontskipnonpubliclibraryclasses
  27 + #优化 不优化输入的类文件
  28 + -dontoptimize
  29 +
  30 + #预校验
  31 + -dontpreverify
  32 +
  33 + #混淆时是否记录日志
  34 + -verbose
  35 +
  36 + # 混淆时所采用的算法
  37 + -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
  38 +
  39 + #保护注解
  40 + -keepattributes *Annotation*
  41 +
  42 + # 保持哪些类不被混淆
  43 + -keep public class * extends android.app.Fragment
  44 + -keep public class * extends android.app.Activity
  45 + -keep public class * extends android.app.Application
  46 + -keep public class * extends android.app.Service
  47 + -keep public class * extends android.content.BroadcastReceiver
  48 + -keep public class * extends android.content.ContentProvider
  49 + -keep public class * extends android.app.backup.BackupAgentHelper
  50 + -keep public class * extends android.preference.Preference
  51 + -keep public class com.android.vending.licensing.ILicensingService
  52 + #如果有引用v4包可以添加下面这行
  53 + -keep public class * extends android.support.v4.app.Fragment
  54 + #忽略警告
  55 + -ignorewarning
  56 +
  57 + ##记录生成的日志数据,gradle build时在本项目根目录输出##
  58 +
  59 + #apk 包内所有 class 的内部结构
  60 + -dump class_files.txt
  61 + #未混淆的类和成员
  62 + -printseeds seeds.txt
  63 + #列出从 apk 中删除的代码
  64 + -printusage unused.txt
  65 + #混淆前后的映射
  66 + -printmapping mapping.txt
  67 +
  68 + #如果不想混淆 keep 掉
  69 + -keep class com.lippi.recorder.iirfilterdesigner.** {*; }
  70 + #友盟
  71 + -keep class com.umeng.**{*;}
  72 + #项目特殊处理代码
  73 +
  74 + #忽略警告
  75 + -dontwarn com.lippi.recorder.utils**
  76 + #保留一个完整的包
  77 + -keep class com.lippi.recorder.utils.** {
  78 + *;
  79 + }
  80 +
  81 + -keep class com.lippi.recorder.utils.AudioRecorder{*;}
  82 +
  83 +
  84 + #如果引用了v4或者v7包
  85 + -dontwarn android.support.**
  86 +
  87 + ####混淆保护自己项目的部分代码以及引用的第三方jar包library-end####
  88 +
  89 + -keep public class * extends android.view.View {
  90 + public <init>(android.content.Context);
  91 + public <init>(android.content.Context, android.util.AttributeSet);
  92 + public <init>(android.content.Context, android.util.AttributeSet, int);
  93 + public void set*(...);
  94 + }
  95 +
  96 + #保持 native 方法不被混淆
  97 + -keepclasseswithmembernames class * {
  98 + native <methods>;
  99 + }
  100 +
  101 + #保持自定义控件类不被混淆
  102 + -keepclasseswithmembers class * {
  103 + public <init>(android.content.Context, android.util.AttributeSet);
  104 + }
  105 +
  106 + #保持自定义控件类不被混淆
  107 + #We want to keep methods in Activity that could be used in the XML attribute onClick
  108 + -keepclassmembers class * extends android.app.Activity {
  109 + public void *(android.view.View);
  110 + }
  111 +
  112 + #保持 Parcelable 不被混淆
  113 + -keep class * implements android.os.Parcelable {
  114 + public static final android.os.Parcelable$Creator *;
  115 + }
  116 +
  117 + #保持 Serializable 不被混淆
  118 + -keepnames class * implements java.io.Serializable
  119 +
  120 + #保持 Serializable 不被混淆并且enum 类也不被混淆
  121 + -keepclassmembers class * implements java.io.Serializable {
  122 + static final long serialVersionUID;
  123 + private static final java.io.ObjectStreamField[] serialPersistentFields;
  124 + !static !transient <fields>;
  125 + !private <fields>;
  126 + !private <methods>;
  127 + private void writeObject(java.io.ObjectOutputStream);
  128 + private void readObject(java.io.ObjectInputStream);
  129 + java.lang.Object writeReplace();
  130 + java.lang.Object readResolve();
  131 + }
  132 + -keepclassmembers class * {
  133 + public void *ButtonClicked(android.view.View);
  134 + }
  135 +
  136 + #不混淆资源类
  137 + -keepclassmembers class **.R$* {
  138 + public static <fields>;
  139 + }
  140 + #gson
  141 + #-libraryjars libs/gson-2.2.2.jar
  142 + -keepattributes Signature
  143 + # Gson specific classes
  144 + -keep class sun.misc.Unsafe { *; }
  145 + # Application classes that will be serialized/deserialized over Gson
  146 + -keep class com.google.gson.examples.android.model.** { *; }
  147 +
  148 + #科大讯飞混淆
  149 + -keep class com.iflytek.**{*;}
  150 + #极光混淆
  151 + -dontoptimize
  152 + -dontpreverify
  153 +
  154 + -dontwarn cn.jpush.**
  155 + -keep class cn.jpush.** { *; }
  156 + -dontwarn com.google.**
  157 + -keep class com.google.gson.** {*;}
  158 + -keep class com.google.protobuf.** {*;}
  159 +
  160 + #butterknife
  161 + -keep class butterknife.** { *; }
  162 + -dontwarn butterknife.internal.**
  163 + -keep class **$$ViewBinder { *; }
  164 +
  165 + -keepclasseswithmembernames class * {
  166 + @butterknife.* <fields>;
  167 + }
  168 +
  169 + -keepclasseswithmembernames class * {
  170 + @butterknife.* <methods>;
  171 + }
  172 +
  173 + #APP中保留的部分,
  174 + -keep public class com.facebook.**{*;}
  175 + -keep public class com.github.mikephil.**{*;}
  176 + -keep public class com.huawei.**{*;}
  177 + -keep public class com.nercita.farmnurse.util.**{*;}
  178 + -keep public class com.nercita.farmnurse.bean.**{*;}
  179 + #okhttp 混淆
  180 + -dontwarn com.squareup.okhttp3.**
  181 + -keep class com.squareup.okhttp3.** { *;}
  182 + -dontwarn okio.**
  183 +
  184 + -keep class com.zhy.http.**{*;}
  185 + -keep class tv.danmaku.ijk.** { *; }
  186 + -dontwarn tv.danmaku.ijk.**
  187 + -keep class com.hyphenate.** {*;}
  188 + -dontwarn com.hyphenate.**
  189 +
  190 + -keep class com.amap.api.location.**{*;}
  191 + -keep class com.amap.api.fence.**{*;}
  192 + -keep class com.autonavi.aps.amapapi.model.**{*;}
  193 + -keep class com.amap.api.services.**{*;}
  194 + -keep class com.amap.api.maps2d.**{*;}
  195 + -keep class com.amap.api.mapcore2d.**{*;}
  196 + -keep public class com.google.vending.licensing.ILicensingService
  197 + -keep public class com.android.vending.licensing.ILicensingService
  198 + # see http://proguard.sourceforge.net/manual/examples.html#beans
  199 + -keepclassmembers public class * extends android.view.View {
  200 + void set*(***);
  201 + *** get*();
  202 + }
  203 + # For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
  204 + -keepclassmembers enum * {
  205 + public static **[] values();
  206 + public static ** valueOf(java.lang.String);
  207 + }
  208 + -keep class android.support.v4.** {*;}
  209 +
  210 + -keep class org.xmlpull.** {*;}
  211 + -keep class com.baidu.** {*;}
  212 + -keep public class * extends com.umeng.**
  213 + -keep class com.umeng.** { *; }
  214 + -keep class com.squareup.picasso.* {*;}
  215 +
  216 + -keep class com.hyphenate.* {*;}
  217 + -keep class com.hyphenate.chat.** {*;}
  218 + -keep class org.jivesoftware.** {*;}
  219 + -keep class org.apache.** {*;}
  220 + #不要SmileUtils复制到自己的项目下keep的时候还是写的demo里的包名
  221 + -keep class com.hyphenate.chatuidemo.utils.SmileUtils {*;}
  222 + #2.0.9后加入语音通话功能，如需使用此功能的api，加入以下keep
  223 + -keep class net.java.sip.** {*;}
  224 + -keep class org.webrtc.voiceengine.** {*;}
  225 + -keep class org.bitlet.** {*;}
  226 + -keep class org.slf4j.** {*;}
  227 + -keep class ch.imvs.** {*;}
  228 + #Eventbus3.0
  229 + -keepclassmembers class ** {
  230 + @org.greenrobot.eventbus.Subscribe <methods>;
  231 + }
  232 + -keep enum org.greenrobot.eventbus.ThreadMode { *; }
  233 +
  234 + # Only required if you use AsyncExecutor
  235 + -keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
  236 + <init>(Java.lang.Throwable);
  237 + }
  238 +# #PhotoPicker
  239 +# -dontwarn me.iwf.photopicker.**
  240 +# -keep class me.iwf.photopicker.**{*;}
  241 + #nineoldandroids
  242 + -dontwarn com.nineoldandroids.*
  243 + -keep class com.nineoldandroids.** { *;}
  244 + -keep class com.bumptech.glide.** { *; }
  245 +
  246 + # Glide
  247 + -keep public class * implements com.bumptech.glide.module.GlideModule
  248 + -keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
  249 + **[] $VALUES;
  250 + public *;
  251 + }
  252 + # nineoldandroids
  253 + -keep interface com.nineoldandroids.view.** { *; }
  254 + -dontwarn com.nineoldandroids.**
  255 + -keep class com.nineoldandroids.** { *; }
  256 + # support-v7-appcompat
  257 + -keep public class android.support.v7.widget.** { *; }
  258 + -keep public class android.support.v7.internal.widget.** { *; }
  259 + -keep public class android.support.v7.internal.view.menu.** { *; }
  260 + -keep public class * extends android.support.v4.view.ActionProvider {
  261 + public <init>(android.content.Context);
  262 + }
  263 + # support-design
  264 + -dontwarn android.support.design.**
  265 + -keep class android.support.design.** { *; }
  266 + -keep interface android.support.design.** { *; }
  267 + -keep public class android.support.design.R$* { *; }
  268 +
  269 +-keep class com.eventhandle.**{*;}
  270 +-keep class com.ntjbase.**{*;}
  271 +-keep class com.videoengine.**{*;}
  272 +-keep class com.voiceengine.**{*;}
  273 +
  274 +-keep class com.mang.xdy.**{*;}
@@ -780,6 +780,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe @@ -780,6 +780,7 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
780 } 780 }
781 781
782 mmHandler.removeCallbacksAndMessages(null); 782 mmHandler.removeCallbacksAndMessages(null);
  783 + mHandler.removeCallbacksAndMessages(null);
783 this.finish(); 784 this.finish();
784 } 785 }
785 786
@@ -1664,8 +1665,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe @@ -1664,8 +1665,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
1664 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { 1665 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
1665 if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) 1666 if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
1666 != PackageManager.PERMISSION_GRANTED) { 1667 != PackageManager.PERMISSION_GRANTED) {
1667 - // 第一次请求权限时，用户如果拒绝，下一次请求shouldShowRequestPermissionRationale()返回true  
1668 - // 向用户解释为什么需要这个权限  
1669 if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) { 1668 if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
1670 isCreame=false; 1669 isCreame=false;
1671 ToastUtil.showToastshort(getResources().getString(R.string.request_permission_video), VideoPlayActivity.this); 1670 ToastUtil.showToastshort(getResources().getString(R.string.request_permission_video), VideoPlayActivity.this);
@@ -1685,8 +1684,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe @@ -1685,8 +1684,6 @@ public class VideoPlayActivity extends FragmentActivity implements ObserverListe
1685 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { 1684 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
1686 if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) 1685 if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO)
1687 != PackageManager.PERMISSION_GRANTED) { 1686 != PackageManager.PERMISSION_GRANTED) {
1688 - // 第一次请求权限时，用户如果拒绝，下一次请求shouldShowRequestPermissionRationale()返回true  
1689 - // 向用户解释为什么需要这个权限  
1690 if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) { 1687 if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) {
1691 isCreame=false; 1688 isCreame=false;
1692 ToastUtil.showToastshort(getResources().getString(R.string.rquest_permission_audio), VideoPlayActivity.this); 1689 ToastUtil.showToastshort(getResources().getString(R.string.rquest_permission_audio), VideoPlayActivity.this);
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> 4 <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5 <!-- Customize your theme here. --> 5 <!-- Customize your theme here. -->
6 <item name="colorPrimary">@color/colorPrimary</item> 6 <item name="colorPrimary">@color/colorPrimary</item>
7 - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> 7 + <item name="colorPrimaryDark">#ebebeb</item>
8 <item name="colorAccent">@color/colorAccent</item> 8 <item name="colorAccent">@color/colorAccent</item>
9 </style> 9 </style>
10 <style name="bottom_dialog" parent="android:style/Theme.Dialog"> 10 <style name="bottom_dialog" parent="android:style/Theme.Dialog">
不能预览此文件类型
This file is too large to display.
This file is too large to display.
This file is too large to display.
This file is too large to display.