huangxinbao / Android_Sdk

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

Modify AnswerSheet Framelayout to Window Dialog

内嵌 并排对比
正在显示 19 个修改的文件 包含 110 行增加 和 177 行删除
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <ConfirmationsSetting value="0" id="Add" /> 37 <ConfirmationsSetting value="0" id="Add" />
38 <ConfirmationsSetting value="0" id="Remove" /> 38 <ConfirmationsSetting value="0" id="Remove" />
39 </component> 39 </component>
40 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 40 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
41 <output url="file://$PROJECT_DIR$/build/classes" /> 41 <output url="file://$PROJECT_DIR$/build/classes" />
42 </component> 42 </component>
43 <component name="ProjectType"> 43 <component name="ProjectType">
@@ -15,12 +15,10 @@ import android.util.Log; @@ -15,12 +15,10 @@ import android.util.Log;
15 import android.view.SurfaceHolder; 15 import android.view.SurfaceHolder;
16 import android.view.SurfaceView; 16 import android.view.SurfaceView;
17 import android.view.View; 17 import android.view.View;
18 -import android.view.ViewGroup;  
19 import android.view.WindowManager; 18 import android.view.WindowManager;
20 import android.widget.FrameLayout; 19 import android.widget.FrameLayout;
21 import android.widget.ImageButton; 20 import android.widget.ImageButton;
22 import android.widget.ImageView; 21 import android.widget.ImageView;
23 -import android.widget.LinearLayout;  
24 import android.widget.RelativeLayout; 22 import android.widget.RelativeLayout;
25 import android.widget.SeekBar; 23 import android.widget.SeekBar;
26 import android.widget.TextView; 24 import android.widget.TextView;
@@ -43,6 +41,7 @@ import com.mang.xdy.demo.bean.VideoOrAudioStopEntity; @@ -43,6 +41,7 @@ import com.mang.xdy.demo.bean.VideoOrAudioStopEntity;
43 import com.mang.xdy.demo.utils.JsonUtil; 41 import com.mang.xdy.demo.utils.JsonUtil;
44 import com.mang.xdy.demo.utils.ToastUtil; 42 import com.mang.xdy.demo.utils.ToastUtil;
45 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;
46 import com.mang.xdy.demo.widget.dialog.LoginDialog; 45 import com.mang.xdy.demo.widget.dialog.LoginDialog;
47 import com.mang.xdy.demo.widget.view.NoScrollViewPager; 46 import com.mang.xdy.demo.widget.view.NoScrollViewPager;
48 import com.mang.xdy.listener.ObserverListener; 47 import com.mang.xdy.listener.ObserverListener;
@@ -67,6 +66,7 @@ import java.util.Locale; @@ -67,6 +66,7 @@ import java.util.Locale;
67 import butterknife.BindView; 66 import butterknife.BindView;
68 import butterknife.ButterKnife; 67 import butterknife.ButterKnife;
69 import zhangphil.iosdialog.widget.ActionSheetDialog; 68 import zhangphil.iosdialog.widget.ActionSheetDialog;
  69 +import com.mang.xdy.demo.widget.dialog.AnswerSheetDialog;
70 70
71 import static com.pili.pldroid.player.AVOptions.KEY_DELAY_OPTIMIZATION; 71 import static com.pili.pldroid.player.AVOptions.KEY_DELAY_OPTIMIZATION;
72 72
@@ -80,8 +80,8 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -80,8 +80,8 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
80 FrameLayout fra_videoPlay_start; 80 FrameLayout fra_videoPlay_start;
81 @BindView(R.id.viewpager) 81 @BindView(R.id.viewpager)
82 NoScrollViewPager viewPager; 82 NoScrollViewPager viewPager;
83 - @BindView(R.id.fra_videoPlay_answer)  
84 - FrameLayout fraVideoPlayAnswer; 83 +// @BindView(R.id.fra_videoPlay_answer)
  84 +// FrameLayout fraVideoPlayAnswer;
85 private TabLayout tabLayout; 85 private TabLayout tabLayout;
86 @BindView(R.id.surfaceview_playVideo) 86 @BindView(R.id.surfaceview_playVideo)
87 SurfaceView surfaceviewPlayVideo; 87 SurfaceView surfaceviewPlayVideo;
@@ -228,7 +228,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -228,7 +228,7 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
228 progressDialogShow(); 228 progressDialogShow();
229 setTablayout(); 229 setTablayout();
230 230
231 - setAnswerLayout(); 231 +// setAnswerLayout();
232 } 232 }
233 233
234 public void init() { 234 public void init() {
@@ -278,8 +278,13 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -278,8 +278,13 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
278 fra_videoPlay_start.setOnClickListener(new View.OnClickListener() { 278 fra_videoPlay_start.setOnClickListener(new View.OnClickListener() {
279 @Override 279 @Override
280 public void onClick(View v) { 280 public void onClick(View v) {
281 - 281 +//
282 showSelectPublishMode(); 282 showSelectPublishMode();
  283 +// AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
  284 +// answerSheetDialog.builder().show();
  285 +// new AnswerSheetDialog(VideoPlayActivity.this).builder().show();
  286 +// new AnswText(VideoPlayActivity.this).builder().show();
  287 +// new AnswerSheetDialog(VideoPlayActivity.this).builder().show();
283 // mFramenLayout_stopPublish.setVisibility(View.VISIBLE); 288 // mFramenLayout_stopPublish.setVisibility(View.VISIBLE);
284 // fra_videoPlay_start.setVisibility(View.GONE); 289 // fra_videoPlay_start.setVisibility(View.GONE);
285 // surfaceView_publish.setVisibility(View.VISIBLE); 290 // surfaceView_publish.setVisibility(View.VISIBLE);
@@ -299,6 +304,11 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -299,6 +304,11 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
299 exit_dialog(); 304 exit_dialog();
300 } 305 }
301 }); 306 });
  307 + //TODO
  308 +
  309 +// getWindow().setFormat(PixelFormat.TRANSLUCENT);
  310 +// mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE);
  311 +// mAnswerSheetView.startCountTimer(22);
302 } 312 }
303 313
304 // public void setTablayout() { 314 // public void setTablayout() {
@@ -354,9 +364,15 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -354,9 +364,15 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
354 @Override 364 @Override
355 public void onClick(int which) { 365 public void onClick(int which) {
356 //填写事件 366 //填写事件
357 - mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE);  
358 - mAnswerSheetView.startCountTimer(22);  
359 - setAnswerSheetLayout_Nornal(53); 367 +// mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_SINGLE_OR_MORE);
  368 +// mAnswerSheetView.startCountTimer(22);
  369 +// setAnswerSheetLayout_Nornal(53);
  370 +
  371 + AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
  372 + answerSheetDialog.builder().show();
  373 + answerSheetDialog.selectAnswerSheetType(1);
  374 + answerSheetDialog.startCountTimer(30);
  375 +
360 } 376 }
361 }) 377 })
362 .addSheetItem("对错选择", ActionSheetDialog.SheetItemColor.Blue 378 .addSheetItem("对错选择", ActionSheetDialog.SheetItemColor.Blue
@@ -364,9 +380,15 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -364,9 +380,15 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
364 @Override 380 @Override
365 public void onClick(int which) { 381 public void onClick(int which) {
366 //填写事件 382 //填写事件
367 - mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_RIGHT_OR_WRONG);  
368 - mAnswerSheetView.startCountTimer(15);  
369 - setAnswerSheetLayout_Nornal(53); 383 +// mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_RIGHT_OR_WRONG);
  384 +// mAnswerSheetView.startCountTimer(15);
  385 +// setAnswerSheetLayout_Nornal(53);
  386 +
  387 + AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
  388 + answerSheetDialog.builder().show();
  389 + answerSheetDialog.selectAnswerSheetType(2);
  390 + answerSheetDialog.startCountTimer(30);
  391 +
370 } 392 }
371 }) 393 })
372 .addSheetItem("填空题", ActionSheetDialog.SheetItemColor.Blue 394 .addSheetItem("填空题", ActionSheetDialog.SheetItemColor.Blue
@@ -374,9 +396,16 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -374,9 +396,16 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
374 @Override 396 @Override
375 public void onClick(int which) { 397 public void onClick(int which) {
376 //填写事件 398 //填写事件
377 - mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_FILLING);  
378 - mAnswerSheetView.startCountTimer(15);  
379 - setAnswerSheetLayout_Nornal(53); 399 +// mAnswerSheetView.selectAnswerSheetType(AnswerSheetView.ANSWER_TYPE_FILLING);
  400 +// mAnswerSheetView.startCountTimer(15);
  401 +// setAnswerSheetLayout_Nornal(53);
  402 + AnswerSheetDialog answerSheetDialog= new AnswerSheetDialog(VideoPlayActivity.this);
  403 + answerSheetDialog.builder().show();
  404 + answerSheetDialog.selectAnswerSheetType(3);
  405 + answerSheetDialog.startCountTimer(15);
  406 +
  407 +
  408 +
380 } 409 }
381 }).show(); 410 }).show();
382 } 411 }
@@ -386,7 +415,8 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -386,7 +415,8 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
386 pagerAdapter = new SimpleFragmentPagerAdapter(getSupportFragmentManager(), this, replay); 415 pagerAdapter = new SimpleFragmentPagerAdapter(getSupportFragmentManager(), this, replay);
387 viewPager.setAdapter(pagerAdapter); 416 viewPager.setAdapter(pagerAdapter);
388 viewPager.setOnRplayTouchListener(this); 417 viewPager.setOnRplayTouchListener(this);
389 - viewPager.setPagingEnabled(false); 418 +// viewPager.setPagingEnabled(false);
  419 +// viewPager.setOffscreenPageLimit(0);
390 mSlidingTab.setViewPager(viewPager, titles); 420 mSlidingTab.setViewPager(viewPager, titles);
391 mSlidingTab.setOnTabSelectListener(new OnTabSelectListener() { 421 mSlidingTab.setOnTabSelectListener(new OnTabSelectListener() {
392 @Override 422 @Override
@@ -1223,25 +1253,32 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList @@ -1223,25 +1253,32 @@ public class VideoPlayActivity extends AppCompatActivity implements ObserverList
1223 1253
1224 /********************************答题卡*********************************************************/ 1254 /********************************答题卡*********************************************************/
1225 1255
1226 - public void setAnswerLayout(){  
1227 - mAnswerSheetView.setOnAnswerLayoutChangeListener(new AnswerSheetView.OnAnswerLayoutChangeListener()  
1228 - {  
1229 - @Override  
1230 - public void setAnswerSheetFramLayout(int num) {  
1231 - LinearLayout.LayoutParams layoutParams=new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,XdyStringUtils.dp2px(VideoPlayActivity.this,num));  
1232 - fraVideoPlayAnswer.setLayoutParams(layoutParams);  
1233 - } 1256 +// public void setAnswerLayout(){
  1257 +// mAnswerSheetView.setOnAnswerLayoutChangeListener(new AnswerSheetView.OnAnswerLayoutChangeListener()
  1258 +// {
  1259 +// @Override
  1260 +// public void setAnswerSheetFramLayout(int num) {
  1261 +// RelativeLayout.LayoutParams layoutParams=new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,XdyStringUtils.dp2px(VideoPlayActivity.this,num));
  1262 +//// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
  1263 +//// layoutParams.setLayoutDirection(RelativeLayout.ALIGN_PARENT_BOTTOM);
  1264 +//// }
  1265 +// fraVideoPlayAnswer.setLayoutParams(layoutParams);
  1266 +// }
  1267 +//
  1268 +// @Override
  1269 +// public void setAnswerSheetNormal(int num) {
  1270 +// setAnswerSheetLayout_Nornal(num);
  1271 +// }
  1272 +// });
  1273 +// }
1234 1274
1235 - @Override  
1236 - public void setAnswerSheetNormal(int num) {  
1237 - setAnswerSheetLayout_Nornal(num);  
1238 - }  
1239 - });  
1240 - }  
1241 1275
1242 - public void setAnswerSheetLayout_Nornal(int num){  
1243 - fraVideoPlayAnswer.setVisibility(View.VISIBLE);  
1244 - LinearLayout.LayoutParams layoutParams=new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,XdyStringUtils.dp2px(VideoPlayActivity.this,num));  
1245 - fraVideoPlayAnswer.setLayoutParams(layoutParams);  
1246 - } 1276 +// public void setAnswerSheetLayout_Nornal(int num){
  1277 +// fraVideoPlayAnswer.setVisibility(View.VISIBLE);
  1278 +// RelativeLayout.LayoutParams layoutParams=new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,XdyStringUtils.dp2px(VideoPlayActivity.this,num));
  1279 +//// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
  1280 +//// layoutParams.setLayoutDirection(RelativeLayout.ALIGN_PARENT_BOTTOM);
  1281 +//// }
  1282 +// fraVideoPlayAnswer.setLayoutParams(layoutParams);
  1283 +// }
1247 } 1284 }
@@ -168,6 +168,7 @@ public class ChatFragment extends Fragment implements ObserverListener{ @@ -168,6 +168,7 @@ public class ChatFragment extends Fragment implements ObserverListener{
168 protected void initData() { 168 protected void initData() {
169 adapter = new ChatAdapter(mContext, datas, getOnChatItemClickListener()); 169 adapter = new ChatAdapter(mContext, datas, getOnChatItemClickListener());
170 mListView.setAdapter(adapter); 170 mListView.setAdapter(adapter);
  171 +// adapter.notifyDataSetChanged();
171 } 172 }
172 /** 173 /**
173 * @return 聊天列表内存点击事件监听器 174 * @return 聊天列表内存点击事件监听器
@@ -11,6 +11,7 @@ import android.support.v4.app.Fragment; @@ -11,6 +11,7 @@ import android.support.v4.app.Fragment;
11 import android.text.TextUtils; 11 import android.text.TextUtils;
12 import android.util.DisplayMetrics; 12 import android.util.DisplayMetrics;
13 import android.view.LayoutInflater; 13 import android.view.LayoutInflater;
  14 +import android.view.SurfaceView;
14 import android.view.View; 15 import android.view.View;
15 import android.view.ViewGroup; 16 import android.view.ViewGroup;
16 17
@@ -105,6 +106,10 @@ public class DocFragment extends Fragment implements ObserverListener{ @@ -105,6 +106,10 @@ public class DocFragment extends Fragment implements ObserverListener{
105 DisplayMetrics metric = new DisplayMetrics(); 106 DisplayMetrics metric = new DisplayMetrics();
106 getWindowWith(metric); 107 getWindowWith(metric);
107 docUrlTransformBitmap(null); 108 docUrlTransformBitmap(null);
  109 +// mCanvasView.setZOrderMediaOverlay(false);
  110 +// mCanvasView.setZOrderOnTop(false);
  111 +//// mCanvasView.getHolder().setFormat(SurfaceView.TRANSPARENT);
  112 +// mCanvasView.getHolder().setFormat(SurfaceView.TRANSPARENT);
108 } 113 }
109 114
110 private void getWindowWith(DisplayMetrics metric) { 115 private void getWindowWith(DisplayMetrics metric) {
@@ -467,8 +467,8 @@ public class CanvasView extends SurfaceView implements SurfaceHolder.Callback, V @@ -467,8 +467,8 @@ public class CanvasView extends SurfaceView implements SurfaceHolder.Callback, V
467 this.setOnTouchListener(this); 467 this.setOnTouchListener(this);
468 // 设置背景为透明 否则是黑色 468 // 设置背景为透明 否则是黑色
469 this.setZOrderOnTop(true); 469 this.setZOrderOnTop(true);
470 - // this.setZOrderMediaOverlay(true);  
471 - this.getHolder().setFormat(PixelFormat.TRANSLUCENT); 470 + this.getHolder().setFormat(PixelFormat.TRANSPARENT);
  471 +// this.setZOrderMediaOverlay(true);
472 472
473 screenWidth = DisplayUtil.getScreenWidth(getContext()); 473 screenWidth = DisplayUtil.getScreenWidth(getContext());
474 } 474 }
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 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 xmlns:custom="http://schemas.android.com/apk/res-auto" 4 xmlns:custom="http://schemas.android.com/apk/res-auto"
5 android:id="@+id/activity_video_play" 5 android:id="@+id/activity_video_play"
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 android:orientation="vertical" 8 android:orientation="vertical"
9 tools:context="com.mang.xdy.demo.activity.VideoPlayActivity"> 9 tools:context="com.mang.xdy.demo.activity.VideoPlayActivity">
10 <RelativeLayout 10 <RelativeLayout
  11 + android:id="@+id/rel_videoPlay_play"
11 android:layout_width="match_parent" 12 android:layout_width="match_parent"
12 android:layout_height="@dimen/ui_DIMEN_500.0PX"> 13 android:layout_height="@dimen/ui_DIMEN_500.0PX">
13 <com.pili.pldroid.player.widget.PLVideoTextureView 14 <com.pili.pldroid.player.widget.PLVideoTextureView
@@ -138,20 +139,13 @@ @@ -138,20 +139,13 @@
138 </RelativeLayout> 139 </RelativeLayout>
139 </RelativeLayout> 140 </RelativeLayout>
140 141
141 - <android.support.design.widget.TabLayout  
142 - android:id="@+id/sliding_tabs"  
143 - android:layout_width="match_parent"  
144 - android:layout_height="wrap_content"  
145 - android:visibility="gone"  
146 -  
147 - />  
148 <com.flyco.tablayout.SlidingTabLayout 142 <com.flyco.tablayout.SlidingTabLayout
149 android:id="@+id/stl_videoPlay_tab" 143 android:id="@+id/stl_videoPlay_tab"
  144 + android:layout_below="@+id/rel_videoPlay_play"
150 android:layout_width="match_parent" 145 android:layout_width="match_parent"
151 android:layout_height="@dimen/ui_titlebar_height" 146 android:layout_height="@dimen/ui_titlebar_height"
152 android:layout_alignParentLeft="true" 147 android:layout_alignParentLeft="true"
153 android:layout_alignParentStart="true" 148 android:layout_alignParentStart="true"
154 - android:layout_below="@+id/fl_videoview_container"  
155 android:background="#fafafa" 149 android:background="#fafafa"
156 custom:tl_indicator_color="@color/home_tab_selected" 150 custom:tl_indicator_color="@color/home_tab_selected"
157 custom:tl_indicator_corner_radius="1.5dp" 151 custom:tl_indicator_corner_radius="1.5dp"
@@ -163,12 +157,15 @@ @@ -163,12 +157,15 @@
163 custom:tl_textsize="@dimen/ui_DIMEN_28.0PX"/> 157 custom:tl_textsize="@dimen/ui_DIMEN_28.0PX"/>
164 <com.mang.xdy.demo.widget.view.NoScrollViewPager 158 <com.mang.xdy.demo.widget.view.NoScrollViewPager
165 android:id="@+id/viewpager" 159 android:id="@+id/viewpager"
  160 + android:layout_below="@+id/stl_videoPlay_tab"
166 android:layout_width="match_parent" 161 android:layout_width="match_parent"
167 - android:layout_height="0px" 162 + android:layout_height="wrap_content"
168 android:layout_weight="1" 163 android:layout_weight="1"
169 android:background="@android:color/white" > 164 android:background="@android:color/white" >
170 165
171 </com.mang.xdy.demo.widget.view.NoScrollViewPager> 166 </com.mang.xdy.demo.widget.view.NoScrollViewPager>
  167 +
  168 +
172 <FrameLayout 169 <FrameLayout
173 android:id="@+id/fl_media" 170 android:id="@+id/fl_media"
174 android:layout_width="match_parent" 171 android:layout_width="match_parent"
@@ -184,12 +181,19 @@ @@ -184,12 +181,19 @@
184 <FrameLayout 181 <FrameLayout
185 android:id="@+id/fra_videoPlay_answer" 182 android:id="@+id/fra_videoPlay_answer"
186 android:layout_width="match_parent" 183 android:layout_width="match_parent"
187 - android:visibility="gone"  
188 - android:layout_height="@dimen/ui_titlebar_height"> 184 + android:layout_height="match_parent"
  185 + android:layout_alignParentBottom="true"
  186 + android:layout_marginBottom="10dp"
  187 +
  188 + >
189 <com.mang.xdy.demo.widget.answersheet.AnswerSheetView 189 <com.mang.xdy.demo.widget.answersheet.AnswerSheetView
190 android:id="@+id/asv_videoPlay_answer" 190 android:id="@+id/asv_videoPlay_answer"
191 android:layout_width="match_parent" 191 android:layout_width="match_parent"
192 - android:layout_height="match_parent"> 192 + android:layout_height="90dp"
  193 + android:layout_gravity="bottom"
  194 +
  195 + >
193 </com.mang.xdy.demo.widget.answersheet.AnswerSheetView> 196 </com.mang.xdy.demo.widget.answersheet.AnswerSheetView>
194 </FrameLayout> 197 </FrameLayout>
195 -</LinearLayout> 198 +
  199 +</RelativeLayout>
@@ -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\\actionsheet_top_normal.9.png",  
40 - "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\actionsheet_top_normal.9.png"  
41 - },  
42 - {  
43 "merged": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\build\\intermediates\\res\\merged\\release\\drawable-hdpi-v4\\alert_btn_left_pressed.9.png", 39 "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" 40 "source": "D:\\Android_Sdk\\MyApplication\\iOS_Dialog_Library\\src\\main\\res\\drawable-hdpi\\alert_btn_left_pressed.9.png"
45 }, 41 },
46 { 42 {
  43 + "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"
  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 },
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
34 android:orientation="vertical" > 34 android:orientation="vertical" >
35 </LinearLayout> 35 </LinearLayout>
36 - </ScrollView>  
37 36
  37 + </ScrollView>
38 <TextView 38 <TextView
39 android:id="@+id/txt_cancel" 39 android:id="@+id/txt_cancel"
40 android:layout_width="match_parent" 40 android:layout_width="match_parent"
1 -#Mon May 08 17:38:00 CST 2017 1 +#Tue May 09 22:54:42 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
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<resources>  
3 - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">  
4 - <!-- API 11 theme customizations can go here. -->  
5 - </style>  
6 -</resources>  
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<resources>  
3 - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">  
4 - <!-- API 14 theme customizations can go here. -->  
5 - </style>  
6 -</resources>  
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<resources>  
3 - <color name="actionsheet_blue">#037BFF</color>  
4 - <color name="actionsheet_gray">#8F8F8F</color>  
5 - <color name="actionsheet_red">#FD4A2E</color>  
6 - <color name="alertdialog_line">#c6c6c6</color>  
7 - <color name="black">#000000</color>  
8 - <color name="trans">#00000000</color>  
9 - <dimen name="activity_horizontal_margin">16dp</dimen>  
10 - <dimen name="activity_vertical_margin">16dp</dimen>  
11 - <string name="app_name">IOSDialog</string>  
12 - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">  
13 - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>  
14 - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>  
15 - </style>  
16 - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog">  
17 -  
18 - <!-- 背景透明 -->  
19 - <item name="android:windowBackground">@android:color/transparent</item>  
20 - <item name="android:windowContentOverlay">@null</item>  
21 - <!-- 浮于Activity之上 -->  
22 - <item name="android:windowIsFloating">true</item>  
23 - <!-- 边框 -->  
24 - <item name="android:windowFrame">@null</item>  
25 - <!-- Dialog以外的区域模糊效果 -->  
26 - <item name="android:backgroundDimEnabled">true</item>  
27 - <!-- 无标题 -->  
28 - <item name="android:windowNoTitle">true</item>  
29 - <!-- 半透明 -->  
30 - <item name="android:windowIsTranslucent">true</item>  
31 - <!-- Dialog进入及退出动画 -->  
32 - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>  
33 - </style>  
34 - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog">  
35 - <item name="android:windowBackground">@android:color/transparent</item>  
36 - <item name="android:windowContentOverlay">@null</item>  
37 - <item name="android:windowIsFloating">true</item>  
38 - <item name="android:windowFrame">@null</item>  
39 - <item name="android:backgroundDimEnabled">true</item>  
40 - <item name="android:windowNoTitle">true</item>  
41 - <item name="android:windowIsTranslucent">true</item>  
42 - </style>  
43 - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/>  
44 - <style name="AppTheme" parent="AppBaseTheme"/>  
45 -</resources>  
1 -#Mon May 08 17:37:17 CST 2017 1 +#Tue May 09 22:54:42 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\\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 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
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  
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 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
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
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<resources>  
3 - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">  
4 - <!-- API 11 theme customizations can go here. -->  
5 - </style>  
6 -</resources>  
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<resources>  
3 - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">  
4 - <!-- API 14 theme customizations can go here. -->  
5 - </style>  
6 -</resources>  
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<resources>  
3 - <color name="actionsheet_blue">#037BFF</color>  
4 - <color name="actionsheet_gray">#8F8F8F</color>  
5 - <color name="actionsheet_red">#FD4A2E</color>  
6 - <color name="alertdialog_line">#c6c6c6</color>  
7 - <color name="black">#000000</color>  
8 - <color name="trans">#00000000</color>  
9 - <dimen name="activity_horizontal_margin">16dp</dimen>  
10 - <dimen name="activity_vertical_margin">16dp</dimen>  
11 - <string name="app_name">IOSDialog</string>  
12 - <style name="ActionSheetDialogAnimation" parent="@android:style/Animation.Dialog">  
13 - <item name="android:windowEnterAnimation">@anim/actionsheet_dialog_in</item>  
14 - <item name="android:windowExitAnimation">@anim/actionsheet_dialog_out</item>  
15 - </style>  
16 - <style name="ActionSheetDialogStyle" parent="@android:style/Theme.Dialog">  
17 -  
18 - <!-- 背景透明 -->  
19 - <item name="android:windowBackground">@android:color/transparent</item>  
20 - <item name="android:windowContentOverlay">@null</item>  
21 - <!-- 浮于Activity之上 -->  
22 - <item name="android:windowIsFloating">true</item>  
23 - <!-- 边框 -->  
24 - <item name="android:windowFrame">@null</item>  
25 - <!-- Dialog以外的区域模糊效果 -->  
26 - <item name="android:backgroundDimEnabled">true</item>  
27 - <!-- 无标题 -->  
28 - <item name="android:windowNoTitle">true</item>  
29 - <!-- 半透明 -->  
30 - <item name="android:windowIsTranslucent">true</item>  
31 - <!-- Dialog进入及退出动画 -->  
32 - <item name="android:windowAnimationStyle">@style/ActionSheetDialogAnimation</item>  
33 - </style>  
34 - <style name="AlertDialogStyle" parent="@android:style/Theme.Dialog">  
35 - <item name="android:windowBackground">@android:color/transparent</item>  
36 - <item name="android:windowContentOverlay">@null</item>  
37 - <item name="android:windowIsFloating">true</item>  
38 - <item name="android:windowFrame">@null</item>  
39 - <item name="android:backgroundDimEnabled">true</item>  
40 - <item name="android:windowNoTitle">true</item>  
41 - <item name="android:windowIsTranslucent">true</item>  
42 - </style>  
43 - <style name="AppBaseTheme" parent="android:Theme.Light.NoTitleBar"/>  
44 - <style name="AppTheme" parent="AppBaseTheme"/>  
45 -</resources>  
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
34 android:orientation="vertical" > 34 android:orientation="vertical" >
35 </LinearLayout> 35 </LinearLayout>
36 - </ScrollView>  
37 36
  37 + </ScrollView>
38 <TextView 38 <TextView
39 android:id="@+id/txt_cancel" 39 android:id="@+id/txt_cancel"
40 android:layout_width="match_parent" 40 android:layout_width="match_parent"
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
34 android:orientation="vertical" > 34 android:orientation="vertical" >
35 </LinearLayout> 35 </LinearLayout>
36 - </ScrollView>  
37 36
  37 + </ScrollView>
38 <TextView 38 <TextView
39 android:id="@+id/txt_cancel" 39 android:id="@+id/txt_cancel"
40 android:layout_width="match_parent" 40 android:layout_width="match_parent"