From e472c898c30bb746f01cfd7ff98064301bef3a2d Mon Sep 17 00:00:00 2001
From: fanhuitong <981964879@qq.com>
Date: Fri, 28 Oct 2022 16:14:53 +0800
Subject: [PATCH] =?UTF-8?q?version:1.4=20fix:=E4=BF=AE=E5=A4=8D=E5=BC=80?=
 =?UTF-8?q?=E6=9C=BA=E5=86=99=E5=85=A5=E6=89=B6=E5=B0=8F=E9=B9=B0=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D=20update:=E5=A2=9E=E5=8A=A0mtk11=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  51 +++++++++++++++++-
 app/src/keys/Unisoc.jks                       | Bin 0 -> 2547 bytes
 app/src/keys/mtkAndroid11.jks                 | Bin 0 -> 2885 bytes
 .../fuying/sn/service/main/MainService.java   |  30 +++++++----
 4 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 app/src/keys/Unisoc.jks
 create mode 100644 app/src/keys/mtkAndroid11.jks

diff --git a/app/build.gradle b/app/build.gradle
index c2aded5..5964f71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,8 +73,8 @@ android {
 
         official {
             flavorDimensions "default"
-            versionCode 4
-            versionName "1.3"
+            versionCode 5
+            versionName "1.4"
         }
     }
 
@@ -106,9 +106,56 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
+
+        mtkAndroid11 {
+            storeFile file("src/keys/mtkAndroid11.jks")
+            storePassword "123456"
+            keyAlias "mtk11"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+
+        unisoc {
+            storeFile file("src/keys/Unisoc.jks")
+            storePassword "123456"
+            keyAlias "unisoc"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
     }
 
     buildTypes {
+        unisocDebug.initWith(debug)
+        unisocDebug {
+            buildConfigField "String", "platform", '"ZhanRui"'
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.unisoc
+        }
+
+        unisocRelease.initWith(debug)
+        unisocRelease {
+            buildConfigField "String", "platform", '"ZhanRui"'
+            debuggable true
+            signingConfig signingConfigs.unisoc
+        }
+
+        mtk11Debug.initWith(debug)
+        mtk11Debug {
+            buildConfigField "String", "platform", '"MTK"'
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.mtkAndroid11
+        }
+
+        mtk11Release.initWith(release)
+        mtk11Release {
+            buildConfigField "String", "platform", '"MTK"'
+            signingConfig signingConfigs.mtkAndroid11
+        }
+
         zhanRuiDebug.initWith(debug)
         zhanRuiDebug {
             buildConfigField "String", "platform", '"ZhanRui"'
diff --git a/app/src/keys/Unisoc.jks b/app/src/keys/Unisoc.jks
new file mode 100644
index 0000000000000000000000000000000000000000..0dfcd5a08f623221987340dd547f27e74e173c8f
GIT binary patch
literal 2547
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
Yv0YC76~Ju*J)_B2rkqq6zn8A_Cj*f>H~;_u

literal 0
HcmV?d00001

diff --git a/app/src/keys/mtkAndroid11.jks b/app/src/keys/mtkAndroid11.jks
new file mode 100644
index 0000000000000000000000000000000000000000..d708a4df7813b49f5c31c3fd36aa2148abc5ff4f
GIT binary patch
literal 2885
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
Vt9-H=srJe7?6LP3N-97c@n3b_QI7xs

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/fuying/sn/service/main/MainService.java b/app/src/main/java/com/fuying/sn/service/main/MainService.java
index cede5af..3cb4b8d 100644
--- a/app/src/main/java/com/fuying/sn/service/main/MainService.java
+++ b/app/src/main/java/com/fuying/sn/service/main/MainService.java
@@ -15,19 +15,11 @@ import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.blankj.utilcode.util.NetworkUtils;
-import com.tencent.android.tpush.XGIOperateCallback;
-import com.tencent.android.tpush.XGPushConfig;
-import com.tencent.android.tpush.XGPushManager;
-import com.tencent.mmkv.MMKV;
-import com.trello.rxlifecycle4.LifecycleProvider;
-import com.trello.rxlifecycle4.LifecycleTransformer;
-import com.trello.rxlifecycle4.RxLifecycle;
-import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
 import com.fuying.sn.BuildConfig;
 import com.fuying.sn.bean.BaseResponse;
 import com.fuying.sn.bean.SnInfo;
@@ -45,6 +37,15 @@ import com.fuying.sn.utils.SPUtils;
 import com.fuying.sn.utils.TimeUtils;
 import com.fuying.sn.utils.ToastUtil;
 import com.fuying.sn.utils.Utils;
+import com.tencent.android.tpush.XGIOperateCallback;
+import com.tencent.android.tpush.XGPushConfig;
+import com.tencent.android.tpush.XGPushManager;
+import com.tencent.mmkv.MMKV;
+import com.trello.rxlifecycle4.LifecycleProvider;
+import com.trello.rxlifecycle4.LifecycleTransformer;
+import com.trello.rxlifecycle4.RxLifecycle;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.trello.rxlifecycle4.android.RxLifecycleAndroid;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -102,6 +103,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
 
     @Override
     public void onConnected(NetworkUtils.NetworkType networkType) {
+        Log.e(TAG, "网络已连接");
         ToastUtil.show("网络已连接");
         String WiFiAlias = Utils.getWifiAlias(this);
         Log.e("OnNetworkStatusChanged", "onConnected: " + WiFiAlias);
@@ -153,6 +155,13 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
         TimeTask task = new TimeTask();
         task.execute("ntp.aliyun.com");
 
+        Log.e(TAG, "onCreate: IMEI = " + Utils.getIMEI(MainService.this));
+        String aole_app_forbid = Settings.System.getString(getContentResolver(), CommonConfig.AOLE_ACTION_APP_FORBID);
+        Log.e(TAG, "onCreate: aole_app_forbid = " + aole_app_forbid);
+        if (TextUtils.isEmpty(aole_app_forbid)) {
+            ApkUtils.writeAppPackageList(MainService.this, "");
+        }
+
         ApkUtils.UninstallAPP(this, "com.joytv.live");
         ApkUtils.UninstallAPP(this, "com.tencent.android.qqdownloader");
 
@@ -422,6 +431,9 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
             Log.e("TimeObserver", "onNext: " + string);
             startCommandTime = runningTime = SystemClock.elapsedRealtime();
             mPresenter.getSnInfo();
+            NetInterfaceManager.getInstance().getAppWhiteList(() -> {
+                Log.e(TAG, "onNext: getAppWhiteList");
+            });
             startService();
         }