From 988a99f8f8f8e1e123efd29e108dcd0240ad8a33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 十月 2021 14:58:37 +0800
Subject: [PATCH] umeng集成方式更新,隐私合规修改

---
 BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
index 14aa443..2a9f7f2 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java
@@ -1,6 +1,7 @@
 package com.weikou.beibeivideo.ui;
 
 import android.Manifest;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -19,6 +20,7 @@
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
 
 import android.telephony.TelephonyManager;
 import android.view.KeyEvent;
@@ -62,7 +64,7 @@
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
-public class SplashActivity extends BaseActivity {
+public class SplashActivity extends FragmentActivity {
 
     boolean isInput = false;
 
@@ -148,16 +150,6 @@
                                 @Override
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                     dialogInterface.dismiss();
-                                    try {
-                                        TelephonyManager manager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
-                                        Build bd = new Build();
-                                        String model = bd.MODEL;
-                                        BeibeiVideoApplication.deviceName = model;
-                                        BeibeiVideoApplication.deviceNumber = manager.getDeviceId();
-                                    } catch (Exception e) {
-                                    }
-                                    //鍒濆鍖�
-                                    BeibeiVideoApplication.init(BeibeiVideoApplication.application);
                                     myRequetPermission();
                                 }
                             }).create().show();
@@ -173,14 +165,6 @@
             }
 
         } else {
-            try {
-                TelephonyManager manager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
-                Build bd = new Build();
-                String model = bd.MODEL;
-                BeibeiVideoApplication.deviceName = model;
-                BeibeiVideoApplication.deviceNumber = manager.getDeviceId();
-            } catch (Exception e) {
-            }
             //璇锋眰鏉冮檺
             vg_ad.post(new Runnable() {
                 @Override
@@ -208,7 +192,7 @@
 
 
         BeibeiVideoAPI.getUid(this, channel, BeibeiVideoAPI.getDeviceId(this), preferences.getString("imei", ""),
-                preferences.getString("mac", ""), "", "",
+                "", "",
                 new BasicTextHttpResponseHandler() {
 
                     @Override
@@ -466,8 +450,9 @@
             //鏄惁闇�瑕佸啀娆¤姹傛潈闄�
             if (sharedPreferences.getBoolean("show", true))
                 ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_PHONE_STATE}, REQUEST_CODE);
-            else
+            else {
                 next();
+            }
         } else {
             next();
         }
@@ -476,6 +461,9 @@
     private void next() {
         //鐧惧害鍐呭鑱旂洘
 //            MobadsPermissionSettings.setPermissionReadDeviceID(true);
+        if (!BeibeiVideoApplication.IsInited()) {
+            BeibeiVideoApplication.init(BeibeiVideoApplication.application);
+        }
         getUid();
         vg_ad.postDelayed(new Runnable() {
 

--
Gitblit v1.8.0