From ef7f148e1354a100598d3ca2765fb175ff06ff49 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@mail.com>
Date: Sat, 5 Jul 2025 11:28:20 +0800
Subject: [PATCH] fix

---
 .../grape/util/ChangeDeviceInfoUtil.kt        | 23 ++++---------------
 .../main/java/com/android/grape/util/Util.kt  |  4 ----
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt b/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt
index 67e7e1d..5c9b0c0 100644
--- a/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt
+++ b/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt
@@ -11,8 +11,7 @@ import org.json.JSONObject
 import java.lang.reflect.InvocationTargetException
 
 object ChangeDeviceInfoUtil {
-    fun changeDeviceInfo(
-    ) {
+    fun changeDeviceInfo() {
         try {
             val deviceObject = paramsJson?.getJSONObject("device")
             if (deviceObject == null) {
@@ -22,22 +21,14 @@ object ChangeDeviceInfoUtil {
             val context = MainApplication.instance
             val device = GsonUtils.fromJsonObject(deviceObject.toString(), Device::class.java)
             val currentPkgName = MainApplication.instance.packageName
-            vcloudsettingsPut(
-                "$currentPkgName.system_country",
-                device.country,
-                context
-            )
+            vcloudsettingsPut("$currentPkgName.system_country", device.country, context)
             vcloudsettingsPut("$currentPkgName.sim_country", device.country, context)
 //                callVCloudSettings_put(
 //                    "$currentPkgName.rom_free_in",
 //                    romFreeIn.toString(),
 //                    context
 //                )
-            vcloudsettingsPut(
-                "$currentPkgName.resolution",
-                "${device.expand.width}x${device.expand.height}}",
-                context
-            )
+            vcloudsettingsPut("$currentPkgName.resolution", "${device.expand.width}x${device.expand.height}}", context)
             vcloudsettingsPut("$currentPkgName.vendor", device.expand.glVendor, context)
 //                callVCloudSettings_put("$currentPkgName.battery_scale", batteryScale.toString(), context)
             vcloudsettingsPut("$currentPkgName.os_lang", device.lang, context)
@@ -146,15 +137,11 @@ object ChangeDeviceInfoUtil {
 
     }
 
-    private fun vcloudsettingsPut(key: String?, value: String?, context: Context) {
-        if (key.isNullOrEmpty()) {
+    private fun vcloudsettingsPut(key: String, value: String, context: Context) {
+        if (key.isEmpty()) {
             LogUtils.e(Log.ERROR, "ChangeDeviceInfoUtil", "Key cannot be null or empty", null)
             throw IllegalArgumentException("Key cannot be null or empty")
         }
-        if (value == null) {
-            LogUtils.e(Log.ERROR, "ChangeDeviceInfoUtil", "Value cannot be null", null)
-            throw IllegalArgumentException("Value cannot be null")
-        }
 
         try {
             // 获取类对象
diff --git a/app/src/main/java/com/android/grape/util/Util.kt b/app/src/main/java/com/android/grape/util/Util.kt
index 647498c..ee74d60 100644
--- a/app/src/main/java/com/android/grape/util/Util.kt
+++ b/app/src/main/java/com/android/grape/util/Util.kt
@@ -1406,10 +1406,6 @@ object Util {
             val clickServerTimeToGP = time[0] / 1000 // + (clickTimeToGp % 2) + 1;
             deviceJo.put("clickServerTimeToGP", clickServerTimeToGP)
 
-            installTime = installTime
-            instalTimeFromGp =
-                instalTimeFromGp
-            lastUpdateTime = lastUpdateTime
             Util.installServerTimeFromGP = installServerTimeFromGP
             clickServerTimeFromGP = clickServerTimeToGP