修复晟元激活bug
diff --git a/app/src/main/java/com/supwisdom/service/SynoCodeService.kt b/app/src/main/java/com/supwisdom/service/SynoCodeService.kt
index b9034b1..c39bb27 100644
--- a/app/src/main/java/com/supwisdom/service/SynoCodeService.kt
+++ b/app/src/main/java/com/supwisdom/service/SynoCodeService.kt
@@ -85,9 +85,7 @@
val resp = activeDevice(CommonUtil.getSerialNumber(), UrlBase64.encode(licenseByte))
?: return BaseResp(PublicDef.ERROR, "上传激活文件超时")
if (resp.retcode != HttpURLConnection.HTTP_OK) {
- val retBean =
- GsonUtil.GsonToBean(resp.retjson!!, EpaySynoLicenseUploadRetBean::class.java)
- return BaseResp(PublicDef.ERROR, retBean.message)
+ return BaseResp(PublicDef.ERROR, resp.retmsg)
}
return BaseResp(PublicDef.SUCCESS, "上传激活文件成功")
}
diff --git a/app/src/main/java/com/supwisdom/utils/CommonUtil.kt b/app/src/main/java/com/supwisdom/utils/CommonUtil.kt
index 7ccc434..119217b 100644
--- a/app/src/main/java/com/supwisdom/utils/CommonUtil.kt
+++ b/app/src/main/java/com/supwisdom/utils/CommonUtil.kt
@@ -60,11 +60,10 @@
try {
val c = Class.forName("android.os.SystemProperties")
val get = c.getMethod("get", String::class.java)
- return get.invoke(c, "ro.product.firmware") as String
- } catch (ex: Exception) {
+ return (get.invoke(c, "ro.serialno") as String)
+ } catch (ex: java.lang.Exception) {
ex.printStackTrace()
}
-
return ""
}