功能开发:启动页增加个人信息同意的弹窗

app/src/developSheeptest/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -7,8 +7,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import com.sheep.gamegroup.event.WXLoginAuthEvent;
 import com.sheep.gamegroup.model.entity.MiniPayResult;
-import com.sheep.gamegroup.module.qqminigame.QQMGWXLoginEvent;
-import com.sheep.gamegroup.module.qqminigame.QQMiniGameLoginFgt;
+import com.sheep.gamegroup.qqminigame.QQMGWXLoginEvent;
 import com.sheep.gamegroup.util.*;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.SheepApp;

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

@@ -9,11 +9,13 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
-import androidx.multidex.MultiDex;
-import androidx.multidex.MultiDexApplication;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
+
+import androidx.multidex.MultiDex;
+import androidx.multidex.MultiDexApplication;
+
 import com.baidu.idl.face.platform.FaceSDKManager;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
@@ -40,14 +42,42 @@ import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.qrcode.FaceWithQRActivity;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.usage.AppUsageManager;
-import com.sheep.gamegroup.util.*;
-import com.sheep.gamegroup.view.activity.*;
+import com.sheep.gamegroup.util.ActionUtil;
+import com.sheep.gamegroup.util.AppUtil;
+import com.sheep.gamegroup.util.CertificationUtil;
+import com.sheep.gamegroup.util.ChannelContent;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.ConfigUtil;
+import com.sheep.gamegroup.util.ConnectAddress;
+import com.sheep.gamegroup.util.DataKey;
+import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.MyFileNameGenerator;
+import com.sheep.gamegroup.util.NetUtil;
+import com.sheep.gamegroup.util.RefreshUtil;
+import com.sheep.gamegroup.util.SharedPreferencesUtil;
+import com.sheep.gamegroup.util.SheepDownloadConnection;
+import com.sheep.gamegroup.util.SysAppUtil;
+import com.sheep.gamegroup.util.TextToSpeechUtil;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.ActBindMobileRegister;
+import com.sheep.gamegroup.view.activity.ActPay;
+import com.sheep.gamegroup.view.activity.ChangeTelAct;
+import com.sheep.gamegroup.view.activity.GameCertificationActivity;
+import com.sheep.gamegroup.view.activity.MiddleSchemeAct;
+import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
+import com.sheep.gamegroup.view.activity.RechargeAct;
+import com.sheep.gamegroup.view.activity.RechargeResultAct;
+import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
 import com.sheep.jiuyan.samllsheep.service.DownloadService;
 import com.sheep.jiuyan.samllsheep.service.FloatShotScreenService;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.shuyu.gsyvideoplayer.player.PlayerFactory;
+import com.stmsdk.AbsTMSConfig;
+import com.stmsdk.TMSDKContext;
 import com.tencent.bugly.Bugly;
 import com.tencent.bugly.beta.Beta;
 import com.tencent.klevin.KlevinConfig;
@@ -55,30 +85,25 @@ import com.tencent.klevin.KlevinManager;
 import com.tencent.klevin.listener.InitializationListener;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-//import com.tencent.qqmini.minigame.opensdk.OpenSdkLoginManager;
-//import com.tencent.qqmini.minigame.opensdk.account.OAuthAccountManager;
-//import com.tencent.qqmini.minigame.opensdk.config.OpenSdkConfig;
 import com.tencent.qqmini.minigame.opensdk.OpenSdkLoginManager;
 import com.tencent.qqmini.minigame.opensdk.config.OpenSdkConfig;
 import com.tencent.qqmini.sdk.MiniSDK;
-import com.tencent.qqmini.sdk.launcher.model.OpenSdkLoginInfo;
 import com.tencent.smtt.export.external.TbsCoreSettings;
 import com.tencent.smtt.sdk.QbSdk;
-import com.stmsdk.AbsTMSConfig;
-import com.stmsdk.TMSDKContext;
 import com.tencent.smtt.sdk.WebView;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 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.android.schedulers.AndroidSchedulers;
 import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.schedulers.Schedulers;
 import ren.yale.android.cachewebviewlib.WebViewCacheInterceptor;
 import ren.yale.android.cachewebviewlib.WebViewCacheInterceptorInst;
 import ren.yale.android.cachewebviewlib.config.CacheExtensionConfig;
@@ -148,22 +173,14 @@ public class SheepApp extends MultiDexApplication {
         if (isNotSupport) {
             return;
         }
-        initUtils();
-        ChannelContent.getInstance().initChannelContent(this);
-
-            /*try {
-                JLibrary.InitEntry(this);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }*/
 
         /*Rx兜底策略*/
         RxJavaPlugins.setErrorHandler(throwable -> Log.e("RxThrowable", throwable.getMessage()));
+        ChannelContent.getInstance().initChannelContent(this);
+        //要先同意隐私协议之后，才能去初始化SDK那些内容
+        initUtils();
+
 
-        if (AppUtil.isMainProcess(this)) {
-            /*三方广告SDK接入，点客、游可盈、优投等*/
-            initThirdAd();
-        }
 
     }
 
@@ -363,12 +380,12 @@ public class SheepApp extends MultiDexApplication {
         }
     }
 
-    private void initUtils() {
-//        小游戏
+    public void initOtherSDK() {
+        //        小游戏
         MiniSDK.init(this, new MiniSDK.InitCallback() {
             @Override
             public void onInitComplete() {
-                Log.e("SNOW","initComplete");
+                Log.e("SNOW", "initComplete");
             }
         });
         // 渠道是否需要使用互联账号作为自有体系登录游戏。
@@ -380,23 +397,6 @@ public class SheepApp extends MultiDexApplication {
                         .setWxOpenAppId("wx2be7f59bb7bb963f")
                         .build(this));
 
-
-        RefreshUtil.newInstance().initRefresh();
-        DisplayMetrics metric = getResources().getDisplayMetrics();
-        G.DENSITY = metric.density;
-        G.DENSITY_DPI = metric.densityDpi;
-        boolean isHeightBig = metric.heightPixels > metric.widthPixels;
-        G.HEIGHT = isHeightBig ? metric.heightPixels : metric.widthPixels;
-        G.WIDTH = isHeightBig ? metric.widthPixels : metric.heightPixels;
-
-        int resourceId = SheepApp.getInstance().getResources().getIdentifier("status_bar_height", "dimen", "android");
-        if (resourceId > 0) {
-            //根据资源ID获取响应的尺寸值
-            G.BAR_HEIGHT = SheepApp.getInstance().getResources().getDimensionPixelSize(resourceId);
-        } else {
-            G.BAR_HEIGHT = (int) (25 * metric.density);//不准确的方法
-        }
-
         // 在调用TBS初始化、创建WebView之前进行如下配置
         HashMap map = new HashMap();
         map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
@@ -415,10 +415,6 @@ public class SheepApp extends MultiDexApplication {
 
             }
         });
-
-        x.Ext.init(this);
-        x.Ext.setDebug(org.xutils.BuildConfig.DEBUG); // 是否输出debug日志, 开启debug会影响性能.
-
         UMConfigure.setLogEnabled(true);
         UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "5ab0a1da8f4a9d742900035f");
 //        UMShareAPI.get(this);
@@ -460,6 +456,37 @@ public class SheepApp extends MultiDexApplication {
 
         //初始化人脸识别
         FaceSDKManager.getInstance().initialize(this, Config.FACE_LICENSE_ID, Config.FACE_LICENSE_FILE_NAME);
+        /*try {
+                JLibrary.InitEntry(this);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }*/
+
+        if (AppUtil.isMainProcess(this)) {
+            /*三方广告SDK接入，点客、游可盈、优投等*/
+            initThirdAd();
+        }
+    }
+
+    private void initUtils() {
+        RefreshUtil.newInstance().initRefresh();
+        DisplayMetrics metric = getResources().getDisplayMetrics();
+        G.DENSITY = metric.density;
+        G.DENSITY_DPI = metric.densityDpi;
+        boolean isHeightBig = metric.heightPixels > metric.widthPixels;
+        G.HEIGHT = isHeightBig ? metric.heightPixels : metric.widthPixels;
+        G.WIDTH = isHeightBig ? metric.widthPixels : metric.heightPixels;
+
+        int resourceId = SheepApp.getInstance().getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            //根据资源ID获取响应的尺寸值
+            G.BAR_HEIGHT = SheepApp.getInstance().getResources().getDimensionPixelSize(resourceId);
+        } else {
+            G.BAR_HEIGHT = (int) (25 * metric.density);//不准确的方法
+        }
+        x.Ext.init(this);
+        x.Ext.setDebug(org.xutils.BuildConfig.DEBUG); // 是否输出debug日志, 开启debug会影响性能.
+//        initOtherSDK();
     }
 
     private IWXAPI wxApi;

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

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/leftLine"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="24dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/rightLine"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="24dp" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="个人信息保护展示"
+        android:textColor="#333333"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/rightLine"
+        app:layout_constraintStart_toStartOf="@+id/leftLine"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvContent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toStartOf="@+id/rightLine"
+        app:layout_constraintStart_toStartOf="@+id/leftLine"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        tools:text="TextView" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/btnDisagree"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:text="不同意并退出"
+        android:textColor="#666666"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/imageView2"
+        app:layout_constraintStart_toStartOf="@+id/leftLine"
+        app:layout_constraintTop_toBottomOf="@+id/tvContent" />
+
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="1dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:background="#ff000000"
+        app:layout_constraintBottom_toBottomOf="@+id/btnDisagree"
+        app:layout_constraintEnd_toStartOf="@+id/btnAgree"
+        app:layout_constraintStart_toEndOf="@+id/btnDisagree"
+        app:layout_constraintTop_toTopOf="@+id/btnDisagree" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/btnAgree"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:text="同意"
+        android:textColor="#333333"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/rightLine"
+        app:layout_constraintStart_toEndOf="@+id/imageView2"
+        app:layout_constraintTop_toTopOf="@+id/btnDisagree" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>