Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/com/sheep/gamegroup/absBase/AbsChooseImageActivity.java

@@ -5,6 +5,8 @@ import android.net.Uri;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
+import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.upfile.UpFileListener;
 import com.sheep.gamegroup.util.upfile.UpFileUtils;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
@@ -58,7 +60,10 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                 .start(this, PhotoPicker.REQUEST_CODE);
     }
     public void showChooseDialog(boolean isCrop, boolean isUpload, int photoCount, File dir) {
-        if(dir.exists() && dir.listFiles().length > 0) {
+        LogUtil.println("showChooseDialog", dir.getAbsolutePath(), dir.exists());
+        File[] files = dir.listFiles();
+        String[] filePaths = dir.list();
+        if(dir.exists() && files != null && files.length > 0) {
             photoCount = Math.max(1, photoCount);
             this.isUpload = isUpload;
             this.isCrop = isCrop && photoCount == 1;
@@ -79,7 +84,7 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
                     }, dir.listFiles()))
                     .start(this, PhotoPicker.REQUEST_CODE);
         } else {
-            G.showToast("暂无截图");
+            G.showToast("暂无截图（若您已经截图，请查看是否开启查看应用使用情况等权限！）");
         }
     }
     private boolean showCamera = false;

app/src/main/java/com/sheep/gamegroup/usage/AppUsageManager.java

@@ -25,6 +25,7 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -172,7 +173,7 @@ public class AppUsageManager {
         }
         LogUtil.println("tryOpenLookAppUsageStatsPermisson", "start");
         AutoTaskListUtil.getInstance().clearAlertDialog();
-        if(!AutoTaskListUtil.getInstance().isEmpty()){
+        if(!AutoTaskListUtil.getInstance().isEmpty() || DataUtil.IS_LISTEN_SCREEN_SHOT){
             LogUtil.println("tryOpenLookAppUsageStatsPermisson", "notEmpty");
             showAccessibilityDialog();
         } else {
@@ -181,7 +182,7 @@ public class AppUsageManager {
         LogUtil.println("tryOpenLookAppUsageStatsPermisson","end");
     }
     public void showAccessibilityDialog() {
-        AlertDialog tipToOpernAccessibilityDialog = ViewUtil.showMsgDialog(SheepApp.getInstance(), new DialogConfig().setTitle("温馨提示！")
+        AlertDialog tipToOpernAccessibilityDialog = ViewUtil.showMsgDialog(ActivityManager.getInstance().currentActivity(), new DialogConfig().setTitle("温馨提示！")
                 .setMsg("亲！系统检测到您需要手动开启小绵羊查看应用情况的权限才能继续任务！")
                 .setBtnLeftText("去开启").setBtnLeftOnClickListener(new View.OnClickListener() {
                     @Override

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -111,6 +111,10 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECEIVE_AWARD_GAME_TASK;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_SYS_SEND;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_QQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WEIXIN_CIRCLE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.SHARE_TO_WX;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.XIAOMI_GAME_RECEIVE;
 import static com.sheep.gamegroup.util.ViewUtil.mRobTask;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
@@ -799,26 +803,8 @@ public class CommonUtil {
                 ViewUtil.newInstance().showShare(activity, realUrl, description);
                 return;
             case DialogShare.SYS_SEND:
-                PackageInfo packageInfo = ApkUtils.getPackageInfo(SheepApp.getInstance().getPackageName());
-                if(packageInfo != null && packageInfo.applicationInfo != null && !TextUtils.isEmpty(packageInfo.applicationInfo.sourceDir)){
-                    String dir = DIR;
-                    //File dir = SheepApp.getInstance().getDir("apk", Context.MODE_PRIVATE);
-                    File file = new File(dir, String.format(Locale.CHINA, "sheep_release_v%s_%d-%s.apk", packageInfo.versionName, packageInfo.versionCode, DataUtil.getInstance().getInvitationCode()));
-                    if(!file.exists()){
-                        try {
-                            FileUtil.copyFile(new File(packageInfo.applicationInfo.sourceDir), file);
-                            ZipChannelUtil.writeQUA(file, DataUtil.getInstance().getInvitationCode());
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if(file.exists())
-                        shareFile(activity, file);
-                    else
-                        G.showToast("暂不支持，或未打开权限");
-                } else {
-                    G.showToast("暂不支持");
-                }
+                SHARE_SYS_SEND.onEvent();
+                shareBySysSend(activity);
                 return;
             case DialogShare.FACE_TO_FACE:
                 ViewUtil.showQR(activity, realUrl);
@@ -837,13 +823,16 @@ public class CommonUtil {
                         }));
                 return;
             case DialogShare.QQ:
+                SHARE_TO_QQ.onEvent();
                 share_media = SHARE_MEDIA.QQ;
                 break;
             case DialogShare.WX:
+                SHARE_TO_WX.onEvent();
                 share_media = SHARE_MEDIA.WEIXIN;
                 break;
             case DialogShare.WEIXIN_CIRCLE:
             default:
+                SHARE_TO_WEIXIN_CIRCLE.onEvent();
                 share_media = SHARE_MEDIA.WEIXIN_CIRCLE;
                 break;
         }
@@ -858,6 +847,30 @@ public class CommonUtil {
                 .setCallback(new UMShareListener())
                 .share();
     }
+
+    public void shareBySysSend(Activity activity) {
+        PackageInfo packageInfo = ApkUtils.getPackageInfo(SheepApp.getInstance().getPackageName());
+        if(packageInfo != null && packageInfo.applicationInfo != null && !TextUtils.isEmpty(packageInfo.applicationInfo.sourceDir)){
+            String dir = DIR;
+            //File dir = SheepApp.getInstance().getDir("apk", Context.MODE_PRIVATE);
+            File file = new File(dir, String.format(Locale.CHINA, "sheep_release_v%s_%d-%s.apk", packageInfo.versionName, packageInfo.versionCode, DataUtil.getInstance().getInvitationCode()));
+            if(!file.exists()){
+                try {
+                    FileUtil.copyFile(new File(packageInfo.applicationInfo.sourceDir), file);
+                    ZipChannelUtil.writeQUA(file, DataUtil.getInstance().getInvitationCode());
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if(file.exists())
+                shareFile(activity, file);
+            else
+                G.showToast("暂不支持，或未打开权限");
+        } else {
+            G.showToast("暂不支持");
+        }
+    }
+
     // 調用系統方法分享文件
     public static void shareFile(Context context, File file) {
         if (null != file && file.exists()) {

app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -435,7 +435,7 @@ public class DataUtil {
                     @Override
                     public void call(Integer integer) {
                         try {
-                            FileUtil.copyFile(new File (imagePath), getScreenShotsDir(packageName));
+                            FileUtil.copyFileToDir(new File(imagePath), getScreenShotsDir(packageName));
                         } catch (IOException e) {
                             e.printStackTrace();
                             LogUtil.println("ScreenShotListenManager", "复制截屏图片失败");

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -49,6 +49,7 @@ import com.sheep.gamegroup.view.activity.ActGiftDetail;
 import com.sheep.gamegroup.view.activity.ActGuide;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
+import com.sheep.gamegroup.view.activity.ActInvitation;
 import com.sheep.gamegroup.view.activity.ActLoadH5;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.ActMiDong;
@@ -124,6 +125,7 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.ASK_MAKE_MONEY_INVITATION;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_DOWNLOAD_WELFARE_LIST;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_EVERY_DAY_MORE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_GIFT_CENTER;
@@ -1594,4 +1596,13 @@ public class Jump2View {
             intent.putExtra(SystemNotification.class.getSimpleName(), (SystemNotification)object);
         activity.startActivity(intent);
     }
+
+    /**
+     * 进入邀请赚钱分享界面
+     * @param activity
+     */
+    public void goActInvitation(Activity activity) {
+        ASK_MAKE_MONEY_INVITATION.onEvent();
+        activity.startActivity(new Intent(activity, ActInvitation.class));
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/ScreenShotListenManager.java

@@ -309,7 +309,7 @@ public class ScreenShotListenManager {
      * 判断是否已回调过, 某些手机ROM截屏一次会发出多次内容改变的通知; <br/>
      * 删除一个图片也会发通知, 同时防止删除图片时误将上一张符合截屏规则的图片当做是当前截屏.
      */
-    private boolean checkCallback(String imagePath) {
+    private synchronized boolean checkCallback(String imagePath) {
         if (sHasCallbackPaths.contains(imagePath)) {
             return true;
         }

app/src/main/java/com/sheep/gamegroup/util/UMConfigUtils.java

@@ -172,6 +172,8 @@ public class UMConfigUtils {
         SEARCH_APP("玩转游戏 -> 搜索游戏"),
         GIFT_DETAIL("礼包详情页面"),
         SYSTEM_NOTIFICATION_DETAIL("消息详情页面"),
+        ASK_MAKE_MONEY_INVITATION("邀请赚钱分享页面"),
+        SHARE_SYS_SEND("通过系统分享文件"),
         ;
         private String tag;
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java

@@ -62,9 +62,6 @@ public class ActCreditCardWeb extends BaseActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 //            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
-        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
-            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
-        }
         tv_next.setVisibility(View.GONE);
         initJsData();
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java

@@ -102,7 +102,6 @@ public class ActFindGame extends BaseActivity {
 
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, G.BAR_HEIGHT);
         status_height_view.setLayoutParams(params);
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar_act_game_details));
         /*
           标题显示和隐藏的监听
          */

app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideDeblocked.java

@@ -54,9 +54,6 @@ public class ActGuideDeblocked extends BaseActivity {
         tv_next.setVisibility(View.GONE);
         WebSettings webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
-            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
-        }
         loadUrl();
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideOnHook.java

@@ -50,9 +50,6 @@ public class ActGuideOnHook extends BaseActivity {
 
         WebSettings webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
-            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
-        }
         loadUrl();
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActSignCard.java

@@ -149,11 +149,15 @@ public class ActSignCard extends BaseActivity {
             @Override
             public void convert(ViewHolder holder, PunchUser user) {
                 int position = holder.getAdapterPosition();
+                ImageView item_super_user_bg1 = (ImageView) holder.itemView.findViewById(R.id.item_super_user_bg1);
                 ImageView item_super_user_iv = (ImageView) holder.itemView.findViewById(R.id.item_super_user_iv);
+                ImageView item_super_user_bg2 = (ImageView) holder.itemView.findViewById(R.id.item_super_user_bg2);
                 TextView item_super_user_tv1 = (TextView) holder.itemView.findViewById(R.id.item_super_user_tv1);
                 TextView item_super_user_tv2 = (TextView) holder.itemView.findViewById(R.id.item_super_user_tv2);
                 TextView item_super_user_tv3 = (TextView) holder.itemView.findViewById(R.id.item_super_user_tv3);
                 ViewUtil.setText(item_super_user_tv1, XING_TEXTS[position]);
+                item_super_user_bg1.setImageResource(XING_BGS1[position]);
+                item_super_user_bg2.setImageResource(XING_BGS2[position]);
                 if (user == null) {
                     ViewUtil.setDefaultText(item_super_user_tv2);
                     ViewUtil.setDefaultText(item_super_user_tv3);
@@ -168,6 +172,8 @@ public class ActSignCard extends BaseActivity {
     }
 
     private final static String[] XING_TEXTS = {"早起之星", "挑战之星", "毅力之星"};
+    private final static int[] XING_BGS1 = {R.drawable.yellow_bg1, R.drawable.bule_bg1, R.drawable.red_bg1};
+    private final static int[] XING_BGS2 = {R.drawable.yellow_bg2, R.drawable.bule_bg2, R.drawable.red_bg2};
     private List<PunchUser> userList = ListUtil.emptyList();
     private List<PunchUser> superUserList = ListUtil.emptyList();
     private boolean isCanSignUp = false;//判断今日是否能报名 true可以 false不可以
@@ -414,6 +420,7 @@ public class ActSignCard extends BaseActivity {
             switch (msg.what){
                 case 0://UPDATE_TIME:
                     if(totalTime > 0) {
+                        sign_card_join.setEnabled(false);
                         sign_card_join.setText(String.format(Locale.CHINA, "%s后可打卡", TimeUtil.getHours(totalTime-- * 1000)));
                         sendEmptyMessageDelayed(msg.what, 1000L);
                     }
@@ -429,7 +436,7 @@ public class ActSignCard extends BaseActivity {
         } else if (initCanSignUp == SUCCESS && isCanSignUp) {//可以报名
             sign_card_join.setEnabled(true);
             sign_card_join.setText("报名打卡");
-        } else if(punchAndSign != null && punchAndSign.getCountdown() > 0){
+        } else if(punchAndSign != null && punchAndSign.getCountdown() > 0 && initCanSignUp == SUCCESS && punchType > 2){
             if(totalTime == INIT) {//只设置一次
                 sign_card_join.setEnabled(false);
                 totalTime = punchAndSign.getCountdown();

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -89,9 +89,6 @@ public class ActWeb extends BaseActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 //            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
-        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
-            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
-        }
 
         loadUrl();
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActXinwanWeb.java

@@ -85,9 +85,6 @@ public class ActXinwanWeb extends BaseActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 //            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
-        if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
-            findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
-        }
         initJsData();
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -233,6 +233,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         ViewUtil.setDefaultText(priceTv);
         ViewUtil.setDefaultText(dateTv);
         ViewUtil.setDefaultText(num_tv);
+        if(DataUtil.IS_LISTEN_SCREEN_SHOT){//监听小绵羊截图功能需要开启查看应用使用情况的权限
+            AppUsageManager.getInstance().tryOpenLookAppUsageStatsPermisson(false);
+        }
     }
 
     @Override
@@ -285,7 +288,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
         loadOld();
         //自动审核
-        if (taskEty.getInspect_type() == 3) {
+        if (taskEty.getInspect_type() == 3 || DataUtil.IS_LISTEN_SCREEN_SHOT) {
             ViewUtil.setColorMapText(item_exlpain_title, getString(R.string.supplement_explain_n), "点我开启权限", "#FF0000");
             //用户可主动点击进行开启查看权限
             taskdetail_explain_layout.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskgetmoney.java

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.ActInvitation;
@@ -287,7 +288,7 @@ public class FgtAskgetmoney extends BaseFragment {
             case R.id.ask_invite_rl:
                 break;
             case R.id.ask_invite_tv:
-                startActivity(new Intent(getActivity(), ActInvitation.class));
+                Jump2View.getInstance().goActInvitation(activity);
                 break;
         }
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import com.sheep.gamegroup.model.entity.AppUsage;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.usage.AppUsageManager;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
@@ -60,7 +61,11 @@ public class FloatService extends Service {
                         @Override
                         public void call(Long count) {
                             LogUtil.println("FloatService", "count", "=", count);
-
+                            if(DataUtil.IS_LISTEN_SCREEN_SHOT){//监听小绵羊截图功能需要开启查看应用使用情况的权限
+                                if(count % 60 == 30){
+                                    AppUsageManager.getInstance().tryOpenLookAppUsageStatsPermisson(false);
+                                }
+                            }
                             if (!TextUtils.isEmpty(SpUtils.getToken(SheepApp.getInstance())) &&!AutoTaskListUtil.getInstance().isEmpty()) {//登录情况下并且有应用自动审核任务才会记录
                                 if(count % 60 == 0){
                                     AppUsageManager.getInstance().tryOpenLookAppUsageStatsPermisson(false);

app/src/main/res/color/hot_tag_item_text_color.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true"
-    android:color="?attr/main_color_dark"/>
-    <!-- not selected -->
-    <item android:state_checked="false"
-        android:color="@color/tv_fail_tip"/>
-</selector>

app/src/main/res/color/selector_color_agreement.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_enabled="false" android:color="@color/main_tab"/>
-    <item android:state_activated="true" android:color="@color/main_tab"/>
-    <item android:state_pressed="true" android:color="@color/main_tab"/>
-    <item android:color="#444444"/>
-</selector>

app/src/main/res/color/selector_color_choose_head.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true" android:color="@color/color_choose_head_tv_press"/>
-    <item android:color="@color/color_choose_head_tv"/>
-</selector>

app/src/main/res/drawable-hdpi/jpush_richpush_btn_selector.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<selector xmlns:android="http://schemas.android.com/apk/res/android" > 
-    <!-- 获得焦点但未按下时的背景图片 --> 
-    <item 
-        android:state_focused="true" 
-        android:state_enabled="true" 
-        android:state_pressed="false" 
-        android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
-     <!-- 按下时的背景图片 --> 
-    <item 
-        android:state_enabled="true" 
-        android:state_pressed="true" 
-        android:drawable="@android:color/darker_gray" /> 
-    <!-- 按下时的背景图片 --> 
-    <item 
-        android:state_enabled="true" 
-        android:state_checked="true" 
-        android:drawable="@android:color/darker_gray" /> 
-    <!-- 默认时的背景图片 --> 
-    <item android:drawable="@drawable/jpush_ic_richpush_actionbar_back" />
-</selector> 

app/src/main/res/drawable-hdpi/jpush_richpush_progressbar.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- 背景  gradient是渐变,corners定义的是圆角 -->
-    <item android:id="@android:id/background">
-        <shape>
-            <solid android:color="#ffffff" />
-        </shape>
-    </item>
-    
-    <!-- 进度条 -->
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <solid android:color="#4393ea" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>

app/src/main/res/drawable/border_circle_radius.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- 内部颜色 -->
-    <solid android:color="#ffffff" />
-     <corners android:radius="6dp" />
-    <!-- 边缘线条颜色 -->
-    <stroke
-        android:width="1dp"
-        android:color="#EDEDED" />
-
-</shape>

app/src/main/res/drawable/button_reset.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/button_reset_pressed" />
-      <corners
-          android:topLeftRadius="5dp"
-          android:topRightRadius="5dp"
-          android:bottomLeftRadius="5dp"
-          android:bottomRightRadius="5dp" />
-    </shape>
-  </item>
-  <item android:top="1px" android:bottom="1px" android:left="1px" android:right="1px">
-    <shape>
-      <gradient
-          android:startColor="@color/white" android:endColor="@color/white"
-          android:type="linear" android:angle="90"
-          android:centerX="0.5" android:centerY="0.5" />
-      <corners
-          android:topLeftRadius="5dp"
-          android:topRightRadius="5dp"
-          android:bottomLeftRadius="5dp"
-          android:bottomRightRadius="5dp" />
-    </shape>
-  </item>
-</layer-list>

app/src/main/res/drawable/dialog_white_radius.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="18dp" />
-    <solid android:color="@color/white" />
-</shape>

app/src/main/res/drawable/dotted_line.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="90"
-    android:toDegrees="180" >
-<shape
-    android:shape="line">
-    <!-- 显示一条虚线，破折线的宽度为dashWith，破折线之间的空隙的宽度为dashGap，当dashGap=0dp时，为实线 -->
-    <stroke
-        android:width="2dp"
-        android:dashGap="1dp"
-        android:dashWidth="5dp"
-        android:color="#262626" />
-    <size android:height="200dp"></size>
-</shape>
-</rotate>

app/src/main/res/drawable/ic_arrow_back_24dp.xml

@@ -1,4 +0,0 @@
-<!--<vector xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:width="24dp"--><!--android:height="24dp"--><!--android:viewportHeight="24.0"--><!--android:viewportWidth="24.0">--><!--<path--><!--android:fillColor="@color/B"--><!--android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />--><!--</vector>-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/narrow_back_black" />
-</selector>

app/src/main/res/drawable/ic_highlight_remove_24dp.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#dedede"
-        android:pathData="M14.59,8L12,10.59 9.41,8 8,9.41 10.59,12 8,14.59 9.41,16 12,13.41 14.59,16 16,14.59 13.41,12 16,9.41 14.59,8zM12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
-</vector>

app/src/main/res/drawable/selector_agreement_cb.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/agreement_yes" android:state_focused="true" />
-    <item android:drawable="@drawable/agreement_yes" android:state_checked="true" />
-    <item android:drawable="@drawable/agreement_yes" android:state_selected="true" />
-    <item android:drawable="@drawable/agreement_yes" android:state_pressed="true" />
-    <item android:drawable="@drawable/agreement_no" />
-</selector>

app/src/main/res/drawable/shap_blue_btn_22.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="22dp" />
-    <solid android:color="#4889FF" />
-</shape>

app/src/main/res/drawable/shape_agreement_solid_rectangle_bottom.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:bottomLeftRadius="15dp"
-        android:bottomRightRadius="15dp" />
-    <solid android:color="@color/app" />
-</shape>

app/src/main/res/drawable/shape_blue_stroke_rectangle_x.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="10dp"
-        android:topRightRadius="10dp"
-        android:bottomRightRadius="10dp"/>
-    <stroke
-        android:width="1dp"
-        android:color="#2EBEF2" />
-</shape>

app/src/main/res/drawable/shape_gray_stroke_rectangle_x.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="10dp"
-        android:topRightRadius="10dp"
-        android:bottomRightRadius="10dp"/>
-    <stroke
-        android:width="1dp"
-        android:color="#CCCCCC" />
-</shape>

app/src/main/res/drawable/shape_green_stroke_rectangle.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="#F81B5F" />
-</shape>

app/src/main/res/drawable/shape_litter_red_circle.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="30dp"
-        android:height="30dp" />
-    <corners android:radius="30dp" />
-    <solid android:color="#fff81b5f" />
-</shape>

app/src/main/res/drawable/shape_red_point_circle.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="20dp"
-        android:height="20dp" />
-    <solid android:color="@color/red" />
-    <corners android:radius="20dp" />
-</shape>

app/src/main/res/drawable/shape_red_stroke_rectangle.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="#2FA255" />
-</shape>

app/src/main/res/drawable/shape_sign_rankings_left_hold.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:topLeftRadius="15dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
-
-    <solid
-        android:color="#fed459"
-        />
-</shape>

app/src/main/res/drawable/shape_sign_rankings_left_normal.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:topLeftRadius="15dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
-
-    <solid
-        android:color="#ffe9a9"
-        />
-</shape>

app/src/main/res/drawable/shape_sign_rankings_right_hold.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:topLeftRadius="0dp" android:topRightRadius="15dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
-
-    <solid
-        android:color="#fed459"
-        />
-</shape>

app/src/main/res/drawable/shape_sign_rankings_right_normal.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:topLeftRadius="0dp" android:topRightRadius="15dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
-
-    <solid
-        android:color="#ffe9a9"
-        />
-</shape>

app/src/main/res/drawable/shape_yellow_stroke_rectangle.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="#FFA21C" />
-</shape>

app/src/main/res/drawable/sl_white_gray.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/detail_bgColor" android:state_pressed="true" />
-    <item android:drawable="@color/white" />
-</selector>

app/src/main/res/drawable/sp_bg_gradient_blue_nocorners.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:startColor="@color/blue_36A6E6"
-        android:gradientRadius="80%"
-        android:endColor="@color/blue_2EC2F7"/>
-
-</shape>

app/src/main/res/drawable/sp_bg_gradient_rectangle_blue_change.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:startColor="@color/blue_start"
-        android:endColor="@color/blue_end"/>
-
-    <corners
-        android:radius="@dimen/radius_25"/>
-
-</shape>

app/src/main/res/drawable/sp_bg_gradient_retangle_transe.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:angle="-90"
-        android:startColor="@color/transparent"
-        android:endColor="@color/dark"/>
-
-
-</shape>

app/src/main/res/drawable/theme_bg_btn_corner.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/theme_dra_btn_corner_pressed_false_main" android:state_pressed="false"/>
-    <item android:drawable="@drawable/theme_dra_btn_corner_pressed_true_main" android:state_pressed="true"/>
-
-</selector>

app/src/main/res/drawable/wheel_bg.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <shape android:shape="rectangle" >
-            <gradient
-                android:angle="0"
-                android:centerColor="#fff"
-                android:endColor="#fff"
-                android:startColor="#fff" />
-
-            <stroke
-                android:width="1dp"
-                android:color="#00000000" />
-        </shape>
-    </item>
-    <item
-        android:bottom="1dp"
-        android:left="4dp"
-        android:right="4dp"
-        android:top="1dp">
-        <shape android:shape="rectangle" >
-            <gradient
-                android:angle="0"
-                android:centerColor="#FFF"
-                android:endColor="#fff"
-                android:startColor="#fff" />
-        </shape>
-    </item>
-
-</layer-list>

app/src/main/res/drawable/wheel_val.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<gradient
-		android:startColor="#3f00fcfe"
-		android:centerColor="#2f00fcfe"
-		android:endColor="#3f00fcfe"
-		android:angle="0" />
-
-	<stroke android:width="1dp" android:color="#00000000" /> 
-</shape>

app/src/main/res/drawable/x_shap_shadow_stroke_rectgangle.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--第一层-->
-    <item>
-        <shape>
-            <!--描边-->
-            <stroke
-                android:width="3px"
-                android:color="#5ebffc"
-                />
-
-            <corners android:radius="19dp" />
-        </shape>
-    </item>
-    <!--第二层-->
-    <item
-        android:left="1px"
-        android:top="1px"
-        android:bottom="1px"
-        android:right="1px">
-        <shape>
-            <!--描边-->
-            <stroke
-                android:width="1px"
-                android:color="#e0f8ff"
-                />
-
-            <corners android:radius="18dp" />
-        </shape>
-    </item>
-
-</layer-list>

app/src/main/res/drawable/x_tv_round_bg.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"
-    android:useLevel="false">
-
-    <solid android:color="@color/white_light"
-        />
-    <stroke
-        android:width="1px"
-        android:color="@color/black" />
-    <size
-        android:width="15dp"
-        android:height="15dp" />
-
-</shape>

app/src/main/res/layout-um/act_preview_screen_shot.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-  <ImageView
-      android:id="@+id/preview_image"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:scaleType="centerCrop"/>
-
-</LinearLayout>

app/src/main/res/layout-um/socialize_share_menu_item.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <com.umeng.socialize.shareboard.SocializeImageView
-        android:id="@+id/socialize_image_view"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:padding="5dp"
-        android:src="@drawable/umeng_socialize_menu_default" />
-
-    <TextView
-        android:id="@+id/socialize_text_view"
-        android:layout_width="63dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="未知"
-        android:textSize="12sp" />
-
-</LinearLayout>

app/src/main/res/layout/act_audit_layout.xml

@@ -6,7 +6,6 @@
     android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
-        android:id="@+id/root_1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@mipmap/audit_top_bg"

app/src/main/res/layout/act_game_certification.xml

@@ -87,14 +87,12 @@
                     android:paddingTop="@dimen/content_padding_3"/>
 
                 <View
-                    android:id="@+id/bottom_uer_line"
                     android:layout_width="match_parent"
                     android:layout_height="1px"
                     android:background="@color/gray_5"
                     app:layout_constraintTop_toBottomOf="@+id/user_icon_iv"
                     android:layout_marginTop="@dimen/content_padding_5"/>
                 <View
-                    android:id="@+id/top_uer_line"
                     android:layout_width="match_parent"
                     android:layout_height="1px"
                     android:background="@color/gray_5"
@@ -127,7 +125,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
                 <TextView
-                    android:id="@+id/loading_view_msg"
                     style="@style/style_empty_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

app/src/main/res/layout/act_guide.xml

@@ -19,7 +19,6 @@
         android:layout_marginBottom="20dp"
         android:orientation="horizontal"/>
     <TextView
-        android:id="@+id/guide_skip"
         android:layout_width="wrap_content"
         android:layout_height="24dp"
         android:layout_alignParentTop="true"

app/src/main/res/layout/act_main.xml

@@ -13,7 +13,6 @@
         android:layout_marginBottom="@dimen/bottom_height" />
 
     <RelativeLayout
-        android:id="@+id/layout_bottom"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_height"
         android:layout_alignParentBottom="true"

app/src/main/res/layout/act_play_game_dtail.xml

@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.flipboard.bottomsheet.BottomSheetLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <android.support.design.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar_act_game_details"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white_light"
-            android:fitsSystemWindows="true">
-            <!--标题栏-->
-
-
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:id="@+id/toolbar_layout_act_game_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fitsSystemWindows="true"
-                app:contentScrim="?attr/colorPrimary"
-                app:expandedTitleTextAppearance="@style/TextAppearance.Design.CollapsingToolbar.Expanded"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <!--大图-->
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"
-                    android:fitsSystemWindows="true"
-                    android:gravity="center_horizontal"
-                    app:layout_scrollFlags="scroll|enterAlways">
-
-                    <ImageView
-                        android:id="@+id/find_game_iv"
-                        android:layout_width="@dimen/find_icon_with"
-                        android:layout_height="@dimen/find_icon_with"
-                        android:layout_marginTop="@dimen/find_game_top"
-                        android:src="@drawable/loading_01" />
-
-                    <TextView
-                        android:id="@+id/find_game_name_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/find_game_top2"
-                        android:text="@string/app_name"
-                        android:textColor="@color/title"
-                        android:textSize="16sp" />
-
-                    <LinearLayout
-                        android:id="@+id/ll_game_tag"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/find_game_top3"
-                        android:layout_centerHorizontal="true"
-                        android:orientation="horizontal"/>
-
-                    <TextView
-                        android:id="@+id/find_game_info_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="190dp"
-                        android:gravity="center"
-                        android:layout_centerHorizontal="true"
-                        android:text="厂商：网易 | 版本号：7.9"
-                        android:textColor="@color/black_666666"
-                        android:textSize="12sp" />
-
-                    <android.support.v7.widget.AppCompatRatingBar
-                        android:id="@+id/find_game_xin"
-                        style="@style/style_rating_bar"
-                        android:layout_width="wrap_content"
-                        android:layout_marginTop="@dimen/find_game_top210"
-                        android:layout_centerHorizontal="true"
-                        android:isIndicator="true"
-                        android:numStars="5"
-                        android:rating="1.5"
-                        android:stepSize="0.5" />
-
-                    <LinearLayout
-                        android:id="@+id/welfare_gift_layout"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/find_game_top6"
-                        android:orientation="horizontal">
-                        <TextView
-                            android:id="@+id/welfare_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:padding="@dimen/content_padding_3"
-                            android:background="@mipmap/welfare_gift_img_bg"
-                            android:text="123"
-                            android:textSize="10sp"
-                            android:textColor="@color/white"/>
-                        <TextView
-                            android:id="@+id/gift_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:padding="@dimen/content_padding_3"
-                            android:background="@mipmap/welfare_gift_img_bg"
-                            android:text="礼包"
-                            android:textSize="10sp"
-                            android:layout_marginStart="@dimen/content_padding_15"
-                            android:textColor="@color/white"/>
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar_act_game_details"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:contentInsetStart="0dp"
-                    app:layout_collapseMode="pin"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                    app:title="Toolbar"
-                    app:titleTextColor="@color/white">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="?attr/actionBarSize"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingLeft="0dp">
-
-                        <ImageView
-                            android:id="@+id/img_baseactivity_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:paddingEnd="@dimen/content_padding"
-                            android:paddingStart="@dimen/content_padding"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/narrow_back_black" />
-
-                        <TextView
-                            android:id="@+id/txt_baseactivity_title"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:text="游戏标题"
-                            android:textColor="@color/black_text_deep"
-                            android:textSize="@dimen/text_size_4"/>
-
-                        <ImageView
-                            android:id="@+id/ibtn_baseactivity_right"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:paddingEnd="@dimen/content_padding"
-                            android:paddingStart="@dimen/content_padding"
-                            android:background="@color/translate"
-                            android:src="@mipmap/share"
-                            android:gravity="center"
-                            android:visibility="invisible"/>
-                    </LinearLayout>
-                </android.support.v7.widget.Toolbar>
-            </android.support.design.widget.CollapsingToolbarLayout>
-            <!--选项卡-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@color/white"
-                android:orientation="vertical">
-
-                <android.support.design.widget.TabLayout
-                    android:id="@+id/tabLayout"
-                    style="@style/style_tab"
-                    app:tabIndicatorHeight="2dp"
-                    android:layout_height="48dp"/>
-                <include layout="@layout/line_1px_hor" />
-            </LinearLayout>
-
-        </android.support.design.widget.AppBarLayout>
-
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/nestedScrollView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="48dp"
-            android:background="@color/white"
-            android:fillViewport="false"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <com.kfzs.duanduan.view.ViewPagerAutoHeigh
-                android:id="@+id/viewpager_act_game_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </android.support.v4.widget.NestedScrollView>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@color/white"
-            android:orientation="vertical">
-
-            <include layout="@layout/line_1px_hor" />
-
-            <TextView
-                android:id="@+id/find_game_down_tv"
-                style="@style/style_button"
-                android:layout_centerInParent="true"
-                android:layout_alignParentBottom="true"
-                android:text="下载" />
-        </LinearLayout>
-
-    </android.support.design.widget.CoordinatorLayout>
-</com.flipboard.bottomsheet.BottomSheetLayout>

app/src/main/res/layout/activity_edit_persional_info.xml

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/layout_title"
-        layout="@layout/title" />
-
-    <TextView
-        android:id="@+id/tv_choise_sex"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/layout_title"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:text="选择性别" />
-
-    <LinearLayout
-        android:id="@+id/llyaout_male_female"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tv_choise_sex"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal"
-        android:paddingBottom="5dp"
-        android:paddingTop="5dp">
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_male"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="30dp"
-                android:src="@mipmap/understand_sheep_b" />
-
-            <TextView
-                android:id="@+id/tv_male"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_below="@id/iv_male"
-                android:layout_marginEnd="40dp"
-                android:layout_marginTop="10dp"
-                android:text="@string/male" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_female"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginStart="30dp"
-                android:src="@mipmap/understand_sheep_b" />
-
-            <TextView
-                android:id="@+id/tv_female"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@id/iv_female"
-                android:layout_marginStart="45dp"
-                android:layout_marginTop="10dp"
-                android:text="@string/female" />
-        </RelativeLayout>
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/rlayout_choice_birthday"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_below="@id/llyaout_male_female"
-        android:layout_marginTop="40dp">
-
-        <TextView
-            android:id="@+id/tv_birth_day"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="50dp"
-            android:text="@string/birth_day" />
-
-        <TextView
-            android:id="@+id/tv_choice_birthday"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="30dp"
-            android:layout_marginRight="20dp"
-            android:layout_toRightOf="@id/tv_birth_day"
-            android:gravity="center_vertical"
-            android:hint="@string/choice_birthday"
-            android:paddingBottom="3dp"
-            android:paddingTop="3dp" />
-
-    </RelativeLayout>
-</RelativeLayout>

app/src/main/res/layout/activity_game_details_parent.xml

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.flipboard.bottomsheet.BottomSheetLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <android.support.design.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar_act_game_details"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fitsSystemWindows="true">
-            <!--标题栏-->
-
-
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:id="@+id/toolbar_layout_act_game_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fitsSystemWindows="true"
-                app:contentScrim="?attr/colorPrimary"
-                app:expandedTitleTextAppearance="@style/TextAppearance.Design.CollapsingToolbar.Expanded"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <!--大图-->
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"
-                    android:fitsSystemWindows="true"
-                    android:gravity="center_horizontal"
-                    app:layout_scrollFlags="scroll|enterAlways">
-
-                    <ImageView
-                        android:id="@+id/img_act_game_details_bg"
-                        android:layout_width="match_parent"
-                        android:layout_height="180dp"
-                        android:background="@color/backColor"
-                        android:scaleType="centerCrop" />
-
-                    <ImageView
-                        android:id="@+id/img_act_game_details_logo"
-                        android:layout_width="@dimen/app_icon_wh_height_big"
-                        android:layout_height="@dimen/app_icon_wh_height_big"
-                        android:layout_below="@id/img_act_game_details_bg"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="-45dp" />
-
-                    <TextView
-                        android:id="@+id/txt_act_game_details_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/img_act_game_details_logo"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="4dp"
-                        android:text="游戏名字"
-                        android:textSize="@dimen/app_size_tv_mid" />
-
-
-                    <TextView
-                        android:id="@+id/txt_act_game_details_types"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/txt_act_game_details_name"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="4dp"
-                        android:text="分类1|分类2"
-                        android:textSize="@dimen/app_size_tv_small" />
-
-                    <LinearLayout
-                        android:id="@+id/dingwei1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/txt_act_game_details_types"
-                        android:layout_marginBottom="4dp"
-                        android:layout_marginTop="4dp"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <RatingBar
-                            android:id="@+id/ratb_act_game_details"
-                            style="?star_style"
-                            android:layout_width="wrap_content"
-                            android:isIndicator="true"
-                            android:numStars="5"
-                            android:rating="0" />
-
-                        <TextView
-                            android:id="@+id/txt_act_game_details_downcount"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="4dp" />
-                    </LinearLayout>
-                </RelativeLayout>
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar_act_game_details"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:contentInsetStart="0dp"
-                    app:layout_collapseMode="pin"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                    app:title="Toolbar"
-                    app:titleTextColor="@color/white">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="?attr/actionBarSize"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingLeft="0dp">
-
-                        <ImageView
-                            android:id="@+id/img_back"
-                            android:layout_width="48dp"
-                            android:layout_height="match_parent"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/back2" />
-
-                        <TextView
-                            android:id="@+id/txt_act_game_details_title"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:text="游戏标题"
-                            android:textColor="@color/B"
-                            android:textSize="18sp" />
-
-                        <ImageView
-                            android:id="@+id/img_share"
-                            android:layout_width="48dp"
-                            android:layout_height="match_parent"
-                            android:padding="@dimen/about_text_margin_10"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/share2"
-                            android:visibility="invisible"/>
-                    </LinearLayout>
-                </android.support.v7.widget.Toolbar>
-            </android.support.design.widget.CollapsingToolbarLayout>
-            <!--选项卡-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@color/white"
-                android:orientation="horizontal">
-
-                <android.support.design.widget.TabLayout
-                    android:id="@+id/tabLayout"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:background="@color/white"
-                    app:tabGravity="fill"
-                    app:tabIndicatorColor="?attr/main_color"
-                    app:tabIndicatorHeight="3dp"
-                    app:tabMode="fixed"
-                    app:tabSelectedTextColor="?attr/main_color"
-                    app:tabTextAppearance="@style/TablLayoutTextStyle"
-                    app:tabTextColor="@color/B" />
-            </LinearLayout>
-
-            <include layout="@layout/line_1px_hor" />
-        </android.support.design.widget.AppBarLayout>
-
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/nestedScrollView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="48dp"
-            android:background="@color/white"
-            android:fillViewport="false"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <com.kfzs.duanduan.view.ViewPagerAutoHeigh
-                android:id="@+id/viewpager_act_game_details"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </android.support.v4.widget.NestedScrollView>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@color/white"
-            android:orientation="vertical">
-
-            <include layout="@layout/line_1px_hor" />
-
-            <com.kfzs.duanduan.view.KFProgressButton
-                android:id="@+id/downbtn_frg_fgt_app_detail_install"
-                style="?small.button"
-                android:layout_width="match_parent"
-                android:layout_height="38dip"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="5dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/install"
-                android:textSize="@dimen/app_size_tv_small" />
-        </LinearLayout>
-
-    </android.support.design.widget.CoordinatorLayout>
-</com.flipboard.bottomsheet.BottomSheetLayout>