[修改]优化

app/build.gradle

@@ -15,7 +15,7 @@ android {
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
-            abiFilters "armeabi-v7a"//, 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+            abiFilters "armeabi-v7a"//,"arm64-v8a",, 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
 //        jackOptions {
 //            enabled true
@@ -47,7 +47,7 @@ android {
 
     dexOptions {
         preDexLibraries = false
-        javaMaxHeapSize "4g"
+        javaMaxHeapSize "6g"
     }
 
     packagingOptions {

app/proguard-rules.pro

@@ -73,6 +73,314 @@
 -dontwarn dalvik.**
 -dontwarn com.tencent.smtt.**
 
+#-optimizationpasses 7 HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+#-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+-dontoptimize
+-dontusemixedcaseclassnames
+-verbose
+-dontskipnonpubliclibraryclasses
+-dontskipnonpubliclibraryclassmembers
+-dontwarn dalvik.**
+-dontwarn com.tencent.smtt.**
+#-overloadaggressively
+
+# ------------------ Keep LineNumbers and properties ---------------- #
+-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
+# --------------------------------------------------------------------------
+
+# Addidional for x5.sdk classes for apps
+
+-keep class com.tencent.smtt.export.external.**{
+    *;
+}
+
+-keep class com.tencent.tbs.video.interfaces.IUserStateChangedListener {
+	*;
+}
+
+-keep class com.tencent.smtt.sdk.CacheManager {
+	public *;
+}
+
+-keep class com.tencent.smtt.sdk.CookieManager {
+	public *;
+}
+
+-keep class com.tencent.smtt.sdk.WebHistoryItem {
+	public *;
+}
+
+-keep class com.tencent.smtt.sdk.WebViewDatabase {
+	public *;
+}
+
+-keep class com.tencent.smtt.sdk.WebBackForwardList {
+	public *;
+}
+
+-keep public class com.tencent.smtt.sdk.WebView {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebView$HitTestResult {
+	public static final <fields>;
+	public java.lang.String getExtra();
+	public int getType();
+}
+
+-keep public class com.tencent.smtt.sdk.WebView$WebViewTransport {
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebView$PictureListener {
+	public <fields>;
+	public <methods>;
+}
+
+
+-keepattributes InnerClasses
+
+-keep public enum com.tencent.smtt.sdk.WebSettings$** {
+    *;
+}
+
+-keep public enum com.tencent.smtt.sdk.QbSdk$** {
+    *;
+}
+
+-keep public class com.tencent.smtt.sdk.WebSettings {
+    public *;
+}
+
+
+-keepattributes Signature
+-keep public class com.tencent.smtt.sdk.ValueCallback {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebViewClient {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.DownloadListener {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebChromeClient {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebChromeClient$FileChooserParams {
+	public <fields>;
+	public <methods>;
+}
+
+-keep class com.tencent.smtt.sdk.SystemWebChromeClient{
+	public *;
+}
+# 1. extension interfaces should be apparent
+-keep public class com.tencent.smtt.export.external.extension.interfaces.* {
+	public protected *;
+}
+
+# 2. interfaces should be apparent
+-keep public class com.tencent.smtt.export.external.interfaces.* {
+	public protected *;
+}
+
+-keep public class com.tencent.smtt.sdk.WebViewCallbackClient {
+	public protected *;
+}
+
+-keep public class com.tencent.smtt.sdk.WebStorage$QuotaUpdater {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebIconDatabase {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.WebStorage {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.DownloadListener {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.QbSdk {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.QbSdk$PreInitCallback {
+	public <fields>;
+	public <methods>;
+}
+-keep public class com.tencent.smtt.sdk.CookieSyncManager {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.Tbs* {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.utils.LogFileUtils {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.utils.TbsLog {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.utils.TbsLogClient {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.CookieSyncManager {
+	public <fields>;
+	public <methods>;
+}
+
+# Added for game demos
+-keep public class com.tencent.smtt.sdk.TBSGamePlayer {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.TBSGamePlayerClient* {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.TBSGamePlayerClientExtension {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.TBSGamePlayerService* {
+	public <fields>;
+	public <methods>;
+}
+
+-keep public class com.tencent.smtt.utils.Apn {
+	public <fields>;
+	public <methods>;
+}
+-keep class com.tencent.smtt.** {
+	*;
+}
+# end
+
+
+-keep public class com.tencent.smtt.export.external.extension.proxy.ProxyWebViewClientExtension {
+	public <fields>;
+	public <methods>;
+}
+
+-keep class MTT.ThirdAppInfoNew {
+	*;
+}
+
+-keep class com.tencent.mtt.MttTraceEvent {
+	*;
+}
+
+# Game related
+-keep public class com.tencent.smtt.gamesdk.* {
+	public protected *;
+}
+
+-keep public class com.tencent.smtt.sdk.TBSGameBooter {
+        public <fields>;
+        public <methods>;
+}
+
+-keep public class com.tencent.smtt.sdk.TBSGameBaseActivity {
+	public protected *;
+}
+
+-keep public class com.tencent.smtt.sdk.TBSGameBaseActivityProxy {
+	public protected *;
+}
+
+-keep public class com.tencent.smtt.gamesdk.internal.TBSGameServiceClient {
+	public *;
+}
+#---------------------------------------------------------------------------
+
+
+#------------------  下方是android平台自带的排除项，这里不要动         ----------------
+
+-keep public class * extends android.app.Activity{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Application
+{
+	public <fields>;
+	public <methods>;
+}
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+	public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepattributes *Annotation*
+
+-keepclasseswithmembernames class *{
+	native <methods>;
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+#------------------  下方是共性的排除项目         ----------------
+# 方法名中含有“JNI”字符的，认定是Java Native Interface方法，自动排除
+# 方法名中含有“JRI”字符的，认定是Java Reflection Interface方法，自动排除
+
+-keepclasseswithmembers class * {
+    ... *JNI*(...);
+}
+
+-keepclasseswithmembernames class * {
+	... *JRI*(...);
+}
+
+-keep class **JNI* {*;}
+
+
+
+
 -keep class com.tencent.smtt.** {
     *;
 }

app/src/main/AndroidManifest.xml

@@ -60,7 +60,7 @@
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:largeHeap="true"
-            android:hardwareAccelerated="true"
+            android:hardwareAccelerated="false"
             android:networkSecurityConfig="@xml/network_security_config"
             android:persistent="true"
             android:supportsRtl="true"

app/src/main/java/com/sheep/gamegroup/module/login/AccountConsistenceAct.java

@@ -76,8 +76,8 @@ public class AccountConsistenceAct extends BaseActivity {
 
     private void checkSdkUser(String gameToken, boolean needAsk) {
         SdkLoginUser user = DDProviderHelper.getInstance().getSdkLoginUser(gameToken);
-        gameCode = user.getInvitation_code();
         if (user != null) {
+            gameCode = user.getInvitation_code();
             getUserInfo(user.getToken(), needAsk);
         } else {
             getUserInfo(gameToken, needAsk);

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -23,7 +23,6 @@ import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
-import com.google.gson.Gson;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.dateview.DateUtil;
 import com.sheep.gamegroup.event.WXLoginAuthEvent;
@@ -108,7 +107,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
     public void initView() {
         //mWebView = new WebView(SheepApp.getInstance());
-        mWebView = new WebView(getActivity());
+        mWebView = new WebView(SheepApp.getInstance());
         //getSavedCookies();
         webContainer.addView(mWebView, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         //ViewUtil.setImage(act_web_loading_iv, R.drawable.gif_sheep_loading);
@@ -122,12 +121,10 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
         if (webParams.getTitle().equals("游戏")) {
             //不显示系统的标题栏
-            getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
 
         String url = webParams.getUrl();
-        Log.d("访问前的Cookie 5", "-- " + CookieManager.getInstance().getCookie(Uri.parse(url).getHost()));
         String jsUrl = webParams.getJsUrl();
         if (!TextUtils.isEmpty(url)) {
             url = url.trim();

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

@@ -666,10 +666,10 @@ public class ViewUtil {
 
     /**
      * @param mActivity  ，个人资料Activity
-     * @param viewAnchor ，锚
+     * @param parentView ，锚
      *                   选择性别弹窗
      */
-    public static void choiceSex(final PersonalInfoAct mActivity, View viewAnchor) {
+    public static void choiceSex(final PersonalInfoAct mActivity, View parentView) {
         View view = LayoutInflater.from(mActivity).inflate(R.layout.pop_choice_sex, null);
         TextView tvOk = view.findViewById(R.id.tv_cancel);
         final CheckBox cbMale = view.findViewById(R.id.btn_male);
@@ -684,9 +684,9 @@ public class ViewUtil {
         popupWindow.setTouchable(true);
         popupWindow.setFocusable(true);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        backgroundAlpha(0.5f, mActivity);
+        //backgroundAlpha(0.5f, mActivity);
         try {
-            popupWindow.showAtLocation(viewAnchor, Gravity.BOTTOM, 0, 0);
+            popupWindow.showAtLocation(parentView, Gravity.BOTTOM, 0, 0);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -17,7 +17,6 @@ import android.widget.*;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
@@ -37,23 +36,9 @@ import com.sheep.gamegroup.model.util.ShowRedDot;
 import com.sheep.gamegroup.module.home.fragment.FgtMainHeader;
 import com.sheep.gamegroup.module.qrcode.QRCodeCaptureHelper;
 import com.sheep.gamegroup.module.task.fragments.VideoTaskDialogUtil;
-import com.sheep.gamegroup.util.ActionUtil;
-import com.sheep.gamegroup.util.ChannelContent;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.Constant;
-import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.DownloadUtil;
-import com.sheep.gamegroup.util.GsonUtils;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.MainTab;
-import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.*;
 import com.sheep.gamegroup.util.upfile.UpFileListener;
 import com.sheep.gamegroup.util.upfile.UpFileUtils;
-import com.sheep.gamegroup.view.customview.TouchFrameLayout;
 import com.sheep.gamegroup.view.dialog.DialogGameOrTaskOrGift;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -62,16 +47,11 @@ import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.youmi.android.offer.BaseActYmPermissionCheck;
-import io.reactivex.Completable;
-import io.reactivex.functions.Action;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -100,7 +80,7 @@ public class ActMain extends BaseActYmPermissionCheck {
     public static final String FIRST_SHOW_MAIN = "first_show_main";//是否是第一次显示主页
 
     @BindView(R.id.frame_container)
-    TouchFrameLayout frame_container;
+    FrameLayout frame_container;
     @BindView(R.id.tab_container)
     LinearLayout tab_container;
     @BindView(R.id.main_layout)
@@ -187,7 +167,7 @@ public class ActMain extends BaseActYmPermissionCheck {
 
         tabBtn1 = new WeakReference<>(findViewById(R.id.tab_1));
         tabBtn2 = new WeakReference<>(findViewById(R.id.tab_3));
-        frame_container.setHookView(main_header);
+        //frame_container.setHookView(main_header); todo
 
 
 //        final LottieAnimationView animView = findViewById(R.id.test_anim_view);
@@ -370,7 +350,7 @@ public class ActMain extends BaseActYmPermissionCheck {
     }
 
     public void switchFragment(int position) {
-        frame_container.moveHook(position == 1 ? -1 : 1);
+        //frame_container.moveHook(position == 1 ? -1 : 1); todo
         View lastTab = ListUtil.getItem(tabs, lastPosition);
         View curTab = ListUtil.getItem(tabs, position);
         if (lastTab != null) {

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

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -65,6 +66,8 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME;
 public class PersonalInfoAct extends AbsChooseImageActivity {
 
     UserEntity userEntity;
+    @BindView(R.id.fl_root)
+    FrameLayout flRoot;
     @BindView(R.id.personal_info_name)
     TextView personal_info_name;
     @BindView(R.id.personal_info_loginname)
@@ -204,7 +207,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     @OnClick({R.id.personal_info_avatar_container, R.id.personal_info_name_container, R.id.personal_info_qr_container,
             R.id.personal_info_phone_container, R.id.personal_info_bind_tx_ali_container,
             R.id.personal_info_bind_qq_container, R.id.personal_info_bind_wx_container,
-            R.id.personal_info_authentication_container, R.id.llayout_birthday,
+            R.id.personal_info_authentication_container, R.id.llayout_birthday, R.id.llayout_sex,
             R.id.personal_info_loginname_container, R.id.personal_info_addr_container})
 
     public void onClick(View view) {
@@ -213,9 +216,9 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             return;
         }
         switch (view.getId()) {
-//            case R.id.llayout_sex://用户性别
-//                ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
-//                break;
+            case R.id.llayout_sex://用户性别
+                ViewUtil.choiceSex(PersonalInfoAct.this, flRoot);
+                break;
             case R.id.llayout_birthday://用户生日
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday, TextUtils.isEmpty(userEntity.getBirthday()) ? "1990-01-01" : userEntity.getBirthday());
                 break;

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

@@ -13,7 +13,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.*;
 import com.bumptech.glide.Glide;
@@ -38,7 +37,6 @@ import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.helper.AdHelper;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -103,7 +101,6 @@ public class SplashAct extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Log.d("!!!!!!", "初始化Splash");
         hideSystemStatusBar();
         hideSystemNavBar();
 
@@ -119,28 +116,24 @@ public class SplashAct extends BaseActivity {
             ApiJSONUtil.postUserDeviceLog();
         }
         if (requestPermissions()) {
-            Log.d("!!!!!!", "有权限，去init");
             init();
         }
     }
 
     private void init() {
         if (SysAppUtil.isNotSupport(this)) return;
-        Log.d("!!!!!!", "开始init");
         SheepApp.getInstance().getNetComponent().getApiService().checkUserFirst()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .onErrorResumeNext(new Observable<BaseMessage>() {
                     @Override
                     protected void subscribeActual(Observer<? super BaseMessage> observer) {
-                        Log.d("!!!!!!", "访问UserFirst出错");
                         //访问出错时，认为不是新设备
                         BaseMessage defaultBaseMessage = new BaseMessage();
                         defaultBaseMessage.setData(false);
                         observer.onNext(defaultBaseMessage);
                     }
                 })
-                .doOnSubscribe(disposable -> Log.d("!!!!!!", "开始CheckUserFirst"))
                 .doOnNext(baseMessage -> {
                     //是否为新设备
                     boolean isNewSmallSheep = baseMessage.getData(Boolean.class);
@@ -150,22 +143,17 @@ public class SplashAct extends BaseActivity {
                         });//只更新，不加载
                         sendHandlerMessages(2000);
                     } else {
-                        Log.d("!!!!!!", "开始拉广告");
                         //拉一次广告，并加载
                         fetchAdvertisement(() -> {
                             if (ad != null) {
-                                Log.d("!!!!!!", "拉到广告，不为空");
                                 if (ad.getAd_type() == AD_TYPE_SHEEP) {
-                                    Log.d("!!!!!!", "进入自己的广告");
                                     //是自己的广告，展示自己的广告
                                     loadSheepAdvertising();
                                 } else {
-                                    Log.d("!!!!!!", "进入SDK的广告");
                                     //SDK的广告，展示SDK的广告，并拉取一次广告并保存
                                     initSdkAdvertising(ad.getAd_type());
                                 }
                             } else {
-                                Log.d("!!!!!!", "拉到广告，为空");
                                 sendHandlerMessages(2000);
                             }
                         });
@@ -178,17 +166,13 @@ public class SplashAct extends BaseActivity {
      * 加载SDK的广告
      */
     private void initSdkAdvertising(int adType) {
-        Log.d("!!!!!!", String.valueOf(adType));
         if (adType == AD_SPLASH_TYPE_YKY) {
-            Log.d("!!!!!!", "加载游可盈广告");
             //游可盈
             launchYKYSplash();
         } else if (adType == AD_SPLASH_TYPE_YT) {
-            Log.d("!!!!!!", "加载优投广告");
             //优投
             launchYTSplash();
         } else if (adType == AD_SPLASH_TYPE_ZK) {
-            Log.d("!!!!!!", "加载掌酷广告");
             //掌酷
             launchZKSplash();
         } else {
@@ -209,22 +193,16 @@ public class SplashAct extends BaseActivity {
                 new KleinResponseCallback() {
                     @Override
                     public void onSuccess(int i) {
-                        if (BuildConfig.DEBUG)
-                            Log.d("!!!!!Success", String.valueOf(i));
                     }
 
                     @Override
                     public void onFail(int i) {
-                        if (BuildConfig.DEBUG)
-                            Log.d("!!!!!Fail", String.valueOf(i));
                         //拉取广告错误或超时，直接跳过
                         sendHandlerMessages(0);
                     }
 
                     @Override
                     public void onEvent(int i) {
-                        if (BuildConfig.DEBUG)
-                            Log.d("!!!!!Event", String.valueOf(i));
                         switch (i) {
                             case KLSplashAdEvent_AdShowSucc:
                                 if (!aded && ad != null) {
@@ -253,26 +231,22 @@ public class SplashAct extends BaseActivity {
         new SplashEngine(SplashAct.this, false, new SplashEngine.SplashAdCallBack() {
             @Override
             public void onSplashClick() {
-                Log.i("jasmine-ad", "点击广告");
                 AdHelper.stat(ad.getAd_id(), 2, ad.getAd_type());
                 //sendHandlerMessages(0);
             }
 
             @Override
             public void onSplashDismissed() {
-                Log.i("jasmine-ad", "广告关闭");
                 next();
             }
 
             @Override
             public void onSplashError(String err, boolean isTimeout) {
-                Log.i("jasmine-ad", "展示广告异常:" + err);
                 next();
             }
 
             @Override
             public void onSplashShow() {
-                Log.i("jasmine-ad", "展示广告");
                 yt_splash_skip_view.setVisibility(View.VISIBLE);
                 if (!aded && ad != null) {
                     AdHelper.stat(ad.getAd_id(), 1, ad.getAd_type());
@@ -284,14 +258,13 @@ public class SplashAct extends BaseActivity {
 
             @Override
             public void onSplashPresent() {
-                Log.i("jasmine-ad", "广告数据加载");
                 if (splash_image_view != null)
                     splash_image_view.setVisibility(View.GONE); // 广告展示后一定要把预设的开屏图片隐藏起来
             }
 
             @Override
             public void onSplashLoad() {
-                Log.i("Jasmine-ad", "拉取广告");
+
             }
 
         }).launchSplash(flSplashYT, 5 * 1000);
@@ -303,7 +276,7 @@ public class SplashAct extends BaseActivity {
         LySdk.loadSplashAd(this, new LySplashAdBuilder(zk_root, ad.getThird_ad_id()), new ISplashAdLoadCallback() {
             @Override
             public void onFailed(int i, String s) {
-                Log.d("!!!!掌酷开屏广告加载失败", s);
+
             }
 
             @Override
@@ -328,7 +301,6 @@ public class SplashAct extends BaseActivity {
 
                         @Override
                         public void onAdShow() {
-                            Log.d("!!!!!!", "掌酷show");
                             if (!aded && ad != null) {
                                 AdHelper.stat(ad.getAd_id(), 1, ad.getAd_type());
                                 aded = true;
@@ -371,7 +343,6 @@ public class SplashAct extends BaseActivity {
     //从服务端拉取广告信息
     private void fetchAdvertisement(Action action) {
         CommonUtil.getInstance().refreshAds((ret, list) -> {
-            Log.d("!!!!!!", "拉了一次广告");
             if (ret) {
                 ad = DDProviderHelper.getInstance().getSheepAd(SheepAd.FORM_SPLASH);
                 try {
@@ -533,7 +504,6 @@ public class SplashAct extends BaseActivity {
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if (requestCode == 1111 && requestPermissions()) {
-            Log.d("!!!!!!", "权限回调，requestCode" + requestCode);
             init();
         }
     }

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

@@ -74,7 +74,7 @@ public class TryMakeMoneyact extends BaseActivity {
                 .setShowOrHide(this, true)
                 .setRightSecondBtn(activity, R.mipmap.question_black_img, view -> ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
                         .setMsg(getString(R.string.cash_task_and_share_friend_benefit))))
-                .setRightImgBotton(activity, R.drawable.index_download, view -> Jump2View.getInstance().goActDownloadManager(this));
+                .setRightImgBotton(activity, R.drawable.xiazai_hei, view -> Jump2View.getInstance().goActDownloadManager(this));
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
         mAdapter.add(FgtTryMakeMoney.newInstance(0, 0), "普通任务");

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

@@ -44,14 +44,14 @@ public class WebviewAct extends BaseActivity {
     @Override
     public void initView() {
         webviewEntity = (WebviewEntity) getIntent().getSerializableExtra("webview_entity");
-        if(webviewEntity == null){
+        if (webviewEntity == null) {
             return;
         }
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitleFinish(this)
                 .setTitle(this,
-                        TextUtils.isEmpty(webviewEntity.getTitle()) ?"专属福利":webviewEntity.getTitle());
+                        TextUtils.isEmpty(webviewEntity.getTitle()) ? "专属福利" : webviewEntity.getTitle());
 
         WebSettings webSettings = activityWebview.getSettings();
 
@@ -63,9 +63,7 @@ public class WebviewAct extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         //设置编码方式
         webSettings.setDefaultTextEncodingName("utf-8");
-//        activityWebview.setWebChromeClient(new chromClient());
-
-
+        //activityWebview.setWebChromeClient(new chromClient());
 
         activityWebview.setWebViewClient(new WebViewClient() {
             @Override
@@ -75,20 +73,21 @@ public class WebviewAct extends BaseActivity {
             }
         });
     }
+
     private class chromClient extends WebChromeClient {
         @Override
         public void onProgressChanged(WebView view, int newProgress) {
-            if(newProgress==100){
+            if (newProgress == 100) {
                 //页面加载完成执行的操作
-                String path= "file:///android_asset/" + "home_sheep_main_img.png";
-                String action="javascript:imgpath('"+path+"')";
+                String path = "file:///android_asset/" + "home_sheep_main_img.png";
+                String action = "javascript:imgpath('" + path + "')";
                 runWebView(action);
             }
             super.onProgressChanged(view, newProgress);
         }
     }
 
-    private void runWebView(final String url){
+    private void runWebView(final String url) {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -105,15 +104,15 @@ public class WebviewAct extends BaseActivity {
     @Override
     public void initData() {
         //封装头文件
-        final String sHead=   "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
-                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />"+
+        final String sHead = "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
+                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />" +
                 "<style>img{max-width:100% !important;height:auto !important;}</style>"
-                +"<style>body{max-width:100% !important;}</style>"+"</head><body>";
-        switch (webviewEntity.getType()){
+                + "<style>body{max-width:100% !important;}</style>" + "</head><body>";
+        switch (webviewEntity.getType()) {
             case 0:
             default:
                 title_name_tv.setVisibility(View.GONE);
-                activityWebview.loadUrl(webviewEntity.getUrl()+"");
+                activityWebview.loadUrl(webviewEntity.getUrl() + "");
                 break;
             case 1://关于我们
                 showProgress(true);
@@ -134,9 +133,9 @@ public class WebviewAct extends BaseActivity {
                             public void onNext(BaseMessage baseMessage) {
                                 hideProgress();
                                 AboutUsEntity aboutUsEntity = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), AboutUsEntity.class);
-                                if(aboutUsEntity != null){
+                                if (aboutUsEntity != null) {
                                     title_name_tv.setVisibility(View.VISIBLE);
-                                    title_name_tv.setText(aboutUsEntity.getTitle()+"");
+                                    title_name_tv.setText(aboutUsEntity.getTitle() + "");
                                     activityWebview.loadDataWithBaseURL(
                                             null,
                                             sHead + aboutUsEntity.getContent() + "</body></html>",
@@ -155,7 +154,7 @@ public class WebviewAct extends BaseActivity {
 
     @Override
     protected void onDestroy() {
-        if(activityWebview != null){
+        if (activityWebview != null) {
             activityWebview.destroy();
         }
         super.onDestroy();

app/src/main/java/com/sheep/gamegroup/view/customview/TouchFrameLayout.java

@@ -4,18 +4,12 @@ import android.content.Context;
 import android.support.constraint.ConstraintLayout;
 import android.support.v4.view.MotionEventCompat;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
-
 import com.kfzs.duanduan.cardview.ScreenUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.jiuyan.samllsheep.R;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -65,8 +65,10 @@ import com.youmi.android.offer.YmConfig;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import org.xutils.x;
+
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
+
 import cn.jpush.android.api.JPushInterface;
 import io.reactivex.plugins.RxJavaPlugins;
 import ren.yale.android.cachewebviewlib.WebViewCacheInterceptor;
@@ -95,70 +97,6 @@ public class SheepApp extends MultiDexApplication {
     private String wlan;
     private boolean needFace;
 
-    public boolean isGameFlag() {
-        return gameFlag;
-    }
-
-    public void setGameFlag(boolean gameFlag) {
-        this.gameFlag = gameFlag;
-    }
-
-    public String getGamePackgeName() {
-        return gamePackgeName;
-    }
-
-    public void setGamePackgeName(String gamePackgeName) {
-        this.gamePackgeName = gamePackgeName;
-    }
-
-    public String getGameId() {
-        return gameId;
-    }
-
-    public void setGameId(String gameId) {
-        this.gameId = gameId;
-    }
-
-    public String getGameCode() {
-        return gameCode;
-    }
-
-    public void setGameCode(String gameCode) {
-        this.gameCode = gameCode;
-    }
-
-    public String getWlan() {
-        return wlan;
-    }
-
-    public void setWlan(String wlan) {
-        this.wlan = wlan;
-    }
-
-    public boolean isNeedFace() {
-        return needFace;
-    }
-
-    public void setNeedFace(boolean needFace) {
-        this.needFace = needFace;
-    }
-
-    public boolean isInitMidong() {
-        return isInitMidong;
-    }
-
-    public void setInitMidong(boolean initMidong) {
-        isInitMidong = initMidong;
-    }
-
-    public boolean isShowQB() {
-        return isShowQB;
-    }
-
-    public void setShowQB(boolean showQB) {
-        isShowQB = showQB;
-    }
-
     public void clearGameAuthData() {
         gameId = null;
         gameCode = null;
@@ -179,7 +117,7 @@ public class SheepApp extends MultiDexApplication {
                 activityRef.get().finish();
             }
             quit();
-//            System.exit(0);
+            //System.exit(0);
         } else {
             G.showToast("已经是该服务器");
         }
@@ -189,7 +127,6 @@ public class SheepApp extends MultiDexApplication {
     public void onCreate() {
 //        configStrictMode();
         super.onCreate();
-        Log.d("!!!!!!", "初始化APP");
         SharedPreferencesUtil.getInstance(this, "cache");
         mSheepApp = this;
         connectAddress = ConnectAddress.sheep.getDefaultConnectAddress();
@@ -251,9 +188,6 @@ public class SheepApp extends MultiDexApplication {
     public static void initWebViewDataDirectory(Context context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             String processName = getProcessName();
-            Log.d("！！！大的进程名", context.getPackageName());
-            Log.d("！！！当前的进程名", processName);
-
             if (!context.getPackageName().equals(processName)) {//判断是否是默认进程名称
                 WebView.setDataDirectorySuffix(processName);
                 android.webkit.WebView.setDataDirectorySuffix(processName);
@@ -435,6 +369,13 @@ public class SheepApp extends MultiDexApplication {
         } else {
             G.BAR_HEIGHT = (int) (25 * metric.density);//不准确的方法
         }
+
+        // 在调用TBS初始化、创建WebView之前进行如下配置
+        HashMap map = new HashMap();
+        map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
+        map.put(TbsCoreSettings.TBS_SETTINGS_USE_DEXLOADER_SERVICE, true);
+        QbSdk.initTbsSettings(map);
+
         /*QbSdk.initX5Environment(this, new QbSdk.PreInitCallback() {
             @Override
             public void onCoreInitFinished() {
@@ -448,12 +389,6 @@ public class SheepApp extends MultiDexApplication {
             }
         });*/
 
-        // 在调用TBS初始化、创建WebView之前进行如下配置
-        HashMap map = new HashMap();
-        map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
-        map.put(TbsCoreSettings.TBS_SETTINGS_USE_DEXLOADER_SERVICE, true);
-        QbSdk.initTbsSettings(map);
-
         x.Ext.init(this);
         x.Ext.setDebug(org.xutils.BuildConfig.DEBUG); // 是否输出debug日志, 开启debug会影响性能.
 
@@ -525,63 +460,67 @@ public class SheepApp extends MultiDexApplication {
     private void initBdLocationOption() {
         mLocationClient = new LocationClient(getApplicationContext());
         //声明LocationClient类
-        mLocationClient.registerLocationListener(myListener);
+        mLocationClient.registerLocationListener(locationListener);
         //注册监听函数
 
         LocationClientOption option = new LocationClientOption();
         //经纬度
         option.setLocationMode(LocationClientOption.LocationMode.Battery_Saving);
-//可选，设置定位模式，默认高精度
-//LocationMode.Hight_Accuracy：高精度；
-//LocationMode. Battery_Saving：低功耗；
-//LocationMode. Device_Sensors：仅使用设备；
+        //可选，设置定位模式，默认高精度
+        //LocationMode.Hight_Accuracy：高精度；
+        //LocationMode. Battery_Saving：低功耗；
+        //LocationMode. Device_Sensors：仅使用设备；
         option.setCoorType("bd09ll");
-//可选，设置返回经纬度坐标类型，默认gcj02
-//gcj02：国测局坐标；
-//bd09ll：百度经纬度坐标；
-//bd09：百度墨卡托坐标；
-//海外地区定位，无需设置坐标类型，统一返回wgs84类型坐标
+        //可选，设置返回经纬度坐标类型，默认gcj02
+        //gcj02：国测局坐标；
+        //bd09ll：百度经纬度坐标；
+        //bd09：百度墨卡托坐标；
+        //海外地区定位，无需设置坐标类型，统一返回wgs84类型坐标
 
         option.setScanSpan(0);
-//可选，设置发起定位请求的间隔，int类型，单位ms
-//如果设置为0，则代表单次定位，即仅定位一次，默认为0
-//如果设置非0，需设置1000ms以上才有效
+        //可选，设置发起定位请求的间隔，int类型，单位ms
+        //如果设置为0，则代表单次定位，即仅定位一次，默认为0
+        //如果设置非0，需设置1000ms以上才有效
 
         option.setOpenGps(false);
-//可选，设置是否使用gps，默认false
-//使用高精度和仅用设备两种定位模式的，参数必须设置为true
+        //可选，设置是否使用gps，默认false
+        //使用高精度和仅用设备两种定位模式的，参数必须设置为true
 
         option.setLocationNotify(true);
-//可选，设置是否当GPS有效时按照1S/1次频率输出GPS结果，默认false
+        //可选，设置是否当GPS有效时按照1S/1次频率输出GPS结果，默认false
 
         option.setIgnoreKillProcess(false);
-//可选，定位SDK内部是一个service，并放到了独立进程。
-//设置是否在stop的时候杀死这个进程，默认（建议）不杀死，即setIgnoreKillProcess(true)
+        //可选，定位SDK内部是一个service，并放到了独立进程。
+        //设置是否在stop的时候杀死这个进程，默认（建议）不杀死，即setIgnoreKillProcess(true)
 
+        //可选，设置是否收集Crash信息，默认收集，即参数为false
         option.SetIgnoreCacheException(true);
-//可选，设置是否收集Crash信息，默认收集，即参数为false
 
+        //可选，7.2版本新增能力
+        //如果设置了该接口，首次启动定位时，会先判断当前WiFi是否超出有效期，若超出有效期，会先重新扫描WiFi，然后定位
         option.setWifiCacheTimeOut(5 * 60 * 1000);
-//可选，7.2版本新增能力
-//如果设置了该接口，首次启动定位时，会先判断当前WiFi是否超出有效期，若超出有效期，会先重新扫描WiFi，然后定位
 
+
+        //可选，设置是否需要过滤GPS仿真结果，默认需要，即参数为false
         option.setEnableSimulateGps(false);
-//可选，设置是否需要过滤GPS仿真结果，默认需要，即参数为false
+
 
         //地址
+        //可选，是否需要地址信息，默认为不需要，即参数为false
+        //如果开发者需要获得当前点的地址信息，此处必须为true
         option.setIsNeedAddress(true);
-//可选，是否需要地址信息，默认为不需要，即参数为false
-//如果开发者需要获得当前点的地址信息，此处必须为true
 
+        //mLocationClient为第二步初始化过的LocationClient对象
+        //需将配置好的LocationClientOption对象，通过setLocOption方法传递给LocationClient对象使用
+        //更多LocationClientOption的配置，请参照类参考中LocationClientOption类的详细说明
         mLocationClient.setLocOption(option);
-//mLocationClient为第二步初始化过的LocationClient对象
-//需将配置好的LocationClientOption对象，通过setLocOption方法传递给LocationClient对象使用
-//更多LocationClientOption的配置，请参照类参考中LocationClientOption类的详细说明
+
+
         mLocationClient.start();
     }
 
     public LocationClient mLocationClient = null;
-    private SheepLocationListener myListener = new SheepLocationListener();
+    private final SheepLocationListener locationListener = new SheepLocationListener();
 
     //BDAbstractLocationListener为7.2版本新增的Abstract类型的监听接口
     //原有BDLocationListener接口暂时同步保留。具体介绍请参考后文中的说明
@@ -768,9 +707,9 @@ public class SheepApp extends MultiDexApplication {
                 TextToSpeechUtil.stopTTS();
                 DataUtil.getInstance().resetIsNewSmallSheep();
                 stopService(new Intent(SheepApp.this, DownloadService.class));
-//                if (DataUtil.IS_LISTEN_SCREEN_SHOT) {
-//                    stopService(new Intent(activity, ListenerShotService.class));
-//                }
+                /*if (DataUtil.IS_LISTEN_SCREEN_SHOT) {
+                    stopService(new Intent(activity, ListenerShotService.class));
+                }*/
                 stopService(new Intent(SheepApp.this, AutoCheckService.class));
                 if (DataUtil.IS_USE_SCREEN_SHOT)
                     stopService(new Intent(SheepApp.this, FloatShotScreenService.class));
@@ -836,5 +775,68 @@ public class SheepApp extends MultiDexApplication {
         super.onTerminate();
     }
 
+    public boolean isGameFlag() {
+        return gameFlag;
+    }
+
+    public void setGameFlag(boolean gameFlag) {
+        this.gameFlag = gameFlag;
+    }
+
+    public String getGamePackgeName() {
+        return gamePackgeName;
+    }
+
+    public void setGamePackgeName(String gamePackgeName) {
+        this.gamePackgeName = gamePackgeName;
+    }
+
+    public String getGameId() {
+        return gameId;
+    }
+
+    public void setGameId(String gameId) {
+        this.gameId = gameId;
+    }
+
+    public String getGameCode() {
+        return gameCode;
+    }
+
+    public void setGameCode(String gameCode) {
+        this.gameCode = gameCode;
+    }
+
+    public String getWlan() {
+        return wlan;
+    }
+
+    public void setWlan(String wlan) {
+        this.wlan = wlan;
+    }
+
+    public boolean isNeedFace() {
+        return needFace;
+    }
+
+    public void setNeedFace(boolean needFace) {
+        this.needFace = needFace;
+    }
+
+    public boolean isInitMidong() {
+        return isInitMidong;
+    }
+
+    public void setInitMidong(boolean initMidong) {
+        isInitMidong = initMidong;
+    }
+
+    public boolean isShowQB() {
+        return isShowQB;
+    }
+
+    public void setShowQB(boolean showQB) {
+        isShowQB = showQB;
+    }
 
 }

app/src/main/res/layout-v21/main_frame_layout.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sheep.gamegroup.view.customview.WindowInsetsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/frame_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/frame_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false">
+        android:layout_height="match_parent">
 
     <ImageView
             android:layout_width="match_parent"
@@ -42,7 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="92dp"
             android:backgroundTint="@color/white"
-            tools:backgroundTint="@color/black"
+            tools:backgroundTint="@color/gray_F5F5F5"
             android:gravity="bottom"
             android:clipChildren="false"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sheep.gamegroup.view.customview.TouchFrameLayout
+<FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/frame_container"
         android:layout_width="match_parent"

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

@@ -1,42 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
+    <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#7D000000"
+            android:layout_weight="1"/>
 
     <CheckBox
-        android:id="@+id/btn_male"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/male"
-        android:textColor="#ff444444"
-        android:textSize="14sp"
-        android:button="@null"/>
+            android:id="@+id/btn_male"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:gravity="center"
+            android:background="@color/white"
+            android:text="@string/male"
+            android:textColor="#ff444444"
+            android:textSize="14sp"
+            android:button="@null"/>
 
-    <View style="@style/style_item_line_full" />
+    <View style="@style/style_item_line_full"/>
 
     <CheckBox
-        android:id="@+id/btn_female"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/female"
-        android:textColor="#ff444444"
-        android:textSize="14sp"
-        android:button="@null"/>
+            android:id="@+id/btn_female"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:background="@color/white"
+            android:gravity="center"
+            android:text="@string/female"
+            android:textColor="#ff444444"
+            android:textSize="14sp"
+            android:button="@null"/>
 
-    <View style="@style/style_item_line_full" />
+    <View style="@style/style_item_line_full"/>
 
     <TextView
-        android:id="@+id/tv_cancel"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/chice_sex_completed"
-        android:textColor="#ff0b71e0"
-        android:textSize="14sp"
-        android:background="#F8F8F8"/>
+            android:id="@+id/tv_cancel"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:gravity="center"
+            android:text="@string/chice_sex_completed"
+            android:textColor="#ff0b71e0"
+            android:textSize="14sp"
+            android:background="#F8F8F8"/>
 </LinearLayout>

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

@@ -1,88 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    android:background="@color/bg">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:fitsSystemWindows="true"
+              android:orientation="vertical"
+              android:background="@color/bg">
 
     <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <android.support.design.widget.TabLayout
-            android:id="@+id/indicator"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            app:tabGravity="fill"
-            app:tabIndicatorColor="#4bc1fe"
-            app:tabMode="fixed"
-            app:tabIndicatorHeight="4dp"
-            app:tabIndicatorFullWidth="false"
-            app:tabSelectedTextColor="#4bc1fe"
-            app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-            app:tabTextColor="#444444" />
+            android:layout_height="match_parent">
+
+        <android.support.design.widget.TabLayout
+                android:id="@+id/indicator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                app:tabGravity="fill"
+                app:tabIndicatorColor="#4bc1fe"
+                app:tabMode="fixed"
+                app:tabIndicatorHeight="4dp"
+                app:tabIndicatorFullWidth="false"
+                app:tabSelectedTextColor="#4bc1fe"
+                app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+                app:tabTextColor="#444444"/>
 
         <android.support.v4.view.ViewPager
-            android:id="@+id/pager"
-            android:layout_below="@+id/show_flow_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+                android:id="@+id/pager"
+                android:layout_below="@+id/show_flow_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
         <LinearLayout
-            android:id="@+id/show_flow_layout"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_below="@id/indicator"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingEnd="@dimen/content_padding_10"
-            android:paddingStart="@dimen/content_padding_10"
-            android:visibility="visible">
+                android:id="@+id/show_flow_layout"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_below="@id/indicator"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingEnd="@dimen/content_padding_10"
+                android:paddingStart="@dimen/content_padding_10"
+                android:visibility="visible">
 
             <TextView
-                style="@style/style_ash_tv"
-                android:text="@string/task_flow" />
+                    style="@style/style_ash_tv"
+                    android:text="@string/task_flow"/>
             <TextView
-                style="@style/style_ash_tv"
-                android:layout_marginRight="@dimen/common_margin_10"
-                android:text=":" />
+                    style="@style/style_ash_tv"
+                    android:layout_marginRight="@dimen/common_margin_10"
+                    android:text=":"/>
 
             <TextView
-                style="@style/style_ash_num"
-                android:text="1" />
+                    style="@style/style_ash_num"
+                    android:text="1"/>
 
             <TextView
-                style="@style/style_ash_tv"
-                android:text="下载应用" />
+                    style="@style/style_ash_tv"
+                    android:text="下载应用"/>
 
             <ImageView
-                style="@style/style_ash_img"
-                android:src="@mipmap/arrow_right_img" />
+                    style="@style/style_ash_img"
+                    android:src="@mipmap/arrow_right_img"/>
             <!--<View-->
             <!--android:layout_width="6dp"-->
             <!--android:layout_height="6dp"-->
             <!--android:background="@drawable/sp_bg_circle_ash"/>-->
             <TextView
-                style="@style/style_ash_num"
-                android:text="2" />
+                    style="@style/style_ash_num"
+                    android:text="2"/>
 
             <TextView
-                style="@style/style_ash_tv"
-                android:text="试玩应用" />
+                    style="@style/style_ash_tv"
+                    android:text="试玩应用"/>
 
             <ImageView
-                style="@style/style_ash_img"
-                android:src="@mipmap/arrow_right_img" />
+                    style="@style/style_ash_img"
+                    android:src="@mipmap/arrow_right_img"/>
 
             <TextView
-                style="@style/style_ash_num"
-                android:text="3" />
+                    style="@style/style_ash_num"
+                    android:text="3"/>
 
             <TextView
-                style="@style/style_ash_tv"
-                android:text="领取奖励" />
+                    style="@style/style_ash_tv"
+                    android:text="领取奖励"/>
         </LinearLayout>
     </RelativeLayout>
 </LinearLayout>

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

@@ -1,276 +1,283 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            android:scrollbars="none"
-            android:background="@color/bg">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/fl_root"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fitsSystemWindows="true"
+                android:scrollbars="none"
+                android:background="@color/bg">
 
         <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15"
-                android:layout_marginTop="@dimen/content_padding"
-                android:background="@color/white"
+                android:layout_height="match_parent"
                 android:orientation="vertical">
 
             <LinearLayout
-                    android:id="@+id/personal_info_avatar_container"
-                    style="@style/style_item_container">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/content_padding_15"
+                    android:layout_marginTop="@dimen/content_padding"
+                    android:background="@color/white"
+                    android:orientation="vertical">
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/header"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_avatar_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/header"/>
 
-                <ImageView
-                        android:id="@+id/personal_info_avatar"
-                        android:layout_width="33dp"
-                        android:layout_height="33dp"
-                        android:src="@mipmap/icon"/>
 
-                <TextView style="@style/style_item_end_next"/>
+                    <ImageView
+                            android:id="@+id/personal_info_avatar"
+                            android:layout_width="33dp"
+                            android:layout_height="33dp"
+                            android:src="@mipmap/icon"/>
 
+                    <TextView style="@style/style_item_end_next"/>
 
-            </LinearLayout>
 
-            <View style="@style/style_item_line_3_0"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_loginname_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/loginname"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_loginname_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/loginname"/>
 
-                <TextView
-                        android:id="@+id/personal_info_loginname"
-                        style="@style/style_item_end_next"/>
 
-            </LinearLayout>
+                    <TextView
+                            android:id="@+id/personal_info_loginname"
+                            style="@style/style_item_end_next"/>
 
-            <View style="@style/style_item_line_3_0"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_name_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/niker"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_name_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/niker"/>
 
-                <TextView
-                        android:id="@+id/personal_info_name"
-                        style="@style/style_item_end_next"/>
 
-            </LinearLayout>
+                    <TextView
+                            android:id="@+id/personal_info_name"
+                            style="@style/style_item_end_next"/>
 
-            <View style="@style/style_item_line_3_0"/>
+                </LinearLayout>
 
-            <LinearLayout style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/sheep_id"/>
+                <LinearLayout style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/sheep_id"/>
 
-                <TextView
-                        android:id="@+id/personal_info_code"
-                        style="@style/style_item_end_next"
-                        android:textIsSelectable="true"/>
 
-            </LinearLayout>
+                    <TextView
+                            android:id="@+id/personal_info_code"
+                            style="@style/style_item_end_next"
+                            android:textIsSelectable="true"/>
 
-            <View style="@style/style_item_line_3_0"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/llayout_sex"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/sex"/>
+                <LinearLayout
+                        android:id="@+id/llayout_sex"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/sex"/>
 
-                <TextView
-                        android:id="@+id/tv_sex"
-                        style="@style/style_item_end_next"
-                        android:layout_width="150dp"/>
 
-            </LinearLayout>
+                    <TextView
+                            android:id="@+id/tv_sex"
+                            style="@style/style_item_end_next"
+                            android:layout_width="150dp"/>
 
-            <View style="@style/style_item_line_3_0"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/llayout_birthday"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/birth_day"/>
+                <LinearLayout
+                        android:id="@+id/llayout_birthday"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/birth_day"/>
 
-                <TextView
-                        android:id="@+id/tv_birthday"
-                        style="@style/style_item_end_next"/>
 
-            </LinearLayout>
+                    <TextView
+                            android:id="@+id/tv_birthday"
+                            style="@style/style_item_end_next"/>
 
-            <View style="@style/style_item_line_3_0"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_qr_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/my_qr"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_qr_container"
+                        style="@style/style_item_container">
 
-                <RelativeLayout
-                        android:layout_width="30dp"
-                        android:layout_height="30dp">
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/my_qr"/>
 
-                    <ImageView
-                            android:id="@+id/personal_info_qr"
-                            android:layout_width="25dp"
-                            android:layout_height="25dp"
-                            android:layout_centerInParent="true"
-                            android:background="@null"
-                            android:src="@mipmap/icon"/>
+                    <RelativeLayout
+                            android:layout_width="30dp"
+                            android:layout_height="30dp">
 
-                    <ImageView
-                            android:layout_width="5dp"
-                            android:layout_height="5dp"
-                            android:layout_centerInParent="true"
-                            android:background="@null"
-                            android:src="@mipmap/icon"/>
+                        <ImageView
+                                android:id="@+id/personal_info_qr"
+                                android:layout_width="25dp"
+                                android:layout_height="25dp"
+                                android:layout_centerInParent="true"
+                                android:background="@null"
+                                android:src="@mipmap/icon"/>
 
-                </RelativeLayout>
+                        <ImageView
+                                android:layout_width="5dp"
+                                android:layout_height="5dp"
+                                android:layout_centerInParent="true"
+                                android:background="@null"
+                                android:src="@mipmap/icon"/>
 
-                <TextView style="@style/style_item_end_next"/>
+                    </RelativeLayout>
 
-            </LinearLayout>
-        </LinearLayout>
+                    <TextView style="@style/style_item_end_next"/>
 
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:background="#f5f5f5"/>
+                </LinearLayout>
+            </LinearLayout>
 
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15"
-                android:layout_marginTop="@dimen/content_padding"
-                android:background="@color/white"
-                android:orientation="vertical">
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp"
+                    android:background="#f5f5f5"/>
 
             <LinearLayout
-                    android:id="@+id/personal_info_phone_container"
-                    style="@style/style_item_container">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/content_padding_15"
+                    android:layout_marginTop="@dimen/content_padding"
+                    android:background="@color/white"
+                    android:orientation="vertical">
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/phone"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_phone_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/phone"/>
 
-                <TextView
-                        android:id="@+id/personal_info_phone"
-                        style="@style/style_item_end_next"/>
-            </LinearLayout>
 
-            <View style="@style/style_item_line_3_0"/>
-            <LinearLayout
-                    android:id="@+id/personal_info_addr_container"
-                    style="@style/style_item_container">
+                    <TextView
+                            android:id="@+id/personal_info_phone"
+                            style="@style/style_item_end_next"/>
+                </LinearLayout>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/my_addr_info"/>
+                <View style="@style/style_item_line_3_0"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_addr_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/my_addr_info"/>
 
-                <TextView
-                        android:id="@+id/personal_info_addr"
-                        style="@style/style_item_end_next"/>
-            </LinearLayout>
 
-            <View style="@style/style_item_line_3_0"/>
+                    <TextView
+                            android:id="@+id/personal_info_addr"
+                            style="@style/style_item_end_next"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_bind_tx_ali_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/bind_tx_ali"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_bind_tx_ali_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/bind_tx_ali"/>
 
-                <TextView
-                        android:id="@+id/personal_info_bind_tx_ali"
-                        style="@style/style_item_end_next"/>
-            </LinearLayout>
 
-            <View style="@style/style_item_line_3_0"/>
+                    <TextView
+                            android:id="@+id/personal_info_bind_tx_ali"
+                            style="@style/style_item_end_next"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_bind_qq_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/bind_qq"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_bind_qq_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/bind_qq"/>
 
-                <TextView
-                        android:id="@+id/personal_info_bind_qq"
-                        style="@style/style_item_end_next"/>
-            </LinearLayout>
 
-            <View style="@style/style_item_line_3_0"/>
+                    <TextView
+                            android:id="@+id/personal_info_bind_qq"
+                            style="@style/style_item_end_next"/>
+                </LinearLayout>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_bind_wx_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/bind_wx"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_bind_wx_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/bind_wx"/>
 
-                <TextView
-                        android:id="@+id/personal_info_bind_wx"
-                        style="@style/style_item_end_next"/>
-            </LinearLayout>
 
+                    <TextView
+                            android:id="@+id/personal_info_bind_wx"
+                            style="@style/style_item_end_next"/>
+                </LinearLayout>
 
-            <View style="@style/style_item_line_3_0"/>
 
-            <LinearLayout
-                    android:id="@+id/personal_info_authentication_container"
-                    style="@style/style_item_container">
+                <View style="@style/style_item_line_3_0"/>
 
-                <TextView
-                        style="@style/style_item_label"
-                        android:text="@string/auther"/>
+                <LinearLayout
+                        android:id="@+id/personal_info_authentication_container"
+                        style="@style/style_item_container">
 
+                    <TextView
+                            style="@style/style_item_label"
+                            android:text="@string/auther"/>
 
-                <TextView
-                        android:id="@+id/personal_info_authentication"
-                        style="@style/style_item_end_next"
-                        android:text="未认证"/>
-            </LinearLayout>
+
+                    <TextView
+                            android:id="@+id/personal_info_authentication"
+                            style="@style/style_item_end_next"
+                            android:text="未认证"/>
+                </LinearLayout>
 
 
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
 
 
-</ScrollView>
+    </ScrollView>
+
+
+</FrameLayout>