From 1d5d7c790a9fe9e06378d0dba2774c41b31531b6 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Sat, 24 Oct 2026 09:55:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(platform):=20=E6=96=B0=E5=A2=9E=20TDT65=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E9=80=82=E9=85=8D=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=97=A0=E7=BD=91=E7=BB=9C=E7=A6=81=E7=94=A8app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 27 +++++++++++++++++-- .../sn/activity/main/MainViewModel.java | 17 +++++++++++- .../com/aoleyun/sn/comm/CommonConfig.java | 4 +++ .../sn/network/NetInterfaceManager.java | 3 ++- .../aoleyun/sn/service/main/MainService.java | 7 +++-- .../sn/service/main/MainServiceModel.java | 17 +++++++++++- .../java/com/aoleyun/sn/utils/JgyUtils.java | 7 +++++ .../main/java/com/aoleyun/sn/utils/Utils.java | 1 + 8 files changed, 74 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 15c40d5..95b929e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { defaultConfig { applicationId "com.aoleyun.sn" - versionCode 253 - versionName "1.6.1022" + versionCode 254 + versionName "1.6.1023" //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 24 @@ -343,9 +343,32 @@ android { v1SigningEnabled true v2SigningEnabled true } + + TDT65 { + storeFile file("keystore/G122J.p12") + storePassword "123456" + keyAlias "g122j" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + TDT65Debug.initWith(debug) + TDT65Debug { + buildConfigField "String", "platform", '"TDT65"' + versionNameSuffix "_debug" + debuggable true + signingConfig signingConfigs.TDT65 + } + + TDT65Release.initWith(release) + TDT65Release { + buildConfigField "String", "platform", '"TDT65"' + signingConfig signingConfigs.TDT65 + } + CrosshatchDebug.initWith(debug) CrosshatchDebug { buildConfigField "String", "platform", '"AOSP"' diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java index 2c6429c..2635a9e 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java @@ -67,7 +67,22 @@ public class MainViewModel extends BaseViewModel lifecycle, onCompleteCallback callback) { + public void getLockedState(BehaviorSubject lifecycle, ObserverCallback callback) { getDevicesLockedStateObservable() .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) .subscribe(new Observer() { @@ -2202,6 +2202,7 @@ public class NetInterfaceManager { public void onError(@NonNull Throwable e) { Log.e("getLockedState", "onError: " + e.getMessage()); // onComplete(); + callback.onError(e); } @Override diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java index 7baf5b1..18b9bdc 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java @@ -395,10 +395,9 @@ public class MainService extends BaseService implements NetworkUtils.OnNetworkSt // aliyunPushInit(); - + // TODO: 2026/10/23 从30秒改为1小时 Observable.create(killSubscribe) - .throttleLast(30, TimeUnit.SECONDS) -// .throttleLast(3, TimeUnit.SECONDS) + .throttleLast(1, TimeUnit.HOURS) .subscribe(killObserver); Observable.create(networkSubscribe) @@ -431,7 +430,6 @@ public class MainService extends BaseService implements NetworkUtils.OnNetworkSt } }); - mMMKV.encode(CommonConfig.DEVICES_FRIST_START, 1); } /** @@ -560,6 +558,7 @@ public class MainService extends BaseService implements NetworkUtils.OnNetworkSt Log.e(TAG, "initOnBackground: " + e.getMessage()); e.printStackTrace(); } + mMMKV.encode(CommonConfig.DEVICES_FRIST_START, 1); } /** diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainServiceModel.java b/app/src/main/java/com/aoleyun/sn/service/main/MainServiceModel.java index 220a2ef..363b90d 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainServiceModel.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainServiceModel.java @@ -74,7 +74,22 @@ public class MainServiceModel extends ViewModel { } } NetInterfaceManager.getInstance() - .getLockedState(getLifecycle(), new NetInterfaceManager.onCompleteCallback() { + .getLockedState(getLifecycle(), new NetInterfaceManager.ObserverCallback() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(BaseResponse response) { + + } + + @Override + public void onError(Throwable e) { + getIconControl(); + } + @Override public void onComplete() { Log.e("getLockedState", "onComplete: "); diff --git a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java index 68f176f..97970d6 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java @@ -182,6 +182,7 @@ public class JgyUtils { public static final int DX11Platform = 31; public static final int G12NLPlatform = 32; public static final int G122JPlatform = 34; + public static final int TDT65Platform = 35; public static final String Other = "其他"; @@ -211,6 +212,7 @@ public class JgyUtils { public static final String DX11_TAG = "DX11"; public static final String G12NL_TAG = "G12NL"; public static final String G122J_TAG = "G122J"; + public static final String TDT65_TAG = "TDT65"; private CacheHelper cacheHelper; @@ -379,6 +381,9 @@ public class JgyUtils { } else if (G122J_TAG.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "G122J"); return G122JPlatform; + } else if (TDT65_TAG.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "TDT65"); + return TDT65Platform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -453,6 +458,8 @@ public class JgyUtils { getAppPlatformCallback.AppPlatform(DX11Platform); } else if (G122J_TAG.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(G122JPlatform); + } else if (TDT65_TAG.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(TDT65Platform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } diff --git a/app/src/main/java/com/aoleyun/sn/utils/Utils.java b/app/src/main/java/com/aoleyun/sn/utils/Utils.java index 71a95b8..69561bc 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java @@ -1847,6 +1847,7 @@ public class Utils { || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.DX11Platform || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.G12NLPlatform || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.G122JPlatform + || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.TDT65Platform ) { return Utils.getProperty("ro.build.display.id", "获取失败"); } else {