version:2.4 beta

fix:
add:优化接口请求,修复一下报错,删除极光推送和高德地图sdk
This commit is contained in:
2022-06-29 19:59:19 +08:00
parent ace28e65b5
commit 657d45ab33
67 changed files with 13003 additions and 2963 deletions

View File

@@ -10,11 +10,11 @@ import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.uiui.sn.bean.SystemSettings;
import com.uiui.sn.config.CommonConfig;
import com.uiui.sn.utils.ApkUtils;
import com.uiui.sn.gson.GsonUtils;
import com.uiui.sn.utils.JGYUtils;
import com.uiui.sn.utils.SPUtils;
import com.uiui.sn.utils.ToastUtil;
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.function.Predicate;
/**
* 系统管理处理
* 所有数据 后台1是0否底层0是1否
@@ -67,7 +66,7 @@ public class ControlManager {
if (TextUtils.isEmpty(jsonString)) {
return;
}
SystemSettings settings = JSON.parseObject(jsonString, SystemSettings.class);
SystemSettings settings = GsonUtils.toJavaObject(jsonString, SystemSettings.class);
if (null != settings) {
setUSBstate(settings);
setPhoneList(settings);
@@ -578,8 +577,8 @@ public class ControlManager {
}
public void setDeveloperOptions(String jsonString) {
JSONObject jsonObject = JSON.parseObject(jsonString);
int dev_mode = changeNum(jsonObject.getIntValue("dev_mode"));
JsonObject jsonObject = GsonUtils.getJsonObject(jsonString);
int dev_mode = changeNum(jsonObject.get("dev_mode").getAsInt());
Log.e(TAG, "getDeveloper: " + dev_mode);
if (!DeviceManager.isDebugMode()) {
JGYUtils.putInt(mResolver, CommonConfig.AOLE_ACTION_DEVELOPER_OPTIONS, dev_mode);
@@ -615,8 +614,9 @@ public class ControlManager {
}
public void setSearchTopic(String jsonString) {
JSONObject jsonObject = JSON.parseObject(jsonString);
int mode = jsonObject.getIntValue("search_topic");
JsonObject jsonObject = GsonUtils.getJsonObject(jsonString);
if (jsonObject.get("search_topic") == null) return;
int mode = jsonObject.get("search_topic").getAsInt();
SPUtils.put(mContext, "search_topic", mode);
Log.e(TAG, "search_topic:" + mode);
}
@@ -715,5 +715,4 @@ public class ControlManager {
}
}