From 01fc196429d5b5d290198ea85dea3143397d8065 Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Wed, 12 May 2021 18:25:17 +0800 Subject: [PATCH] =?UTF-8?q?version:2.0.1=20update:=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=8E=B7=E5=8F=96=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B9=9F=E4=BC=9A=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99app=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20fix:=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 +- .../myappstore/activity/MainPresenter.java | 102 +++++++++--------- .../myappstore/manager/AmapManager.java | 4 +- .../myappstore/network/HTTPInterface.java | 10 +- .../myappstore/receiver/BootReceiver.java | 1 - 5 files changed, 63 insertions(+), 62 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0078ca9..3860407 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,10 +15,6 @@ android { minSdkVersion 24 targetSdkVersion 29 - //versionCode 105 - //versionName "3.1.0"//测试jiaoguanyi.cn - //versionCode 1008 - //versionName "2.0.1.8"// 正式jiaoguanyi.com 双数正式 单数测试 multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -45,9 +41,9 @@ android { //新平台正式 newly { flavorDimensions "default" - versionCode 500 + versionCode 501 //versionCode 1037 - versionName "2.0.0" + versionName "2.0.1" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.jiaoguanyi.appstore", diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java index e9e2d13..1a7244b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java @@ -280,11 +280,13 @@ public class MainPresenter implements MainContact.Presenter { } @SuppressLint("NewApi") - private void updateDevicesInfo(Context context) { + synchronized private void updateDevicesInfo(Context context) { String address = String.valueOf(SPUtils.get(context, "AmapAddress", "-")); + if ("-".equals(address)) { + address = (String) SPUtils.get(context, "AmapError", "-"); + } String longitude = String.valueOf(SPUtils.get(context, "longitude", "0")); String latitude = String.valueOf(SPUtils.get(context, "latitude", "0")); - JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("address", address); jsonObject.addProperty("longitude", longitude); @@ -393,7 +395,7 @@ public class MainPresenter implements MainContact.Presenter { mView.setAliasFinished(); } - private void SetAlias(){ + private void SetAlias() { TagAliasOperatorHelper.TagAliasBean tagAliasBean = new TagAliasOperatorHelper.TagAliasBean(); tagAliasBean.action = ACTION_SET; sequence++; @@ -441,7 +443,7 @@ public class MainPresenter implements MainContact.Presenter { }); } - private void setTag(String batch){ + private void setTag(String batch) { Set set = new HashSet(); set.add(batch); TagAliasOperatorHelper.TagAliasBean tagAliasBean = new TagAliasOperatorHelper.TagAliasBean(); @@ -663,52 +665,52 @@ public class MainPresenter implements MainContact.Presenter { } int locked = Settings.System.getInt(mContext.getContentResolver(), "qch_unlock_ipad", 1); if (locked == 0) { - NetInterfaceManager.getInstance() - .getBatchObservable() - .observeOn(Schedulers.io()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("getDeviceBatch", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull ResponseBody responseBody) { - Log.e("getDeviceBatch", "onNext: "); - try { - String respons = responseBody.string(); - JSONObject jsonObject = JSON.parseObject(respons); - int code = jsonObject.getInteger("code"); - if (code == 200) { - String data = jsonObject.getString("data"); - List batchList = JSON.parseArray(data, Batch.class); - if (null != batchList && batchList.size() > 1) { - Log.e("getDeviceBatch", "onNext: " + "deleteOtherApp"); - if (!BuildConfig.DEBUG) { - JGYUtils.getInstance().deleteOtherApp(packageList); - } - } else { - Log.e("getDeviceBatch", "批次为空"); - Log.e("getDeviceBatch", "onNext: respons:" + respons); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("getDeviceBatch", "onError: " + e.getMessage()); - onComplete(); - } - - @Override - public void onComplete() { - Log.e("getDeviceBatch", "onComplete: "); - mView.getDeviceBatchFinished(); - } - }); +// NetInterfaceManager.getInstance() +// .getBatchObservable() +// .observeOn(Schedulers.io()) +// .subscribe(new Observer() { +// @Override +// public void onSubscribe(@NonNull Disposable d) { +// Log.e("getDeviceBatch", "onSubscribe: "); +// } +// +// @Override +// public void onNext(@NonNull ResponseBody responseBody) { +// Log.e("getDeviceBatch", "onNext: "); +// try { +// String respons = responseBody.string(); +// JSONObject jsonObject = JSON.parseObject(respons); +// int code = jsonObject.getInteger("code"); +// if (code == 200) { +// String data = jsonObject.getString("data"); +// List batchList = JSON.parseArray(data, Batch.class); +// if (null != batchList && batchList.size() > 1) { +// Log.e("getDeviceBatch", "onNext: " + "deleteOtherApp"); + if (!BuildConfig.DEBUG) { + JGYUtils.getInstance().deleteOtherApp(packageList); + } +// } else { +// Log.e("getDeviceBatch", "批次为空"); +// Log.e("getDeviceBatch", "onNext: respons:" + respons); +// } +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// +// @Override +// public void onError(@NonNull Throwable e) { +// Log.e("getDeviceBatch", "onError: " + e.getMessage()); +// onComplete(); +// } +// +// @Override +// public void onComplete() { +// Log.e("getDeviceBatch", "onComplete: "); +// mView.getDeviceBatchFinished(); +// } +// }); } } diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java index 9ccf0b2..594379f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java +++ b/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java @@ -69,8 +69,8 @@ public class AmapManager { sb.append("定位失败" + "\n"); SPUtils.put(mContext, "AmapError", aMapLocation.getErrorInfo()); } - Log.e("AmapAddress", (String) SPUtils.get(mContext, "AmapAddress", "")); - Log.e("AmapError", (String) SPUtils.get(mContext, "AmapError", "")); + Log.e("AmapAddress", (String) SPUtils.get(mContext, "AmapAddress", "-")); + Log.e("AmapError", (String) SPUtils.get(mContext, "AmapError", "-")); Log.e("addr", sb.toString()); } }); diff --git a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java index 0c3311e..a789ca0 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java @@ -492,11 +492,12 @@ public class HTTPInterface { //设置浏览器黑白名单 synchronized public static void setBrowserBlackList(final Context context) { // if (JGYUtils.isOfficialVersion()) { - oldSetBrowserList(context); + oldSetBrowserList(context); // } else { // setBrowserList(context); // } } + private static void setBrowserList(Context context) { NetInterfaceManager.getInstance() .getBrowserListSettingObservable() @@ -890,8 +891,11 @@ public class HTTPInterface { } @SuppressLint("NewApi") - public static void updateDeviceInfo(Context context) { + synchronized public static void updateDeviceInfo(Context context) { String address = String.valueOf(SPUtils.get(context, "AmapAddress", "-")); + if ("-".equals(address)) { + address = (String) SPUtils.get(context, "AmapError", "-"); + } String longitude = String.valueOf(SPUtils.get(context, "longitude", "0")); String latitude = String.valueOf(SPUtils.get(context, "latitude", "0")); JSONObject jsonObject = new JSONObject(); @@ -905,7 +909,7 @@ public class HTTPInterface { NetInterfaceManager.HTTP_KEY, Utils.getMachine(context), Utils.getHardware(context), - jsonObject.toJSONString() + add ) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java index 670780c..60bade7 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java @@ -27,7 +27,6 @@ public class BootReceiver extends BroadcastReceiver { if (TextUtils.isEmpty(packageList)) { Settings.System.putString(context.getContentResolver(), "qch_launcher_icon_app", ""); } - HTTPInterface.updateDeviceInfo(context); startService(context); break; case BOOT_COMPLETED: