diff --git a/App.vue b/App.vue index 9cd5593..f69873e 100644 --- a/App.vue +++ b/App.vue @@ -1,7 +1,8 @@ diff --git a/pages/rights/RightsSetting.vue b/pages/rights/RightsSetting.vue index 5f3ec2a..3f056e5 100644 --- a/pages/rights/RightsSetting.vue +++ b/pages/rights/RightsSetting.vue @@ -33,28 +33,22 @@ btnFontSize: 36, btnBackgroundColor: '#0186ff', btnFontColor: '#fff', - hasRequestedPermission: false, - permissionStatus: false } }, + async onLaunch() { + let that = this; + that.ifAppOnlaunched = true; + that.$isResolve() + }, async onShow(){ let that = this; - if (!that.hasRequestedPermission) { - console.log('进入了判断setting权限',that.hasRequestedPermission) - 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'); + if(!that.ifAppOnlaunched){ + await that.$onLaunched; + console.log('setonShow') + await that.requestAndroidPermission('android.permission.CAMERA'); } }, onHide() { - this.hasRequestedPermission = false; console.log('onHide') }, onUnload(){ @@ -72,8 +66,10 @@ let that = this; var result = await permision.requestAndroidPermission(permisionID) console.log('setting判断权限结果',result) - that.hasRequestedPermission = true; - return result; + if (result == '1') { + //有权限,跳转到扫码界面 + that.jumpToRights('/pages/scan/Scan'); + } }, //跳转到授权设置页面 diff --git a/pages/scan/Barcode.vue b/pages/scan/Barcode.vue index 520598a..d45bf9e 100644 --- a/pages/scan/Barcode.vue +++ b/pages/scan/Barcode.vue @@ -58,7 +58,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Book.vue b/pages/scan/Book.vue deleted file mode 100644 index e3353b5..0000000 --- a/pages/scan/Book.vue +++ /dev/null @@ -1,280 +0,0 @@ - diff --git a/pages/scan/Calendar.vue b/pages/scan/Calendar.vue index 90b7ee7..6038094 100644 --- a/pages/scan/Calendar.vue +++ b/pages/scan/Calendar.vue @@ -68,7 +68,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Contacts.vue b/pages/scan/Contacts.vue index 9b26c48..6fdc366 100644 --- a/pages/scan/Contacts.vue +++ b/pages/scan/Contacts.vue @@ -67,7 +67,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Email.vue b/pages/scan/Email.vue index cc80bad..e407bd5 100644 --- a/pages/scan/Email.vue +++ b/pages/scan/Email.vue @@ -64,7 +64,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Location.vue b/pages/scan/Location.vue index e2039b6..2309a91 100644 --- a/pages/scan/Location.vue +++ b/pages/scan/Location.vue @@ -63,7 +63,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Product.vue b/pages/scan/Product.vue index d937f93..6753a8e 100644 --- a/pages/scan/Product.vue +++ b/pages/scan/Product.vue @@ -62,7 +62,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Scan.nvue b/pages/scan/Scan.nvue index cbfafad..8cc907e 100644 --- a/pages/scan/Scan.nvue +++ b/pages/scan/Scan.nvue @@ -60,34 +60,27 @@ code: "", path:'',//扫描图片 flashLightFlag: true, - hasPermission: false } }, - async onShow(){ + onShow(){ let that = this; + //await that.$onLaunched; if(that.$refs.scanComponent){ setTimeout(function(){ that.$refs.scanComponent.remoteResume(); },300); } - if (!that.hasPermission) { - console.log('进入了判断scan权限',that.hasPermission) - //判断是否有权限 - await that.requestAndroidPermission('android.permission.CAMERA') - } - //TODO 有权限就是扫码页面,没权限跳转到权限提示 - // else{ - // console.log('scan权限状态已变更为true,进入扫码页',that.hasPermission) - // //that.jumpToRights('/pages/scan/Scan'); - // } + //await that.requestAndroidPermission('android.permission.CAMERA'); + }, - onLoad(){ + async onLoad(){ let that = this; //打开db that.openSqlite(); //初始化,创建表 that.createTable(); + //await that.requestAndroidPermission('android.permission.CAMERA') }, onHide() { let that = this; @@ -95,7 +88,6 @@ that.$refs.scanComponent.remotePause(); } - //that.hasPermission = false; }, onUnload() { let that = this; @@ -104,24 +96,43 @@ }, methods: { - //判断是否有相机权限 + // //判断是否有相机权限 async requestAndroidPermission(permisionID) { let that = this; var result = await permision.requestAndroidPermission(permisionID) console.log('scan判断权限结果',result) - that.hasPermission = true; - if (result == 0) { + if (result == '0') { //无权限,跳转到引导打开权限 that.jumpToRights('/pages/rights/RightsOpen'); - }else if(result == -1) { - //禁止权限,跳转到权限设置页面 - that.jumpToRights('/pages/rights/RightsSetting'); - }else{ + }else if(result == '1'){ //有权限,跳转到扫码界面 that.jumpToRights('/pages/scan/Scan'); + }else{ + //返回空,跳转rightsOpen授权页面 + that.jumpToRights('/pages/rights/RightsOpen'); } }, + //判断是否有相机权限 + // requestAndroidPermission(permisionID) { + // let that = this; + // var result = permision.queryRightsSettingPermission(permisionID) + // console.log('scan判断权限结果',result) + // that.hasPermission = true; + // if (result == 0) { + // //无权限,跳转到引导打开权限 + // that.jumpToRights('/pages/rights/RightsOpen'); + // }else if(result == -1) { + // //禁止权限,跳转到权限设置页面 + // that.jumpToRights('/pages/rights/RightsSetting'); + // }else{ + // //有权限,跳转到扫码界面 + // that.jumpToRights('/pages/scan/Scan'); + // } + // }, + + + // 识别完成回调 ------ res.detail.data是组装好的数据 scanResult(res) { console.log(res.detail.data) @@ -154,9 +165,6 @@ }else if(type === 'email'){ that.jumpToPage('/pages/scan/Email','scan',JSON.stringify(result)) } - // else if(type === 3){ - // that.jumpToPage('/pages/scan/Book','scan',JSON.stringify(result)) - // } else if(type === 'tel_phone'){ that.jumpToPage('/pages/scan/Tel','scan',JSON.stringify(result)) }else if(type === 'article'){ @@ -303,23 +311,6 @@ url: url }) }, - - //mlkit扫码 - // scanCode(){ - // let that = this; - // var mlscan = uni.requireNativePlugin("JY-MLScanSDK"); - // //console.log(mlscan) - // mlscan.startScan(res=> { - // that.analyserCode(res); - // // uni.showToast({ - // // icon:'none', - // // title:JSON.stringify(res) - // // }) - - - // }) - // }, - } } diff --git a/pages/scan/Sms.vue b/pages/scan/Sms.vue index a3bb099..0e2a821 100644 --- a/pages/scan/Sms.vue +++ b/pages/scan/Sms.vue @@ -59,7 +59,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Tel.vue b/pages/scan/Tel.vue index 46a4eef..7176080 100644 --- a/pages/scan/Tel.vue +++ b/pages/scan/Tel.vue @@ -63,7 +63,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Text.vue b/pages/scan/Text.vue index bb97207..fb6c275 100644 --- a/pages/scan/Text.vue +++ b/pages/scan/Text.vue @@ -67,7 +67,7 @@ // openFont: 'More', // closeFont: 'Close', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Url.vue b/pages/scan/Url.vue index f523fe1..8001d83 100644 --- a/pages/scan/Url.vue +++ b/pages/scan/Url.vue @@ -58,7 +58,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/pages/scan/Wifi.vue b/pages/scan/Wifi.vue index 72a4657..30c1260 100644 --- a/pages/scan/Wifi.vue +++ b/pages/scan/Wifi.vue @@ -59,7 +59,7 @@ tableName: 'scan_code', textImgUrl: '', - starRateValue: 5, //评分星星数量 + starRateValue: 0, //评分星星数量 showStarTip: false, //评分展示开关 startTipColor: '#706F6F', //评分弹窗背景色 startTipFontColor: '#fff' //评分文字色 diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png new file mode 100644 index 0000000..bfebb78 Binary files /dev/null and b/unpackage/res/icons/1024x1024.png differ diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png new file mode 100644 index 0000000..4e45142 Binary files /dev/null and b/unpackage/res/icons/144x144.png differ diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png new file mode 100644 index 0000000..462d1eb Binary files /dev/null and b/unpackage/res/icons/192x192.png differ diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png new file mode 100644 index 0000000..3691317 Binary files /dev/null and b/unpackage/res/icons/72x72.png differ diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png new file mode 100644 index 0000000..94938ec Binary files /dev/null and b/unpackage/res/icons/96x96.png differ