diff --git a/manifest.json b/manifest.json index fcbc3f2..718a714 100644 --- a/manifest.json +++ b/manifest.json @@ -11,7 +11,7 @@ "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, "splashscreen" : { - "alwaysShowBeforeRender" : true, + "alwaysShowBeforeRender" : false, "waiting" : false, "autoclose" : true, "delay" : 0 @@ -102,9 +102,9 @@ "splashscreen" : { "androidStyle" : "default", "android" : { - "hdpi" : "F:/次元节点doc/扫码项目文件/icon/splash-480x762.png", - "xhdpi" : "F:/次元节点doc/扫码项目文件/icon/splash-720x1242.png", - "xxhdpi" : "F:/次元节点doc/扫码项目文件/icon/splash-1080x1882.png" + "hdpi" : "", + "xhdpi" : "", + "xxhdpi" : "" }, "useOriginalMsgbox" : false, "iosStyle" : "common" diff --git a/nativeplugins/LY-HWScan/android/uniplugin_hwscan-release.aar b/nativeplugins/LY-HWScan/android/uniplugin_hwscan-release.aar index 48f5158..c080bf0 100644 Binary files a/nativeplugins/LY-HWScan/android/uniplugin_hwscan-release.aar and b/nativeplugins/LY-HWScan/android/uniplugin_hwscan-release.aar differ diff --git a/pages.json b/pages.json index c22ece1..68bf4e2 100644 --- a/pages.json +++ b/pages.json @@ -24,13 +24,6 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/policy/Policy", - "style": { - "navigationBarTitleText": "Policy", - "enablePullDownRefresh": false - } - }, { "path": "pages/rights/RightsSetting", "style": { diff --git a/pages/feedback/Feedback.vue b/pages/feedback/Feedback.vue index 6d75ec4..127a787 100644 --- a/pages/feedback/Feedback.vue +++ b/pages/feedback/Feedback.vue @@ -1,11 +1,11 @@ - - - - \ No newline at end of file diff --git a/pages/rights/RightsSetting.vue b/pages/rights/RightsSetting.vue index aaa0208..5f3ec2a 100644 --- a/pages/rights/RightsSetting.vue +++ b/pages/rights/RightsSetting.vue @@ -33,19 +33,25 @@ btnFontSize: 36, btnBackgroundColor: '#0186ff', btnFontColor: '#fff', - hasRequestedPermission: false + hasRequestedPermission: false, + permissionStatus: false } }, async onShow(){ let that = this; if (!that.hasRequestedPermission) { console.log('进入了判断setting权限',that.hasRequestedPermission) - await that.requestAndroidPermission('android.permission.CAMERA'); + const res = await that.requestAndroidPermission('android.permission.CAMERA'); + console.log('res',res); + // if (result == 1) { + // //有权限,跳转到扫码界面 + // that.jumpToRights('/pages/scan/Scan'); + // } + } + else{ + console.log('setting权限状态已变更为true,进入扫码页',that.hasRequestedPermission) + that.jumpToRights('/pages/scan/Scan'); } - // else{ - // console.log('setting权限状态已变更为true,进入扫码页',that.hasRequestedPermission) - // that.jumpToRights('/pages/scan/Scan'); - // } }, onHide() { this.hasRequestedPermission = false; @@ -67,10 +73,7 @@ var result = await permision.requestAndroidPermission(permisionID) console.log('setting判断权限结果',result) that.hasRequestedPermission = true; - if (result == 1) { - //有权限,跳转到扫码界面 - that.jumpToRights('/pages/scan/Scan'); - } + return result; }, //跳转到授权设置页面 diff --git a/pages/scan/Scan.nvue b/pages/scan/Scan.nvue index 29ae16f..cbfafad 100644 --- a/pages/scan/Scan.nvue +++ b/pages/scan/Scan.nvue @@ -36,7 +36,7 @@