diff --git a/README.md b/README.md index 341ab33..ffe5b6a 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@
- +
diff --git a/package.json b/package.json index 7aa7550..c899653 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,7 @@ { "name": "HugoAura", - "version": "0.2.0-rc1-p2", + "version": "0.2.0-rc1-p3", "description": "Aura for SeewoHugo", - "main": "app.asar/main.js", "dependencies": {}, "devDependencies": { "electron": "^36.3.2" diff --git a/src/aura/init/shared/default.json b/src/aura/init/shared/default.json index e9ad026..3eba349 100755 --- a/src/aura/init/shared/default.json +++ b/src/aura/init/shared/default.json @@ -11,6 +11,9 @@ }, "vendor/screenLock": { "enabled": true, + "fastfail": false, + "showDirectUnlock": false, + "clickBtnToExit": true, "disableKeyboardHook": false, "authRewriteType": "customActivationCode", "customActivationCode": { diff --git a/src/aura/jsRewrite/vendor/screenLock.js b/src/aura/jsRewrite/vendor/screenLock.js index e145a8c..c17184c 100755 --- a/src/aura/jsRewrite/vendor/screenLock.js +++ b/src/aura/jsRewrite/vendor/screenLock.js @@ -528,6 +528,9 @@ const newFunction = function (e, t, n) { scanCode: "scanCode", activationCode: "activationCode", password: "password", + // ### BOR ### // + direct: "direct", + // ### EOR ### // }, G = n(19); n(818); @@ -1053,6 +1056,9 @@ const newFunction = function (e, t, n) { f()(de, H.scanCode, "扫码"), f()(de, H.activationCode, "激活码"), f()(de, H.password, "密码"), + // ### BOR ### // + __config.showDirectUnlock ? f()(de, H.direct, "直接") : null, + // ### EOR ### // de), ge = (function (e) { u()(i, e); @@ -1078,6 +1084,26 @@ const newFunction = function (e, t, n) { (r.adminHidePassword = !1), (r.handleChooseType = function (e) { return function () { + // ### BOR ### // + if (e === "direct" && __config.showDirectUnlock) { + global.__HUGO_AURA_BREAKUP__[ + "vendor/screenLock" + ].goActivationCorrect(); + return; + } + if (e === "activationCode" && __config.clickBtnToExit) { + global.__HUGO_AURA_BREAKUP__["vendor/screenLock"] + .btnClickCounter++; + if ( + global.__HUGO_AURA_BREAKUP__["vendor/screenLock"] + .btnClickCounter === 10 + ) { + global.__HUGO_AURA_BREAKUP__[ + "vendor/screenLock" + ].goActivationCorrect(); + } + } + // ### EOR ### // r.setState({ chooseType: e }), (r.hasTouched = !0), r.handleGetSelectItemPos(e); @@ -1210,6 +1236,21 @@ const newFunction = function (e, t, n) { { key: "componentDidMount", value: function () { + // ### BOR ### // + if (__config.enabled && __config.fastfail) { + this.props.onActivationCorrect(); + return; + } else { + if (!global.__HUGO_AURA_BREAKUP__) + global.__HUGO_AURA_BREAKUP__ = {}; + global.__HUGO_AURA_BREAKUP__["vendor/screenLock"] = { + goActivationCorrect: () => { + this.props.onActivationCorrect(); + }, + btnClickCounter: 0, + }; + } + // ### EOR ### // var e = this; this.handleChangeHidePassword(), this.chooseTypeOfIotLineStatus(function () { diff --git a/src/aura/ui/pages/configSubPages/disableLimitations/settings/auth.js b/src/aura/ui/pages/configSubPages/disableLimitations/settings/auth.js index 7984e16..e2638d2 100755 --- a/src/aura/ui/pages/configSubPages/disableLimitations/settings/auth.js +++ b/src/aura/ui/pages/configSubPages/disableLimitations/settings/auth.js @@ -183,17 +183,130 @@ const authSettings = [ }, { index: 2, - id: "screenLockAuthOverrideType", - type: "radio", - name: "覆写模式", - description: "选择一个认证覆写模式", + id: "fastfailScreenLock", + type: "switch", + name: "禁用屏幕锁", + description: "启用本功能后, 屏幕锁将完全无法使用, 请注意风险", restart: false, reload: false, - associateVal: ["rewrite.vendor/screenLock.enabled"], + warning: true, + warningContent: "本功能存在极大的被发现风险, 启用前请自估风险", + associateVal: ["rewrite.vendor/screenLock.fastfail"], auraIf: () => { return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] .enabled; }, + defaultValue: false, + valueGetter: () => { + return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] + .fastfail; + }, + callbackFn: (newVal) => { + if (typeof newVal !== "boolean") return; + global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"].fastfail = + newVal; + }, + }, + { + index: 3, + id: "showDirectUnlock", + type: "switch", + name: '显示 "直接解锁" 按钮', + description: '启用后, 屏幕锁下方的解锁类型选择区域可选择 "直接解锁"', + restart: false, + reload: false, + warning: true, + warningContent: "本功能存在极大的被发现风险, 启用前请自估风险", + associateVal: [ + "rewrite.vendor/screenLock.enabled", + "rewrite.vendor/screenLock.fastfail", + ], + auraIf: () => { + return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] + .enabled; + }, + auraDisable: () => { + if ( + global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"].fastfail + ) { + return { value: true, tooltip: '关闭 "禁用屏幕锁" 以继续' }; + } + return { value: false }; + }, + defaultValue: false, + valueGetter: () => { + return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] + .showDirectUnlock; + }, + callbackFn: (newVal) => { + if (typeof newVal !== "boolean") return; + global.__HUGO_AURA_CONFIG__.rewrite[ + "vendor/screenLock" + ].showDirectUnlock = newVal; + }, + }, + { + index: 4, + id: "clickActBtnToExit", + type: "switch", + name: "连击紧急解锁", + description: '启用后, 连击 10 次 "激活码解锁" 按钮可紧急解锁', + restart: false, + reload: false, + tip: true, + tipTitle: "不建议关闭本功能, 至少给自己留条出路", + associateVal: [ + "rewrite.vendor/screenLock.enabled", + "rewrite.vendor/screenLock.fastfail", + ], + auraIf: () => { + return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] + .enabled; + }, + auraDisable: () => { + if ( + global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"].fastfail + ) { + return { value: true, tooltip: '关闭 "禁用屏幕锁" 以继续' }; + } + return { value: false }; + }, + defaultValue: true, + valueGetter: () => { + return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] + .clickBtnToExit; + }, + callbackFn: (newVal) => { + if (typeof newVal !== "boolean") return; + global.__HUGO_AURA_CONFIG__.rewrite[ + "vendor/screenLock" + ].clickBtnToExit = newVal; + }, + }, + { + index: 5, + id: "screenLockAuthOverrideType", + type: "radio", + name: "认证覆写模式", + description: "选择一个认证覆写模式, 或不修改认证策略", + restart: false, + reload: false, + associateVal: [ + "rewrite.vendor/screenLock.enabled", + "rewrite.vendor/screenLock.fastfail", + ], + auraIf: () => { + return global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"] + .enabled; + }, + auraDisable: () => { + if ( + global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"].fastfail + ) { + return { value: true, tooltip: '关闭 "禁用屏幕锁" 以继续' }; + } + return { value: false }; + }, defaultValue: "none", templates: ["customActivationCode", "none"], templateLabels: ["自定义激活码", "不修改"], @@ -208,7 +321,7 @@ const authSettings = [ }, }, { - index: 3, + index: 6, id: "customActivationCode", type: "input", subType: "password", @@ -221,6 +334,7 @@ const authSettings = [ associateVal: [ "rewrite.vendor/screenLock.enabled", "rewrite.vendor/screenLock.authRewriteType", + "rewrite.vendor/screenLock.fastfail", ], auraIf: () => { return ( @@ -229,6 +343,14 @@ const authSettings = [ .authRewriteType === "customActivationCode" ); }, + auraDisable: () => { + if ( + global.__HUGO_AURA_CONFIG__.rewrite["vendor/screenLock"].fastfail + ) { + return { value: true, tooltip: '关闭 "禁用屏幕锁" 以继续' }; + } + return { value: false }; + }, defaultValue: "", placeHolder: "留空表示不修改, 保留已设置值", valueGetter: () => { diff --git a/src/core/preload.js b/src/core/preload.js index fd6dc85..efc676a 100755 --- a/src/core/preload.js +++ b/src/core/preload.js @@ -1,6 +1,6 @@ // @ts-check -const __AURA_VERSION__ = "0.2.0-rc1-p2"; +const __AURA_VERSION__ = "0.2.0-rc1-p3"; (() => { if (require.main) return; // 如果只是导入 Aura Version, 不运行闭包逻辑