From 5b49f1370f38440389c409e6ebc18ddb9924bd62 Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Tue, 5 Jul 2022 20:24:57 +0800 Subject: [PATCH] =?UTF-8?q?version:=20cude=205.9=20mtk=203.4=20fix:?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BE=E5=BA=A6=E5=9C=B0=E5=9B=BE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=B9=B1=E7=A0=81=20update:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=88=B1=E5=8D=8E=E8=A7=A3=E9=94=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 ++-- .../com/aoleyun/sn/SystemInfoInterface.aidl | 2 + .../sn/activity/main/MainActivity.java | 1 - .../interceptor/RepeatRequestInterceptor.java | 2 +- .../com/aoleyun/sn/service/RemoteService.java | 11 ++++- .../sn/service/main/MainSPresenter.java | 7 ++++ .../com/aoleyun/sn/tpush/MessageReceiver.java | 40 ++++++++++++++----- .../java/com/aoleyun/sn/utils/JGYUtils.java | 6 ++- 8 files changed, 57 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6e41fb0..01bcd2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,16 +80,16 @@ android { //酷比魔方 cube { flavorDimensions "default" - versionCode 47 - versionName "5.6" + versionCode 50 + versionName "5.9" buildConfigField "String", "platform", '"ZhanRuiCube"' } //MTK MTKnewly { flavorDimensions "default" - versionCode 23 - versionName "3.2" + versionCode 25 + versionName "3.4" buildConfigField "String", "platform", '"MTK"' } } diff --git a/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl b/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl index 56dec06..429660e 100644 --- a/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl +++ b/app/src/main/aidl/com/aoleyun/sn/SystemInfoInterface.aidl @@ -15,4 +15,6 @@ interface SystemInfoInterface { List getHideIcon(); List getDisableIcon(); String getTopAppPackage(); + boolean SystemPutInt(String name , int value); + void setDefaultDesktop(String pkg); } diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java index 5ba9344..751f718 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java @@ -320,7 +320,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, String head_img = studesInfo.getHead_img(); - settradeType(trade_type); if (TextUtils.isEmpty(sno)) { setNumberText("", View.GONE); diff --git a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java index f5d98a2..a35eace 100644 --- a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java +++ b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java @@ -59,7 +59,7 @@ public class RepeatRequestInterceptor implements Interceptor { if (BuildConfig.DEBUG) { Log.e("REPEAT-REQUEST", action + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url().encodedPath() + "\t" + bodyToString(request)); } else { - Log.e("REPEAT-REQUEST", action + requestKey + " Method @" + request.method()); + Log.e("REPEAT-REQUEST", action + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url().encodedPath()); } } diff --git a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java index e742864..aa660df 100644 --- a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java +++ b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java @@ -61,7 +61,14 @@ public class RemoteService extends Service { return pkg; } + @Override + public boolean SystemPutInt(String name, int value) throws RemoteException { + return Settings.System.putInt(getContentResolver(), name, value); + } + + @Override + public void setDefaultDesktop(String pkg) throws RemoteException { + JGYUtils.getInstance().setDefaultDesktop(pkg); + } }; - - } diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java index c5d5788..72aeb89 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java @@ -81,6 +81,12 @@ public class MainSPresenter implements MainSContact.Presenter { @Override public void getLockedState(String key) { Log.e(TAG, "getLockedState: " + key); + if (JGYUtils.getInstance().isAihuaFramwwork()) { + int aihuaUnlock = Settings.System.getInt(mContext.getContentResolver(), CommonConfig.AIHUA_UNLOCK, 0); + if (aihuaUnlock == 1) { + return; + } + } requesting = true; responseTime = System.currentTimeMillis(); NetInterfaceManager.getInstance() @@ -95,6 +101,7 @@ public class MainSPresenter implements MainSContact.Presenter { }); } + @Override public void setPushTags() { NetInterfaceManager.getInstance().setPushTags(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() { diff --git a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java index 4b0fd27..4f946c0 100644 --- a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java @@ -621,18 +621,36 @@ public class MessageReceiver extends XGPushBaseReceiver { locationClient.start(); locationClient.registerLocationListener(new BDAbstractLocationListener() { @Override - public void onReceiveLocation(BDLocation bdLocation) { - Log.e(TAG, "onReceiveLocation: "); - if (null != bdLocation && bdLocation.getLocType() != BDLocation.TypeServerError) { - Log.e(TAG, "onLocationChanged: " + "定位成功"); - Log.e(TAG, "onLocationChanged: " + bdLocation.getAddress()); - SPUtils.put(mContext, "MapAddress", bdLocation.getAddress()); - SPUtils.put(mContext, "longitude", bdLocation.getLongitude()); - SPUtils.put(mContext, "latitude", bdLocation.getLatitude()); - SPUtils.put(mContext, "MapError", ""); + public void onReceiveLocation(BDLocation location) { + if (null != location) { + switch (location.getLocType()) { + case BDLocation.TypeGpsLocation:// GPS定位结果 + case BDLocation.TypeNetWorkLocation:// 网络定位结果 + case BDLocation.TypeOffLineLocation:// 离线定位结果 + Log.e(TAG, "onLocationChanged: " + "定位成功"); + Log.e(TAG, "onLocationChanged: " + location.getAddrStr() + location.getLocationDescribe()); + SPUtils.put(mContext, "MapAddress", location.getAddrStr() + location.getLocationDescribe()); + SPUtils.put(mContext, "longitude", location.getLongitude()); + SPUtils.put(mContext, "latitude", location.getLatitude()); + SPUtils.put(mContext, "MapError", "-"); + break; + case BDLocation.TypeServerError: + Log.e(TAG, "onReceiveLocation: " + "服务端网络定位失败"); + SPUtils.put(mContext, "MapError", "服务端网络定位失败，可以反馈IMEI号和大体定位时间到loc-bugs@baidu.com，会有人追查原因"); + break; + case BDLocation.TypeNetWorkException: + Log.e(TAG, "onReceiveLocation: " + "网络不同导致定位失败，请检查网络是否通畅"); + SPUtils.put(mContext, "MapError", "网络不同导致定位失败，请检查网络是否通畅"); + break; + case BDLocation.TypeCriteriaException: + Log.e(TAG, "onReceiveLocation: " + "无法获取有效定位依据导致定位失败"); + SPUtils.put(mContext, "MapError", "无法获取有效定位依据导致定位失败，一般是由于手机的原因，处于飞行模式下一般会造成这种结果，可以试着重启手机"); + break; + default: + } } - Log.e(TAG, (String) SPUtils.get(mContext, "MapAddress", "-")); - Log.e(TAG, (String) SPUtils.get(mContext, "MapError", "-")); + Log.e(TAG, "MapAddress: " + SPUtils.get(mContext, "MapAddress", "-")); + Log.e(TAG, "MapError: " + SPUtils.get(mContext, "MapError", "-")); } @Override 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 677ab5f..bdce9b7 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java @@ -1328,7 +1328,7 @@ public class JGYUtils { if (locked == 1) { return; } - int aihuaUnlock = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.AIHUA_UNLOCK, 0); + int aihuaUnlock = Settings.System.getInt(mContext.getContentResolver(), CommonConfig.AIHUA_UNLOCK, 0); if (aihuaUnlock == 1) { return; } @@ -2300,6 +2300,10 @@ public class JGYUtils { return Build.HARDWARE; } + public boolean isAihuaFramwwork() { + return (Utils.getProperty("ro.build.display.id", "获取失败").contains("_aihua")); + } + public static boolean isAihuaDevice() { return getHardware().startsWith(MTK_HARDWARE) && Build.BRAND.startsWith(AIHUA_BRAND); }