diff --git a/scanner/pages/camera/camera.js b/scanner/pages/camera/camera.js index dcc404a..d202c31 100644 --- a/scanner/pages/camera/camera.js +++ b/scanner/pages/camera/camera.js @@ -346,10 +346,10 @@ Page({ }); const ctx = wx.createCameraContext(); this.log(`camera set initial zoom to ${initial_zoom}x, will zoom in to ${rule.zoom}x when qr is found`); - ctx.setZoom({ zoom: 2 }); + ctx.setZoom({ zoom: initial_zoom }); this.on_qr_found = () => { this.log(`qr found, zoom to ${rule.zoom}x`); - ctx.setZoom({ zoom: 6 }); + ctx.setZoom({ zoom: rule.zoom }); this.setData({ zoom: rule.zoom, qrmarkers_class: "", diff --git a/scanner/pages/camwebview/camwebview.js b/scanner/pages/camwebview/camwebview.js index 9f2acfb..985376e 100644 --- a/scanner/pages/camwebview/camwebview.js +++ b/scanner/pages/camwebview/camwebview.js @@ -15,6 +15,7 @@ function make_query(zoom, ai_chat_mode) { ret += "&nick_name=" + encodeURIComponent(ui.nickName || ""); ret += "&tenant=" + (gd.tenant_id || ""); ret += "&tk=" + Date.now(); + ret += "&skip_angle_check=1"; if (ai_chat_mode) { ret += "&ai_chat_mode=" + ai_chat_mode; } diff --git a/scanner/upload.js b/scanner/upload.js index 3ea0202..c326b3a 100644 --- a/scanner/upload.js +++ b/scanner/upload.js @@ -41,10 +41,11 @@ function do_upload(image_data_url, success, fail, log) { nick_name: ui.nickName, realip: gd.real_ip, qrcode: gd.qr_code, - angle: gd.angle, + angle: 0, phonemodel: gd.phone_model, image_data_url, use_roi_verify: 1, + skip_angle_check: 1, log, }; var ci = gd.caller_info;