huangxinbao / Android_Sdk

转到一个项目
Toggle navigation Toggle navigation pinning
huangxinbao
de4f460d 1 parent 4d277074

Fix cover answersheet by shadow dialog probem

内嵌 并排对比
正在显示 21 个修改的文件 包含 180 行增加 和 71 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 - <component name="EntryPointsManager">  
4 - <entry_points version="2.0" />  
5 - </component>  
6 - <component name="NullableNotNullManager">  
7 - <option name="myDefaultNullable" value="android.support.annotation.Nullable" />  
8 - <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />  
9 - <option name="myNullables">  
10 - <value>  
11 - <list size="4">  
12 - <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />  
13 - <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />  
14 - <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />  
15 - <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />  
16 - </list>  
17 - </value>  
18 - </option>  
19 - <option name="myNotNulls">  
20 - <value>  
21 - <list size="4">  
22 - <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />  
23 - <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />  
24 - <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />  
25 - <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />  
26 - </list>  
27 - </value>  
28 - </option>  
29 - </component>  
30 <component name="ProjectLevelVcsManager" settingsEditedManually="false"> 3 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
31 <OptionsSetting value="true" id="Add" /> 4 <OptionsSetting value="true" id="Add" />
32 <OptionsSetting value="true" id="Remove" /> 5 <OptionsSetting value="true" id="Remove" />
@@ -41,7 +41,6 @@ import com.mang.xdy.demo.bean.VideoOrAudioStopEntity; @@ -41,7 +41,6 @@ import com.mang.xdy.demo.bean.VideoOrAudioStopEntity;
41 import com.mang.xdy.demo.utils.JsonUtil; 41 import com.mang.xdy.demo.utils.JsonUtil;
42 import com.mang.xdy.demo.utils.ToastUtil; 42 import com.mang.xdy.demo.utils.ToastUtil;
43 import com.mang.xdy.demo.widget.answersheet.AnswerSheetView; 43 import com.mang.xdy.demo.widget.answersheet.AnswerSheetView;
44 -import com.mang.xdy.demo.widget.dialog.AnswText;  
45 import com.mang.xdy.demo.widget.dialog.LoginDialog; 44 import com.mang.xdy.demo.widget.dialog.LoginDialog;
46 import com.mang.xdy.demo.widget.view.NoScrollViewPager; 45 import com.mang.xdy.demo.widget.view.NoScrollViewPager;
47 import com.mang.xdy.listener.ObserverListener; 46 import com.mang.xdy.listener.ObserverListener;
@@ -308,7 +307,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -308,7 +307,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
308 307
309 // getWindow().setFormat(PixelFormat.TRANSLUCENT); 308 // getWindow().setFormat(PixelFormat.TRANSLUCENT);
310 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE); 309 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE);
311 -// mAnswerSheetView.startCountTimer(22); 310 +// mAnswerSheetView.startCountTimerAndResizeLayout(22);
312 } 311 }
313 312
314 // public void setTablayout() { 313 // public void setTablayout() {
@@ -324,10 +323,10 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -324,10 +323,10 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
324 public void showSelectPublishMode() { 323 public void showSelectPublishMode() {
325 new ActionSheetDialog(VideoPlayActivity.this) 324 new ActionSheetDialog(VideoPlayActivity.this)
326 .builder() 325 .builder()
327 - .setTitle("选择列表") 326 + .setTitle(getResources().getString(R.string.home_dialog_selectList))
328 .setCancelable(true) 327 .setCancelable(true)
329 .setCanceledOnTouchOutside(true) 328 .setCanceledOnTouchOutside(true)
330 - .addSheetItem("推送视频", ActionSheetDialog.SheetItemColor.Red 329 + .addSheetItem(getResources().getString(R.string.home_dialog_pushVideo), ActionSheetDialog.SheetItemColor.Red
331 , new ActionSheetDialog.OnSheetItemClickListener() { 330 , new ActionSheetDialog.OnSheetItemClickListener() {
332 @Override 331 @Override
333 public void onClick(int which) { 332 public void onClick(int which) {
@@ -344,7 +343,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -344,7 +343,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
344 isPublsishVideoMode = true; 343 isPublsishVideoMode = true;
345 } 344 }
346 }) 345 })
347 - .addSheetItem("推送音频", ActionSheetDialog.SheetItemColor.Blue 346 + .addSheetItem(getResources().getString(R.string.home_dialog_pushAudio), ActionSheetDialog.SheetItemColor.Blue
348 , new ActionSheetDialog.OnSheetItemClickListener() { 347 , new ActionSheetDialog.OnSheetItemClickListener() {
349 @Override 348 @Override
350 public void onClick(int which) { 349 public void onClick(int which) {
@@ -365,13 +364,13 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -365,13 +364,13 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
365 public void onClick(int which) { 364 public void onClick(int which) {
366 //填写事件 365 //填写事件
367 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE); 366 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE);
368 -// mAnswerSheetView.startCountTimer(22); 367 +// mAnswerSheetView.startCountTimerAndResizeLayout(22);
369 // setAnswerSheetLayout_Nornal(53); 368 // setAnswerSheetLayout_Nornal(53);
370 369
371 AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this); 370 AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
372 answerSheetDialog.builder().show(); 371 answerSheetDialog.builder().show();
373 answerSheetDialog.selectAnswerSheetType(1); 372 answerSheetDialog.selectAnswerSheetType(1);
374 - answerSheetDialog.startCountTimer(30); 373 + answerSheetDialog.startCountTimerAndResizeLayout(30,50);
375 374
376 } 375 }
377 }) 376 })
@@ -381,13 +380,13 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -381,13 +380,13 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
381 public void onClick(int which) { 380 public void onClick(int which) {
382 //填写事件 381 //填写事件
383 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_RIGHT_OR_WRONG); 382 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_RIGHT_OR_WRONG);
384 -// mAnswerSheetView.startCountTimer(15); 383 +// mAnswerSheetView.startCountTimerAndResizeLayout(15);
385 // setAnswerSheetLayout_Nornal(53); 384 // setAnswerSheetLayout_Nornal(53);
386 385
387 AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this); 386 AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
388 answerSheetDialog.builder().show(); 387 answerSheetDialog.builder().show();
389 answerSheetDialog.selectAnswerSheetType(2); 388 answerSheetDialog.selectAnswerSheetType(2);
390 - answerSheetDialog.startCountTimer(30); 389 + answerSheetDialog.startCountTimerAndResizeLayout(30,60);
391 390
392 } 391 }
393 }) 392 })
@@ -397,12 +396,12 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -397,12 +396,12 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
397 public void onClick(int which) { 396 public void onClick(int which) {
398 //填写事件 397 //填写事件
399 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_FILLING); 398 // mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_FILLING);
400 -// mAnswerSheetView.startCountTimer(15); 399 +// mAnswerSheetView.startCountTimerAndResizeLayout(15);
401 // setAnswerSheetLayout_Nornal(53); 400 // setAnswerSheetLayout_Nornal(53);
402 AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this); 401 AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
403 answerSheetDialog.builder().show(); 402 answerSheetDialog.builder().show();
404 answerSheetDialog.selectAnswerSheetType(3); 403 answerSheetDialog.selectAnswerSheetType(3);
405 - answerSheetDialog.startCountTimer(15); 404 + answerSheetDialog.startCountTimerAndResizeLayout(15,40);
406 405
407 406
408 407
@@ -411,7 +410,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -411,7 +410,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
411 } 410 }
412 411
413 public void setTablayout() { 412 public void setTablayout() {
414 - titles = new String[]{"文档", "聊天"}; 413 + titles = new String[]{getResources().getString(R.string.home_content_doc),getResources().getString(R.string.home_content_chat)};
415 pagerAdapter = new SimpleFragmentPagerAdapter(getSupportFragmentManager(), this, replay); 414 pagerAdapter = new SimpleFragmentPagerAdapter(getSupportFragmentManager(), this, replay);
416 viewPager.setAdapter(pagerAdapter); 415 viewPager.setAdapter(pagerAdapter);
417 viewPager.setOnRplayTouchListener(this); 416 viewPager.setOnRplayTouchListener(this);
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 android:id="@+id/edt_home_classId" 42 android:id="@+id/edt_home_classId"
43 android:layout_toRightOf="@+id/tv_home_classid" 43 android:layout_toRightOf="@+id/tv_home_classid"
44 style="@style/home_input_edit_style" 44 style="@style/home_input_edit_style"
45 - android:hint="请输入课堂号" 45 + android:hint="classId"
46 android:inputType="number" 46 android:inputType="number"
47 android:text="124709334"/> 47 android:text="124709334"/>
48 48
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 android:id="@+id/edt_home_role" 67 android:id="@+id/edt_home_role"
68 android:layout_toRightOf="@+id/tv_home_userrole" 68 android:layout_toRightOf="@+id/tv_home_userrole"
69 style="@style/home_input_edit_style" 69 style="@style/home_input_edit_style"
70 - android:hint="请输入角色" 70 + android:hint="role"
71 android:text="normal" 71 android:text="normal"
72 /> 72 />
73 <View 73 <View
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 android:id="@+id/edt_home_serviceIp" 91 android:id="@+id/edt_home_serviceIp"
92 android:layout_toRightOf="@+id/tv_home_portal" 92 android:layout_toRightOf="@+id/tv_home_portal"
93 style="@style/home_input_edit_style" 93 style="@style/home_input_edit_style"
94 - android:hint="请输入服务器地址" 94 + android:hint="portal"
95 android:text="112.126.80.182:90" 95 android:text="112.126.80.182:90"
96 /> 96 />
97 <View 97 <View
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 android:id="@+id/edt_home_userId" 116 android:id="@+id/edt_home_userId"
117 android:layout_toRightOf="@+id/tv_home_userid" 117 android:layout_toRightOf="@+id/tv_home_userid"
118 style="@style/home_input_edit_style" 118 style="@style/home_input_edit_style"
119 - android:hint="请输入用户id" 119 + android:hint="userId"
120 android:text="0" 120 android:text="0"
121 /> 121 />
122 <View 122 <View
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 android:id="@+id/btn_home_enter_class" 129 android:id="@+id/btn_home_enter_class"
130 android:layout_width="match_parent" 130 android:layout_width="match_parent"
131 android:layout_height="wrap_content" 131 android:layout_height="wrap_content"
132 - android:text="进入课堂" 132 + android:text="@string/home_enter_class"
133 android:textColor="@color/white" 133 android:textColor="@color/white"
134 android:background="@drawable/home_selector_bottom_btn_blue" 134 android:background="@drawable/home_selector_bottom_btn_blue"
135 android:layout_marginLeft="15dp" 135 android:layout_marginLeft="15dp"
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 android:layout_marginTop="15dp" 143 android:layout_marginTop="15dp"
144 android:layout_marginLeft="15dp" 144 android:layout_marginLeft="15dp"
145 android:layout_marginRight="15dp" 145 android:layout_marginRight="15dp"
146 - android:text="进入录制回放" 146 + android:text="@string/home_enter_replay"
147 android:textColor="@color/white" 147 android:textColor="@color/white"
148 android:background="@drawable/home_selector_bottom_btn_green" 148 android:background="@drawable/home_selector_bottom_btn_green"
149 /> 149 />
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:orientation="vertical" android:layout_width="match_parent" 3 android:orientation="vertical" android:layout_width="match_parent"
4 android:layout_height="match_parent"> 4 android:layout_height="match_parent">
5 <com.mang.xdy.demo.widget.CanvasView 5 <com.mang.xdy.demo.widget.CanvasView
6 android:id="@+id/canvas_doc_show" 6 android:id="@+id/canvas_doc_show"
7 android:layout_width="wrap_content" 7 android:layout_width="wrap_content"
8 android:layout_height="wrap_content" /> 8 android:layout_height="wrap_content" />
9 -</LinearLayout>  
  9 +</RelativeLayout>
@@ -16,19 +16,19 @@ @@ -16,19 +16,19 @@
16 <EditText 16 <EditText
17 android:id="@+id/et_username" 17 android:id="@+id/et_username"
18 style="@style/home_login_edit_style" 18 style="@style/home_login_edit_style"
19 - android:hint="用户名"/> 19 + android:hint="@string/home_enter_username"/>
20 20
21 <EditText 21 <EditText
22 android:id="@+id/et_password" 22 android:id="@+id/et_password"
23 style="@style/home_login_edit_style" 23 style="@style/home_login_edit_style"
24 - android:hint="密码" 24 + android:hint="@string/home_enter_password"
25 android:inputType="textPassword" 25 android:inputType="textPassword"
26 android:visibility="gone"/> 26 android:visibility="gone"/>
27 27
28 <Button 28 <Button
29 android:id="@+id/btn_login" 29 android:id="@+id/btn_login"
30 style="@style/home_site_btn_style" 30 style="@style/home_site_btn_style"
31 - android:text="登录" 31 + android:text="@string/home_enter_login"
32 android:textColor="@color/white"/> 32 android:textColor="@color/white"/>
33 </LinearLayout> 33 </LinearLayout>
34 34
@@ -183,5 +183,6 @@ @@ -183,5 +183,6 @@
183 <!--WheelView 遮盖未选中item的蒙层--> 183 <!--WheelView 遮盖未选中item的蒙层-->
184 <color name="wheel_unselect_color">#B1FFFFFF</color> 184 <color name="wheel_unselect_color">#B1FFFFFF</color>
185 185
186 - <color name="colorSkyBlue">#3dd1ff</color> 186 + <color name="colorSkyBlue">#3498db</color>
  187 + <color name="colorGrey">#999999</color>
187 </resources> 188 </resources>
@@ -10,4 +10,13 @@ @@ -10,4 +10,13 @@
10 <string name="home_portal_hint">portal</string> 10 <string name="home_portal_hint">portal</string>
11 <string name="home_enter_class">进入课堂</string> 11 <string name="home_enter_class">进入课堂</string>
12 <string name="home_enter_replay">进入录制回放</string> 12 <string name="home_enter_replay">进入录制回放</string>
  13 + <string name="home_enter_login">登录</string>
  14 + <string name="home_enter_password">密码</string>
  15 + <string name="home_enter_username">用户名</string>
  16 + <string name="home_content_doc">文档</string>
  17 + <string name="home_content_chat">聊天</string>
  18 + <string name="home_dialog_pushAudio">推送音频</string>
  19 + <string name="home_dialog_pushVideo">推送视频</string>
  20 + <string name="home_dialog_selectList">选择列表</string>
  21 +
13 </resources> 22 </resources>
@@ -153,8 +153,8 @@ @@ -153,8 +153,8 @@
153 153
154 </style> 154 </style>
155 155
156 - <!--答题卡-->  
157 - <style name="exam_cb_style"> 156 + <!--答题卡多选 单选-->
  157 + <style name="exam_cb_style_SingleOrMore">
158 <item name="android:layout_width">wrap_content</item> 158 <item name="android:layout_width">wrap_content</item>
159 <item name="android:layout_height">wrap_content</item> 159 <item name="android:layout_height">wrap_content</item>
160 <item name="android:layout_weight">1</item> 160 <item name="android:layout_weight">1</item>
@@ -166,4 +166,19 @@ @@ -166,4 +166,19 @@
166 <item name="android:textSize">12sp</item> 166 <item name="android:textSize">12sp</item>
167 <item name="android:textColor">@color/colorSkyBlue</item> 167 <item name="android:textColor">@color/colorSkyBlue</item>
168 </style> 168 </style>
  169 +
  170 + <!--答题卡-->
  171 + <style name="exam_cb_style_RightOrWrong">
  172 + <item name="android:layout_width">wrap_content</item>
  173 + <item name="android:layout_height">wrap_content</item>
  174 + <item name="android:button">@null</item>
  175 + <item name="android:drawablePadding">7dp</item>
  176 + <item name="android:gravity">center</item>
  177 + <item name="android:layout_gravity">center_vertical</item>
  178 + <item name="android:padding">5dp</item>
  179 + <item name="android:textSize">12sp</item>
  180 + <item name="android:layout_marginRight">22dp</item>
  181 + <item name="android:textColor">@color/colorSkyBlue</item>
  182 + </style>
  183 +
169 </resources> 184 </resources>
@@ -77,10 +77,11 @@ public final class R { @@ -77,10 +77,11 @@ public final class R {
77 public static int ActionSheetDialogAnimation=0x7f050001; 77 public static int ActionSheetDialogAnimation=0x7f050001;
78 public static int ActionSheetDialogStyle=0x7f050002; 78 public static int ActionSheetDialogStyle=0x7f050002;
79 public static int AlertDialogStyle=0x7f050003; 79 public static int AlertDialogStyle=0x7f050003;
  80 + public static int AnswerSheetDialogStyle=0x7f050004;
80 /** API 11 theme customizations can go here. 81 /** API 11 theme customizations can go here.
81 API 14 theme customizations can go here. 82 API 14 theme customizations can go here.
82 */ 83 */
83 public static int AppBaseTheme=0x7f050000; 84 public static int AppBaseTheme=0x7f050000;
84 - public static int AppTheme=0x7f050004; 85 + public static int AppTheme=0x7f050005;
85 } 86 }
86 } 87 }
@@ -185,12 +185,12 @@ @@ -185,12 +185,12 @@
185 "from": { 185 "from": {
186 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 186 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
187 "position": { 187 "position": {
188 - "startLine": 38, 188 + "startLine": 57,
189 "startColumn": 4, 189 "startColumn": 4,
190 - "startOffset": 1627,  
191 - "endLine": 41, 190 + "startOffset": 2443,
  191 + "endLine": 60,
192 "endColumn": 12, 192 "endColumn": 12,
193 - "endOffset": 1895 193 + "endOffset": 2711
194 } 194 }
195 } 195 }
196 }, 196 },
@@ -241,8 +241,29 @@ @@ -241,8 +241,29 @@
241 "startLine": 42, 241 "startLine": 42,
242 "startColumn": 4, 242 "startColumn": 4,
243 "startOffset": 2085, 243 "startOffset": 2085,
  244 + "endLine": 59,
  245 + "endColumn": 12,
  246 + "endOffset": 2876
  247 + },
  248 + "from": {
  249 + "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
  250 + "position": {
  251 + "startLine": 37,
  252 + "startColumn": 4,
  253 + "startOffset": 1597,
  254 + "endLine": 54,
  255 + "endColumn": 12,
  256 + "endOffset": 2405
  257 + }
  258 + }
  259 + },
  260 + {
  261 + "to": {
  262 + "startLine": 60,
  263 + "startColumn": 4,
  264 + "startOffset": 2881,
244 "endColumn": 72, 265 "endColumn": 72,
245 - "endOffset": 2153 266 + "endOffset": 2949
246 }, 267 },
247 "from": { 268 "from": {
248 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml", 269 "file": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\values\\styles.xml",
@@ -257,11 +278,11 @@ @@ -257,11 +278,11 @@
257 }, 278 },
258 { 279 {
259 "to": { 280 "to": {
260 - "startLine": 43, 281 + "startLine": 61,
261 "startColumn": 4, 282 "startColumn": 4,
262 - "startOffset": 2158, 283 + "startOffset": 2954,
263 "endColumn": 50, 284 "endColumn": 50,
264 - "endOffset": 2204 285 + "endOffset": 3000
265 }, 286 },
266 "from": { 287 "from": {
267 "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",
@@ -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 },
@@ -50,5 +50,6 @@ int string app_name 0x7f080000 @@ -50,5 +50,6 @@ int string app_name 0x7f080000
50 int style ActionSheetDialogAnimation 0x7f050001 50 int style ActionSheetDialogAnimation 0x7f050001
51 int style ActionSheetDialogStyle 0x7f050002 51 int style ActionSheetDialogStyle 0x7f050002
52 int style AlertDialogStyle 0x7f050003 52 int style AlertDialogStyle 0x7f050003
  53 +int style AnswerSheetDialogStyle 0x7f050004
53 int style AppBaseTheme 0x7f050000 54 int style AppBaseTheme 0x7f050000
54 -int style AppTheme 0x7f050004 55 +int style AppTheme 0x7f050005
@@ -40,6 +40,24 @@ @@ -40,6 +40,24 @@
40 <item name="android:windowNoTitle">true</item> 40 <item name="android:windowNoTitle">true</item>
41 <item name="android:windowIsTranslucent">true</item> 41 <item name="android:windowIsTranslucent">true</item>
42 </style> 42 </style>
  43 + <style name="AnswerSheetDialogStyle" parent="@android:style/Theme.Dialog">
  44 +
  45 + <!-- 背景透明 -->
  46 + <item name="android:windowBackground">@android:color/transparent</item>
  47 + <item name="android:windowContentOverlay">@null</item>
  48 + <!-- 浮于Activity之上 -->
  49 + <item name="android:windowIsFloating">true</item>
  50 + <!-- 边框 -->
  51 + <item name="android:windowFrame">@null</item>
  52 + <!-- Dialog以外的区域模糊效果 -->
  53 + <item name="android:backgroundDimEnabled">false</item>
  54 + <!-- 无标题 -->
  55 + <item name="android:windowNoTitle">true</item>
  56 + <!-- 半透明 -->
  57 + <item name="android:windowIsTranslucent">true</item>
  58 + <!-- Dialog进入及退出动画 -->
  59 + <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
  60 + </style>
43 <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> 61 <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/>
44 <style name="AppTheme" parent="AppBaseTheme"/> 62 <style name="AppTheme" parent="AppBaseTheme"/>
45 </resources> 63 </resources>
1 -#Tue May 09 22:54:42 CST 2017 1 +#Wed May 10 11:45:01 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
@@ -16,6 +16,23 @@ @@ -16,6 +16,23 @@
16 <item name="android:windowIsTranslucent">true</item> 16 <item name="android:windowIsTranslucent">true</item>
17 17
18 <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> 18 <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
  19 + </style><style name="AnswerSheetDialogStyle" parent="@android:style/Theme.Dialog">
  20 +
  21 +
  22 + <item name="android:windowBackground">@android:color/transparent</item>
  23 + <item name="android:windowContentOverlay">@null</item>
  24 +
  25 + <item name="android:windowIsFloating">true</item>
  26 +
  27 + <item name="android:windowFrame">@null</item>
  28 +
  29 + <item name="android:backgroundDimEnabled">false</item>
  30 +
  31 + <item name="android:windowNoTitle">true</item>
  32 +
  33 + <item name="android:windowIsTranslucent">true</item>
  34 +
  35 + <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
19 </style><style name="AppTheme" parent="AppBaseTheme"/><style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> 36 </style><style name="AppTheme" parent="AppBaseTheme"/><style name="AlertDialogStyle" parent="@android:style/Theme.Dialog">
20 <item name="android:windowBackground">@android:color/transparent</item> 37 <item name="android:windowBackground">@android:color/transparent</item>
21 <item name="android:windowContentOverlay">@null</item> 38 <item name="android:windowContentOverlay">@null</item>
1 -#Tue May 09 22:54:42 CST 2017 1 +#Wed May 10 11:43:51 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,11 +6,11 @@ D\:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hd @@ -6,11 +6,11 @@ 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_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
@@ -16,6 +16,23 @@ @@ -16,6 +16,23 @@
16 <item name="android:windowIsTranslucent">true</item> 16 <item name="android:windowIsTranslucent">true</item>
17 17
18 <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> 18 <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
  19 + </style><style name="AnswerSheetDialogStyle" parent="@android:style/Theme.Dialog">
  20 +
  21 +
  22 + <item name="android:windowBackground">@android:color/transparent</item>
  23 + <item name="android:windowContentOverlay">@null</item>
  24 +
  25 + <item name="android:windowIsFloating">true</item>
  26 +
  27 + <item name="android:windowFrame">@null</item>
  28 +
  29 + <item name="android:backgroundDimEnabled">false</item>
  30 +
  31 + <item name="android:windowNoTitle">true</item>
  32 +
  33 + <item name="android:windowIsTranslucent">true</item>
  34 +
  35 + <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
19 </style><style name="AppTheme" parent="AppBaseTheme"/><style name="AlertDialogStyle" parent="@android:style/Theme.Dialog"> 36 </style><style name="AppTheme" parent="AppBaseTheme"/><style name="AlertDialogStyle" parent="@android:style/Theme.Dialog">
20 <item name="android:windowBackground">@android:color/transparent</item> 37 <item name="android:windowBackground">@android:color/transparent</item>
21 <item name="android:windowContentOverlay">@null</item> 38 <item name="android:windowContentOverlay">@null</item>
@@ -40,6 +40,24 @@ @@ -40,6 +40,24 @@
40 <item name="android:windowNoTitle">true</item> 40 <item name="android:windowNoTitle">true</item>
41 <item name="android:windowIsTranslucent">true</item> 41 <item name="android:windowIsTranslucent">true</item>
42 </style> 42 </style>
  43 + <style name="AnswerSheetDialogStyle" parent="@android:style/Theme.Dialog">
  44 +
  45 + <!-- 背景透明 -->
  46 + <item name="android:windowBackground">@android:color/transparent</item>
  47 + <item name="android:windowContentOverlay">@null</item>
  48 + <!-- 浮于Activity之上 -->
  49 + <item name="android:windowIsFloating">true</item>
  50 + <!-- 边框 -->
  51 + <item name="android:windowFrame">@null</item>
  52 + <!-- Dialog以外的区域模糊效果 -->
  53 + <item name="android:backgroundDimEnabled">false</item>
  54 + <!-- 无标题 -->
  55 + <item name="android:windowNoTitle">true</item>
  56 + <!-- 半透明 -->
  57 + <item name="android:windowIsTranslucent">true</item>
  58 + <!-- Dialog进入及退出动画 -->
  59 + <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
  60 + </style>
43 <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/> 61 <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/>
44 <style name="AppTheme" parent="AppBaseTheme"/> 62 <style name="AppTheme" parent="AppBaseTheme"/>
45 </resources> 63 </resources>
@@ -35,6 +35,25 @@ @@ -35,6 +35,25 @@
35 <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item> 35 <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
36 </style> 36 </style>
37 37
  38 + <style name="AnswerSheetDialogStyle" parent="@android:style/Theme.Dialog">
  39 +
  40 + <!-- 背景透明 -->
  41 + <item name="android:windowBackground">@android:color/transparent</item>
  42 + <item name="android:windowContentOverlay">@null</item>
  43 + <!-- 浮于Activity之上 -->
  44 + <item name="android:windowIsFloating">true</item>
  45 + <!-- 边框 -->
  46 + <item name="android:windowFrame">@null</item>
  47 + <!-- Dialog以外的区域模糊效果 -->
  48 + <item name="android:backgroundDimEnabled">false</item>
  49 + <!-- 无标题 -->
  50 + <item name="android:windowNoTitle">true</item>
  51 + <!-- 半透明 -->
  52 + <item name="android:windowIsTranslucent">true</item>
  53 + <!-- Dialog进入及退出动画 -->
  54 + <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>
  55 + </style>
  56 +
38 <!-- ActionSheet进出动画 --> 57 <!-- ActionSheet进出动画 -->
39 <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog"> 58 <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">
40 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item> 59 <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>