Merge pull request icegreentee#412 from segfault-bilibili/rollup-6.9.8

【6.9.8】提醒模拟器升级后需要重新解除限制;修正system分区不可写被忽略

floatUI.js

@@ -12574,8 +12574,9 @@ function algo_init() {
                     privShell("chmod 755 " + getPathArg(path));
                 }
                 privShell("rm -f " + getPathArg(dstPath));
-                privShell("ln -s " + getPathArg(realDstPath) + " " + getPathArg(dstPath));
-                let result = privShell("cat " + getPathArg(srcPath) + " > " + getPathArg(dstPath));
+                let result = privShell("ln -s " + getPathArg(realDstPath) + " " + getPathArg(dstPath));
+                if (result.code != 0) throw new Error("ln -s failed");
+                result = privShell("cat " + getPathArg(srcPath) + " > " + getPathArg(dstPath));
                 if (result.code != 0) result = privShell("cat " + getPathArg(srcPath) + " > " + getPathArg(realDstPath));
                 if (result.code != 0) {
                     log(result.code, result.error);

main.js

@@ -133,6 +133,9 @@ ui.layout(
                         <text id="hintMsg1" layout_weight="1" w="*" gravity="center" color="#000000" text="提示:点击展开QB悬浮窗后," />
                         <text id="hintMsg2" layout_weight="1" w="*" gravity="center" color="#000000" text="从上往下第2个按钮可打开脚本选择列表" />
                     </vertical>
+                    <vertical id="remindMsg_vertical" margin="0 5" padding="10 6 0 6" bg="#ffffff" w="*" h="auto" elevation="1dp" visibility="gone" >
+                        <text id="remindMsg" layout_weight="1" w="*" gravity="center" color="#000000" text="提醒:若最近升级过模拟器,则需要重新复活日服脚本" />
+                    </vertical>
                     <vertical id="promoMsg_vertical" margin="0 5" padding="10 6 0 6" bg="#ffffff" w="*" h="auto" elevation="1dp" visibility="gone" >
                         <text id="promoMsg1" layout_weight="1" w="*" gravity="center" color="#000000" text="在列表中选择“安装本地服务器”,"/>
                         <text id="promoMsg2" layout_weight="1" w="*" gravity="center" color="#000000" text="可在国服10月12日关服前备份账号个人数据"/>
@@ -911,6 +914,11 @@ if (!$floaty.checkPermission()) {
     floatIsActive = true;
 }
 
+ui.run(function () {
+    let isJPAccSvcUnlocked = floatUI.storage.get("isJPAccSvcUnlocked", false) ? true : false;
+    ui.remindMsg_vertical.setVisibility(isJPAccSvcUnlocked ? View.VISIBLE : View.GONE);
+});
+
 const persistParamList = [
     "foreground",
     "stopOnVolUp",

project.json

@@ -5,7 +5,7 @@
         "build"
     ],
     "packageName": "top.momoe.auto",
-    "versionName": "6.9.7",
+    "versionName": "6.9.8",
     "versionInfo": "",
     "versionCode": 1,
     "icon":"./images/icon.png",