From e9ee7f7af00945a40214f33dd626e82447b2db96 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Thu, 21 Apr 2022 18:45:46 +0800 Subject: [PATCH] ar --- app.js | 15 ++++++- app.json | 8 +++- pages/AR/crsClient.js | 3 -- pages/AR/index.js | 17 ++----- pages/AR/index.wxml | 7 +-- pages/index/index.wxss | 2 +- pages/middle/index.js | 99 +++++++++++++++++++++++++++++++++++++++++ pages/middle/index.json | 3 ++ pages/middle/index.wxml | 3 ++ pages/middle/index.wxss | 0 utils/umtrack-wx.js | 1 + 11 files changed, 132 insertions(+), 26 deletions(-) create mode 100644 pages/middle/index.js create mode 100644 pages/middle/index.json create mode 100644 pages/middle/index.wxml create mode 100644 pages/middle/index.wxss create mode 100644 utils/umtrack-wx.js diff --git a/app.js b/app.js index 130cdb6..2d0bb0e 100644 --- a/app.js +++ b/app.js @@ -1,11 +1,24 @@ // app.js +import './utils/umtrack-wx'; +// import "./components/umtrack-wx"; +// require('umtrack-wx'); App({ + umengConfig: { + appKey: '6260d691d024421570c69177', //由友盟分配的APP_KEY + // 使用Openid进行统计,此项为false时将使用友盟+uuid进行用户统计。 + // 使用Openid来统计微信小程序的用户,会使统计的指标更为准确,对系统准确性要求高的应用推荐使用Openid。 + useOpenid: true, + // 使用openid进行统计时,是否授权友盟自动获取Openid, + // 如若需要,请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret + autoGetOpenid: false, + debug: true, //是否打开调试模式 + uploadUserInfo: true // 自动上传用户信息,设为false取消上传,默认为false + }, onLaunch() { // 展示本地存储能力 const logs = wx.getStorageSync('logs') || [] logs.unshift(Date.now()) wx.setStorageSync('logs', logs) - // 登录 wx.login({ success: res => { diff --git a/app.json b/app.json index 2af4bc6..d08d923 100644 --- a/app.json +++ b/app.json @@ -1,9 +1,10 @@ { "pages": [ + "pages/middle/index", "pages/index/index", + "pages/rank/index", "pages/out/index", "pages/login/index", - "pages/rank/index", "pages/AR/index", "components/loading/loading" ], @@ -15,5 +16,8 @@ }, "style": "v2", "sitemapLocation": "sitemap.json", - "lazyCodeLoading": "requiredComponents" + "lazyCodeLoading": "requiredComponents", + "navigateToMiniProgramAppIdList": [ + "wx889437c94c0bcc90" + ] } \ No newline at end of file diff --git a/pages/AR/crsClient.js b/pages/AR/crsClient.js index 60e313b..5c8cf05 100644 --- a/pages/AR/crsClient.js +++ b/pages/AR/crsClient.js @@ -3,13 +3,11 @@ export class CrsClient { * @param config { {cloudKey: string, token: string, clientHost: string, jpegQuality: number} } * @param canvas { HTMLCanvasElement } */ - constructor(config, canvas) { this.config = config; this.canvas = canvas; this.context = canvas.getContext('2d'); } - /** * 发起一次CRS请求 * @param frame { {data: ArrayBuffer, height: number, width: number} } 相机帧 @@ -28,7 +26,6 @@ export class CrsClient { this.context.putImageData(ctxImageData, 0, 0); //#1 let dataUrl = this.canvas.toDataURL("image/jpeg", this.config.quality); //#2 let base64 = dataUrl.substr(23); //#2 去除dataURL头,留下文件内容 - const params = { //#3 添加cloudKey参数 image: base64, notracking: "true", diff --git a/pages/AR/index.js b/pages/AR/index.js index a23364d..dbd2773 100644 --- a/pages/AR/index.js +++ b/pages/AR/index.js @@ -28,18 +28,16 @@ Page({ }, //识别到这个数组中的ID就触发内容 targetIds: [ - "TODO 云识别管理 - 某个图库 - 识别图 - 某个识别图的ID", + "", "79014ee9-60c7-4a0c-81ed-0d5889a7ecc9" ], showLoading: false, showLoadingText: "", }, - /** @type {CameraFrameListener} 相机帧回调 */ listener: undefined, /** @type {HTMLCanvasElement} canvas对象 */ canvas: undefined, - /** @type {boolean} 是否需要持续识别,在点击“识别体验”之后和识别成功之前为true */ runningCrs: undefined, /** @type {boolean} 当前是否正在进行CRS请求 */ @@ -50,8 +48,6 @@ Page({ last: undefined, onLoad: function () { - let base64 ='aHR0cHM6Ly93d3cuYmFpZHUuY29tLw==' - }, onReady: function () { if (systemInfo.platform === "devtools") { //开发工具不会触发initdone事件,于是在onReady手动触发 @@ -140,6 +136,7 @@ Page({ this.hideLoading(); let base64 = result.target.meta let web = this.base64_decode(base64) + // 解析跳转链接 wx.navigateTo({ url: '../out/index?web=' + web + '&index=2', }) @@ -202,7 +199,6 @@ Page({ }); }, queryToken: function() { // 获取token - let that = this return new Promise((resolve, reject) => { wx.request({ url: 'https://cktest.2weisou.com/meta/ar/ar/getToken', @@ -212,14 +208,7 @@ Page({ 'content-type': 'application/json' }, success: res => resolve(res.data), - fail: err => reject(err), - // success: res => { - // that.data.config.token = res.data - // console.log(that.data.config.token); - // }, - // fail: err =>{ - // console.log(err,'失败'); - // } + fail: err => reject(err) }); }); }, diff --git a/pages/AR/index.wxml b/pages/AR/index.wxml index 4286ad2..1079857 100644 --- a/pages/AR/index.wxml +++ b/pages/AR/index.wxml @@ -6,21 +6,18 @@ resolution="high" flash="off"/> - - - + -