diff --git a/app/build.gradle b/app/build.gradle index da13d63..5a05576 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,8 +73,8 @@ android { official { flavorDimensions "default" - versionCode 38 - versionName "2.9.8" + versionCode 40 + versionName "3.0.0" } } @@ -264,6 +264,7 @@ android { signingConfig signingConfigs.Teclast8515 } + //m40se teclastUnisocdebug.initWith(zhanRuiDebug) teclastUnisocdebug { manifestPlaceholders = [ diff --git a/app/src/main/java/com/fuying/sn/base/BaseApplication.java b/app/src/main/java/com/fuying/sn/base/BaseApplication.java index 896b983..5b2bbef 100644 --- a/app/src/main/java/com/fuying/sn/base/BaseApplication.java +++ b/app/src/main/java/com/fuying/sn/base/BaseApplication.java @@ -133,8 +133,9 @@ public class BaseApplication extends Application { //token在设备卸载重装的时候有可能会变 Log.e("TPush", "注册成功,设备token为:" + data); List accountInfoList = new ArrayList<>(); -// accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getSerial())); - accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getIMEI(getApplicationContext()))); + Log.e("TPush", "onSuccess: " + Utils.getSerial()); + accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getSerial())); +// accountInfoList.add(new XGPushManager.AccountInfo(XGPushManager.AccountType.CUSTOM.getValue(), Utils.getIMEI(getApplicationContext()))); XGPushManager.upsertAccounts(getApplicationContext(), accountInfoList, new XGIOperateCallback() { @Override public void onSuccess(Object data, int flag) { diff --git a/app/src/main/java/com/fuying/sn/config/CommonConfig.java b/app/src/main/java/com/fuying/sn/config/CommonConfig.java index 6df1617..026090d 100644 --- a/app/src/main/java/com/fuying/sn/config/CommonConfig.java +++ b/app/src/main/java/com/fuying/sn/config/CommonConfig.java @@ -1,6 +1,8 @@ package com.fuying.sn.config; public class CommonConfig { + public static final String MMKV_ID = "InterProcessKV"; + /*首次开机*/ public final static String JGY_FIRST_BOOT = "first_boot"; /*保存的应用版本号*/ diff --git a/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java b/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java index e8aa6ea..ee8b4da 100644 --- a/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java +++ b/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java @@ -75,7 +75,7 @@ public class RunningAppManager { private static RunningAppManager mRunningAppManager; private Context mContext; private CacheHelper mCacheHelper; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); public static final String RemainingTimeMap = "RemainingTimeMap_KEY"; diff --git a/app/src/main/java/com/fuying/sn/disklrucache/CacheHelper.java b/app/src/main/java/com/fuying/sn/disklrucache/CacheHelper.java index 6688e55..cda813a 100644 --- a/app/src/main/java/com/fuying/sn/disklrucache/CacheHelper.java +++ b/app/src/main/java/com/fuying/sn/disklrucache/CacheHelper.java @@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable; import android.os.Environment; import android.util.Log; +import com.fuying.sn.config.CommonConfig; import com.jakewharton.disklrucache.DiskLruCache; import com.tencent.mmkv.MMKV; @@ -30,7 +31,7 @@ import java.io.Serializable; public class CacheHelper { private static final String TAG = "DiskLruCacheHelper"; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private static final String DIR_NAME = "diskCache"; private static final int MAX_COUNT = 1024 * 1024 * 1024; diff --git a/app/src/main/java/com/fuying/sn/manager/ConnectManager.java b/app/src/main/java/com/fuying/sn/manager/ConnectManager.java index bf8a8ed..3aa54a6 100644 --- a/app/src/main/java/com/fuying/sn/manager/ConnectManager.java +++ b/app/src/main/java/com/fuying/sn/manager/ConnectManager.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; +import com.fuying.sn.config.CommonConfig; import com.tencent.mmkv.MMKV; import com.fuying.sn.utils.TimeUtils; @@ -30,7 +31,7 @@ public class ConnectManager { @SuppressLint("StaticFieldLeak") private static ConnectManager sInstance; private Context mContext; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private ConnectManager(Context context) { if (context == null) { diff --git a/app/src/main/java/com/fuying/sn/manager/ControlManager.java b/app/src/main/java/com/fuying/sn/manager/ControlManager.java index ed2b048..0e4feb9 100644 --- a/app/src/main/java/com/fuying/sn/manager/ControlManager.java +++ b/app/src/main/java/com/fuying/sn/manager/ControlManager.java @@ -37,7 +37,7 @@ public class ControlManager { private static ControlManager sInstance; private Context mContext; private ContentResolver mResolver; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private ControlManager(Context context) { if (context == null) { diff --git a/app/src/main/java/com/fuying/sn/manager/ControlPanelManager.java b/app/src/main/java/com/fuying/sn/manager/ControlPanelManager.java index 0dffd36..c34ae4a 100644 --- a/app/src/main/java/com/fuying/sn/manager/ControlPanelManager.java +++ b/app/src/main/java/com/fuying/sn/manager/ControlPanelManager.java @@ -6,6 +6,7 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.util.Log; +import com.fuying.sn.config.CommonConfig; import com.tencent.mmkv.MMKV; /** @@ -33,7 +34,7 @@ public class ControlPanelManager { this.mContext = context; this.mResolver = context.getContentResolver(); mUsbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); - mmkv = MMKV.defaultMMKV(); + mmkv = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); } public static void init(Context context) { diff --git a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java index 982aa62..4e9db29 100644 --- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java @@ -142,7 +142,7 @@ public class NetInterfaceManager { private static NetInterfaceManager INSTANCE; private Context mContext; private ContentResolver crv; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); private Retrofit mRetrofit; private OkHttpClient okHttpClient; private CacheHelper mCacheHelper; @@ -765,12 +765,8 @@ public class NetInterfaceManager { uploadInfos.add(uploadInfo); } String json = GsonUtils.toJSONString(uploadInfos); - String old = mCacheHelper.getAsString(UrlAddress.SEND_INSTALLEDORREMOVED); - if (!json.equals(old)) { - emitter.onNext(json); - } else { - Log.e("SendAppInstallInfo", "subscribe: skip"); - } + Log.e("SendAppInstallInfo", "subscribe: json = " + json); + emitter.onNext(json); } }) .subscribeOn(Schedulers.io()) @@ -779,7 +775,6 @@ public class NetInterfaceManager { @Override public ObservableSource apply(String s) throws Throwable { Log.e("SendAppInstallInfo", "apply: " + s); - mCacheHelper.put(UrlAddress.SEND_INSTALLEDORREMOVED, s); return getAddAppInstallControl() .installorRemove(Utils.getSerial(), s); } @@ -794,9 +789,6 @@ public class NetInterfaceManager { @Override public void onNext(@NonNull BaseResponse baseResponse) { Log.e("SendAppInstallInfo", "onNext: " + baseResponse); - if (baseResponse.code != 200) { - mCacheHelper.put(UrlAddress.SEND_INSTALLEDORREMOVED, ""); - } } @Override diff --git a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java index e0a5924..f8a3e71 100644 --- a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java @@ -42,7 +42,7 @@ public class MainSPresenter implements MainSContact.Presenter { private MainSContact.MainView mView; private Context mContext; private CacheHelper mCacheHelper; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); public MainSPresenter(Context context) { this.mContext = context; 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 49cd7cc..f4e0fe2 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 @@ -74,7 +74,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo private String TAG = MainService.class.getSimpleName(); public MainSPresenter mPresenter; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); //执行所有请求的时间 long runningTime; @@ -172,6 +172,8 @@ public class MainService extends Service implements MainSContact.MainView, Netwo }); mPresenter.getSnInfo(); mPresenter.getAppAndWhite(); + NetInterfaceManager.getInstance().updateAdminInfo(); + NetInterfaceManager.getInstance().SendAppInstallInfo(); } } }, 20000); diff --git a/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java b/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java index 9d50237..dbe0b17 100644 --- a/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java +++ b/app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java @@ -872,8 +872,8 @@ public class MessageReceiver extends XGPushBaseReceiver { } synchronized private void sendStartTime(Context context, String jsonString) { - NetInterfaceManager.getInstance().updateAdminInfo(); NetInterfaceManager.getInstance().sendRunningApp(); + NetInterfaceManager.getInstance().updateAdminInfo(); NetInterfaceManager.getInstance().SendAppInstallInfo(); NetInterfaceManager.getInstance().getAppAndWhite(); NetInterfaceManager.getInstance().getSnInfo(); diff --git a/app/src/main/java/com/fuying/sn/utils/JGYUtils.java b/app/src/main/java/com/fuying/sn/utils/JGYUtils.java index 469150a..c52caf9 100644 --- a/app/src/main/java/com/fuying/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/fuying/sn/utils/JGYUtils.java @@ -88,7 +88,7 @@ public class JGYUtils { private static JGYUtils sInstance; private Context mContext; private ContentResolver resolver; - private MMKV mMMKV = MMKV.defaultMMKV(); + private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); public static final int MTKPlatform = 1; public static final int ZhanruiPlatform = 2; diff --git a/app/src/main/java/com/fuying/sn/utils/Utils.java b/app/src/main/java/com/fuying/sn/utils/Utils.java index 8695ca0..45eac7a 100644 --- a/app/src/main/java/com/fuying/sn/utils/Utils.java +++ b/app/src/main/java/com/fuying/sn/utils/Utils.java @@ -614,7 +614,6 @@ public class Utils { * * @return */ - @SuppressLint({"MissingPermission", "NewApi"}) public static String getSerial() { if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G13Platform) { return getSn(); @@ -880,7 +879,8 @@ public class Utils { String upgrade_disallow = Settings.System.getString(context.getContentResolver(), CommonConfig.AOLE_ACTION_DISALLOW_UPGRADE); //所有app String only_jgy_shortcut_list = Settings.System.getString(context.getContentResolver(), CommonConfig.ONLY_SHORTCUT_LIST); - String overall_app_list = MMKV.defaultMMKV().decodeString(CommonConfig.AOLE_ACTION_OVERALL_APP, ""); + MMKV mmkv = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); + String overall_app_list = mmkv.decodeString(CommonConfig.AOLE_ACTION_OVERALL_APP, ""); Log.e("writeDisableUpdateList", "aole_app_forbid: " + now); HashSet nowList = new HashSet<>(); HashSet disallowList = new HashSet<>(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc77a72..db1ebba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,6 @@ 请务必仔细核对并选择正确学龄段,激活后无法更改或退费 隐私政策 用户协议 - 请使用UIUI小程序扫码添加设备 设备已绑定成功 设备未经授权 家长设置了屏幕锁定,你可以联系家长解锁屏幕,或通过密码解锁