version:1.4

fix:修复开机写入扶小鹰包名
update:增加mtk11打包

app/build.gradle

@@ -73,8 +73,8 @@ android {
 
         official {
             flavorDimensions "default"
-            versionCode 4
+            versionCode 5
-            versionName "1.3"
+            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"'

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();
         }