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

@@ -48,8 +48,7 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.WriterException;
@@ -62,6 +61,7 @@ import com.uiui.sn.Statistics.AppInformation;
import com.uiui.sn.Statistics.StatisticsInfo;
import com.uiui.sn.bean.AppUsed;
import com.uiui.sn.config.CommonConfig;
import com.uiui.sn.gson.GsonUtils;
import com.uiui.sn.network.NetInterfaceManager;
import java.io.BufferedReader;
@@ -914,7 +914,7 @@ public class Utils {
writeSucceed = JGYUtils.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_APP_FORBID, list);
Log.e("writeDisableUpdateList", "aole_app_forbid: " + list);
} else {
writeSucceed = JGYUtils.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_APP_FORBID, "Invalid");
writeSucceed = JGYUtils.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_APP_FORBID, "");
}
return writeSucceed;
/*功能和应用安装白名单一样首先会写入所有的app名单。
@@ -1201,14 +1201,14 @@ public class Utils {
String rom = JGYUtils.getCustomVersion();
String screen_rate = getAndroiodScreenProperty(context);
JSONObject jsonObject = new JSONObject();
jsonObject.put("device", device);
jsonObject.put("imei", imei);
jsonObject.put("system_version", system_version);
jsonObject.put("firmware_version", firmware_version);
jsonObject.put("rom", rom);
jsonObject.put("screen_rate", screen_rate);
return jsonObject.toJSONString();
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("device", device);
jsonObject.addProperty("imei", imei);
jsonObject.addProperty("system_version", system_version);
jsonObject.addProperty("firmware_version", firmware_version);
jsonObject.addProperty("rom", rom);
jsonObject.addProperty("screen_rate", screen_rate);
return jsonObject.toString();
}
public static String getHardware(Context context) {
@@ -1229,24 +1229,24 @@ public class Utils {
// WifiInfo wifiInfo = wifiManager.getConnectionInfo();
WifiInfo info = wifiManager.getConnectionInfo();
JSONObject jsonObject = new JSONObject();
jsonObject.put("electric", electric);
jsonObject.put("charging", charging);
jsonObject.put("memory", memory);
jsonObject.put("mac", getMAC(context));
jsonObject.put("storage", storage);
jsonObject.put("is_wifi", JGYUtils.getInstance().isWifiConnect());
jsonObject.put("CPU", CPU + "");
jsonObject.put("use_space", use_space);
jsonObject.put("use_ram", use_ram);
jsonObject.put("wifi_ssid", getWifiSSID(context));
jsonObject.put("wifi_time", wifi_time);
jsonObject.put("boot_time", SystemClock.elapsedRealtime());
jsonObject.put("battery_capacity", getBatterymAh(context));
jsonObject.put("wifi_signal", info.getRssi());
jsonObject.put("bluetooth", getBluetoothList());
Log.e(TAG, "getHardware: " + jsonObject.toJSONString());
return jsonObject.toJSONString();
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("electric", electric);
jsonObject.addProperty("charging", charging);
jsonObject.addProperty("memory", memory);
jsonObject.addProperty("mac", getMAC(context));
jsonObject.addProperty("storage", storage);
jsonObject.addProperty("is_wifi", JGYUtils.getInstance().isWifiConnect());
jsonObject.addProperty("CPU", CPU + "");
jsonObject.addProperty("use_space", use_space);
jsonObject.addProperty("use_ram", use_ram);
jsonObject.addProperty("wifi_ssid", getWifiSSID(context));
jsonObject.addProperty("wifi_time", wifi_time);
jsonObject.addProperty("boot_time", SystemClock.elapsedRealtime());
jsonObject.addProperty("battery_capacity", getBatterymAh(context));
jsonObject.addProperty("wifi_signal", info.getRssi());
jsonObject.addProperty("bluetooth", getBluetoothList());
Log.e(TAG, "getHardware: " + jsonObject.toString());
return jsonObject.toString();
}
public static String getWifiSSID(Context context) {
@@ -1297,7 +1297,7 @@ public class Utils {
appUsedList.add(used);
}
appUsedList.removeIf(appUsed -> appUsed.getUseTime() == 0);
String jsonString = JSON.toJSONString(appUsedList);
String jsonString = GsonUtils.toJSONString(appUsedList);
Log.e(TAG, "getAppUsedStatistics: " + jsonString);
return jsonString;
}