fix: 统计兼容微信小程序

17c60ea2 · mehaotian · 5c7a9554 · 17c60ea2 · 17c60ea2 · 17c60ea2
11 changed file
--- a/App.uvue
+++ b/App.uvue
@@ -47,7 +47,7 @@
      //   entryTypes: ['render', 'navigation'],
      // } as PerformanceObserverOptions)
      // 统计上报 - 应用启动
-      // #ifdef APP-ANDROID || APP-IOS || WEB
+      // #ifdef APP-ANDROID || APP-IOS || WEB || MP-WEIXIN
      uni.report({
      	name: 'uni-app-launch',
      	options: res,
@@ -87,7 +87,7 @@
      setLifeCycleNum(state.lifeCycleNum + 100)
      console.log('App Show')

-      // #ifdef APP-ANDROID || APP-IOS || WEB
+      // #ifdef APP-ANDROID || APP-IOS || WEB || MP-WEIXIN
      // 统计上报 - 应用显示
      uni.report({
      	name: 'uni-app-show',
@@ -104,7 +104,7 @@
      setLifeCycleNum(state.lifeCycleNum - 100)
      console.log('App Hide')

-      // #ifdef APP-ANDROID || APP-IOS || WEB
+      // #ifdef APP-ANDROID || APP-IOS || WEB || MP-WEIXIN
      // 统计上报 - 应用进入后台
      uni.report({
      	name: 'uni-app-hide',
@@ -141,7 +141,7 @@
    // #endif
    onError(err : any) {
      // console.log('App onError', err)
-      // #ifdef APP-ANDROID || APP-IOS || WEB
+      // #ifdef APP-ANDROID || APP-IOS || WEB || MP-WEIXIN
    	// 统计上报 - 应用发生错误
    	uni.report({
    		name: 'uni-app-error',

--- a/main.uts
+++ b/main.uts
 // 仅测试 console.log 时机问题
 import './test-main-console.uts'
-// #ifdef APP-ANDROID || APP-IOS || WEB
+// #ifdef APP-ANDROID || APP-IOS || WEB || MP-WEIXIN
 import { uniStat } from '@/uni_modules/uni-stat/plugin.uts'
 // #endif
 import App from './App.uvue'
@@ -19,7 +19,7 @@ const uniStatOptions = {

 export function createApp() {
  const app = createSSRApp(App)
-  // #ifdef APP-ANDROID || APP-IOS || WEB
+  // #ifdef APP-ANDROID || APP-IOS || WEB || MP-WEIXIN
  app.use(uniStat, uniStatOptions)
  // #endif
  // app.mixin({

--- a/uni_modules/uni-stat/changelog.md
+++ b/uni_modules/uni-stat/changelog.md
+## 1.0.4（2024-12-12）
+- 新增 自HBuilderX 4.41+ 起支持微信小程序
+## 1.0.3（2024-11-18）
+- 优化 uni统计兼容性问题
+## 1.0.2（2024-11-18）
+- 优化 uni统计兼容性问题
+## 1.0.1（2024-11-18）
+- 修改兼容性
+## 1.0.0（2024-11-18）
+- 新增 uni统计 for uni-app x
--- a/uni_modules/uni-stat/package.json
+++ b/uni_modules/uni-stat/package.json
 {
 	"id": "uni-stat",
-	"displayName": "uni-stat",
-	"version": "1.0.0",
-	"description": "uni-stat",
+	"displayName": "uni统计 for uni-app x",
+	"version": "1.0.4",
+	"description": "uni统计的uni-app x 版本",
 	"keywords": [
-		"uni-stat"
+        "uni-stat",
+        "统计",
+        "uni统计"
    ],
-	"repository": "",
+	"repository": "https://gitcode.net/dcloud/uni-api",
 	"engines": {
-		"HBuilderX": "^3.6.8"
+		"HBuilderX": "^4.33"
 	},
 	"dcloudext": {
 		"type": "uts",
@@ -24,9 +26,9 @@
 			"qq": ""
 		},
 		"declaration": {
-			"ads": "",
-			"data": "",
-			"permissions": ""
+			"ads": "无",
+			"data": "采集页面路由\n采集页面停留时长\n采集常用设备信息",
+			"permissions": "无"
 		},
 		"npmurl": ""
 	},
@@ -47,46 +49,51 @@
 		"encrypt": [],
 		"platforms": {
 			"cloud": {
-				"tcb": "u",
-				"aliyun": "u",
-				"alipay": "u"
+				"tcb": "y",
+				"aliyun": "y",
+				"alipay": "y"
 			},
 			"client": {
 				"Vue": {
-					"vue2": "u",
-					"vue3": "u"
+					"vue2": "n",
+					"vue3": "y"
 				},
 				"App": {
-					"app-android": "u",
-					"app-ios": "u"
+                    "app-android": {
+                        "minVersion": "24"
+                    },
+                    "app-ios": {
+                        "minVersion": "9"
+                    },
+                    "app-harmony": "n"
                },
 				"H5-mobile": {
-					"Safari": "u",
-					"Android Browser": "u",
-					"微信浏览器(Android)": "u",
-					"QQ浏览器(Android)": "u"
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
 				},
 				"H5-pc": {
-					"Chrome": "u",
-					"IE": "u",
-					"Edge": "u",
-					"Firefox": "u",
-					"Safari": "u"
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
 				},
 				"小程序": {
-					"微信": "u",
-					"阿里": "u",
-					"百度": "u",
-					"字节跳动": "u",
-					"QQ": "u",
-					"钉钉": "u",
-					"快手": "u",
-					"飞书": "u",
-					"京东": "u"
+					"微信": "n",
+					"阿里": "n",
+					"百度": "n",
+					"字节跳动": "n",
+					"QQ": "n",
+					"钉钉": "n",
+					"快手": "n",
+					"飞书": "n",
+					"京东": "n"
 				},
 				"快应用": {
-					"华为": "u",
-					"联盟": "u"
+					"华为": "n",
+					"联盟": "n"
 				}
 			}
 		}

--- a/uni_modules/uni-stat/readme.md
+++ b/uni_modules/uni-stat/readme.md
@@ -4,7 +4,7 @@
 >
 > uni统计for uni-app x需要单独下载使用，无需在 manifest.json 中配置开关，只需在前端代码中配置即可。
 >
-> 依赖 `Hbuilder X Alpha版 4.32+`。
+> 依赖 `Hbuilder X Alpha版 4.33+`。

-uni统计`uni-app x`版本，[使用教程](https://uniapp.dcloud.net.cn/uni-stat-uniappx)
+uni统计 for `uni-app x` [使用教程](https://uniapp.dcloud.net.cn/uni-stat-uniappx)

--- a/uni_modules/uni-stat/utssdk/common/core/report.uts
+++ b/uni_modules/uni-stat/utssdk/common/core/report.uts
@@ -160,6 +160,11 @@ export class Report {
      path: (options as OnLaunchOptions).path,
      cst: ReprotCstType.AppNormal
    }
+    // #ifdef MP-WEIXIN
+    // TODO 安卓没有 scene ，需要补一个
+    // @ts-ignore
+    request_option.scene = (options as OnLaunchOptions).scene
+    // #endif

    // 上报数据
    this.sendAppRequest(request_option, true)
@@ -339,6 +344,8 @@ export class Report {
    // TODO ，此处处理的值有问题，
    // 如果页面有参数 需要上传如：/xxx/xxx?{xx:xx,xxx:xxx} 格式的值
    let query = is_opt ? '?' + JSON.stringify(options.query) : ''
+    // 获取首次访问时间
+    const first_time = get_first_visit_time()
    // 获取应用最后访问时间
    const last_time = get_last_visit_time()
    // 非老用户
@@ -350,14 +357,12 @@ export class Report {
      if (!have_device) {
        this.statData.odid = odid
      }
-
    }
-
    this.statData.lt = ReportType.AppStart
    this.statData.url = options.path + query
    this.statData.t = get_time()
    this.statData.sc = get_scene(options)
-    this.statData.fvts = get_first_visit_time()
+    this.statData.fvts = first_time
    this.statData.lvts = last_time
    this.statData.tvc = get_total_visit_count()
    this.statData.cst = options.cst ?? ReprotCstType.AppNormal
@@ -564,10 +569,10 @@ export class Report {

    if (statConfig.debug!) {
      // 待上传消息对列
-      console.log(`=== 统计待上传队列数据 ===`)
+      // console.log(`=== 统计待上传队列数据 ===`)
      const statJSON = Map2Json(uniStatData)
-      console.log(statJSON)
-      console.log(`=== 采集结束 ===`)
+      console.log('=== 统计待上传队列数据 :', statJSON)
+      // console.log(`=== 采集结束 ===`)
    }


@@ -616,15 +621,15 @@ export class Report {
        .report(options)
        .then(() => {
          if (statConfig.debug!) {
-            console.log(`=== 统计队列数据上报 ===`)
-            console.log(options)
-            console.log(`=== 上报结束 ===`)
+            console.log(`=== 统计队列数据上报 :`, options)
+            // console.log(options)
+            // console.log(`=== 上报结束 ===`)
          }
        })
        .catch((err : any | null) => {
-          console.log('=== 统计上报错误 ===')
-          console.error(err)
-          console.log(`=== 上报结束 ===`)
+          console.log('=== 统计上报错误 :', JSON.stringify(err))
+          // console.error(err)
+          // console.log(`=== 上报结束 ===`)
        })
    }


--- a/uni_modules/uni-stat/utssdk/common/core/stat.uts
+++ b/uni_modules/uni-stat/utssdk/common/core/stat.uts
@@ -109,7 +109,6 @@ export class Stat {
    this.isHide = false
    // @ts-ignore
    const mptype = is_page(appInstance)
-
    // 页面执行，应用需要手动调用
    if (mptype) {
      this.registerEvent(StatType.LifeCyclePageShow, appInstance, null)

--- a/uni_modules/uni-stat/utssdk/common/utils/db.uts
+++ b/uni_modules/uni-stat/utssdk/common/utils/db.uts
@@ -5,7 +5,6 @@ export function dbSet<T>(name : string, value : T) {
 	if (data != null && typeof data == 'object') {
 		newData = data as UTSJSONObject
 	}
-	
 	newData[name] = value
 	uni.setStorageSync('$$STAT__DBDATA:' + APPID, newData)
 }
@@ -20,7 +19,7 @@ export function dbGet<T>(name : string) : T | null {

 export function dbRemove(name : string) {
 	let data = uni.getStorageSync('$$STAT__DBDATA:' + APPID)
-	if(data == '') {
+	if (data == '') {
 		data = {}
 	}
 	if (data != null) {

--- a/uni_modules/uni-stat/utssdk/common/utils/index.uts
+++ b/uni_modules/uni-stat/utssdk/common/utils/index.uts
 // AppShowReportParams, AppHideReportParams, PageReportParams,
 import { StatDefault } from '../../interface.uts'

-import { AppShowParamsKeys, AppHideParamsKeys, PageShowParamsKeys, PushParamsKeys, EventParamsKeys,ErrorParamsKeys } from '../core/stat-type.uts'
+import { AppShowParamsKeys, AppHideParamsKeys, PageShowParamsKeys, PushParamsKeys, EventParamsKeys, ErrorParamsKeys } from '../core/stat-type.uts'

 /**
 * 序列化url参数
@@ -81,16 +81,16 @@ export function Log(data : StatDefault, type : Boolean = false) {
 	}

 	if (type) {
-		console.log(`=== 统计队列数据上报 ===`)
-		console.log(logData)
-		console.log(`=== 上报结束 ===`)
+		console.log(`=== 统计队列数据上报 :`, logData)
+		// console.log(logData)
+		// console.log(`=== 上报结束 ===`)
 		return
 	}

 	if (msg_type != '') {
-		console.log(`=== 统计数据采集：${msg_type} ===`)
-		console.log(logData)
-		console.log(`=== 采集结束 ===`)
+		console.log(`=== 统计数据采集：${msg_type} :`,logData)
+		// console.log(logData)
+		// console.log(`=== 采集结束 ===`)
 	}
 }


--- a/uni_modules/uni-stat/utssdk/common/utils/pageInfo.uts
+++ b/uni_modules/uni-stat/utssdk/common/utils/pageInfo.uts
@@ -7,40 +7,6 @@ import { Serialize, IsNumber } from './index.uts'

 const APPID = sys.appId
 const RUNTIME_VERSION = sys.appVersion
-// const UUID_KEY = '__DC_STAT_UUID'
-// const UUID_VALUE = '__DC_UUID_VALUE'
-
-/**
- * 生成uuid，一般用不到
- */
-// function getUuid() : string {
-// 	let uuid : string
-// 	if (get_platform_name() === 'n') {
-// 		try {
-// 			uuid = sys.deviceId
-// 		} catch (e) {
-// 			uuid = ''
-// 		}
-// 		return uuid
-// 	}
-
-// 	try {
-// 		uuid = uni.getStorageSync(UUID_KEY) as string
-// 	} catch (e) {
-// 		uuid = UUID_VALUE
-// 	}
-
-// 	if (uuid != '') {
-// 		uuid = Date.now() + '' + Math.floor(Math.random() * 1e7)
-// 		try {
-// 			uni.setStorageSync(UUID_KEY, uuid)
-// 		} catch (e) {
-// 			uni.setStorageSync(UUID_KEY, UUID_VALUE)
-// 		}
-// 	}
-// 	return uuid
-// }
-

 /**
 * 获取uuid
@@ -163,35 +129,17 @@ export const get_channel = () : string => {
 /**
 * 获取小程序场景值
 */
-export const get_scene = (_ : OnLaunchOptionsWithCst) : number => {
-	// TODO 场景值获取有问题 ，暂时硬编码，需要修改
-	// options : OnLaunchOptionsWithCst
+export const get_scene = (options : OnLaunchOptionsWithCst) : number => {
 	// const platformName = get_platform_name()
-	// let scene = ''
-	// if (options) {
-	// 	return options
-	// }
-	// if (platformName === 'wx') {
-	// 	scene = uni.getLaunchOptionsSync().scene
+	let scene = 1001
+	if (options.scene != null) {
+		return options.scene ?? 1001
+	}
+	// if (platformName == 'wx') {
+	// 	// @ts-ignore
+	// 	scene = uni.getLaunchOptionsSync()?.scene ?? 1001
 	// }
-	// return scene
-	// return options.scene as number
-	return 1001
-}
-
-/**
- * 获取页面类型
- * @param {VueComponent} appInstance 页面实例
- */
-// @ts-ignore
-export const get_page_types = (appInstance : ComponentPublicInstance) : string => {
-	// TODO 暂时无法获取是否应用还是页面，写的硬编码，只支持页面调用
-	// #ifdef WEB || APP-IOS
-	return appInstance?.$mpType ?? 'page'
-	// #endif
-	// #ifndef WEB
-	return 'page'
-	// #endif
+	return scene
 }

 /**
@@ -200,15 +148,14 @@ export const get_page_types = (appInstance : ComponentPublicInstance) : string =
 */
 // @ts-ignore
 export const is_page = (appInstance : ComponentPublicInstance) : Boolean => {
-	// #ifdef WEB ||APP-IOS
+	// #ifdef WEB || APP-IOS || MP-WEIXIN
 	const type = appInstance?.$mpType ?? 'page'
 	return type == 'page' ? true : false
 	// #endif
-	// #ifndef WEB
+	// #ifndef WEB || APP-IOS || MP-WEIXIN
 	// 其他平台没有 $mpType ，只有页面触发
 	return true
 	// #endif
-
 }


@@ -218,10 +165,16 @@ export const is_page = (appInstance : ComponentPublicInstance) : Boolean => {
 */
 export const get_page_name = (routepath : string) : string => {
 	let page = get_page_vm()
-
 	if (page == null) return ''
+	let route : string
+	// #ifdef MP-WEIXIN
+	route = (page.$scope && page.$scope.route) ?? ""
+	// #endif
+	// #ifndef MP-WEIXIN
+	route = page.route
+	// #endif

-	if (page.route != routepath) {
+	if (route != routepath) {
 		const pages = getCurrentPages()
 		// 如果传入路由与当前页面不同，则从页面栈找一个，如果找不到返回空
 		let page_now = pages.find((p) : boolean => p.route == routepath)
@@ -231,11 +184,19 @@ export const get_page_name = (routepath : string) : string => {
 		// @ts-ignore
 		page = page_now.vm!
 	}
-
+	let titleText : string
+	// #ifdef MP-WEIXIN
+	// @ts-ignore
+	const title_json = process.env.UNI_STAT_TITLE_JSON
+	titleText = title_json[route] ?? ''
+	// #endif
+	// #ifndef MP-WEIXIN
 	// @ts-ignore
 	const pageStyle = (page.$page as UniPage).getPageStyle()
-	const titleText = pageStyle['navigationBarTitleText'] ?? ''
+	titleText = (pageStyle['navigationBarTitleText'] as string)
+	// #endif
 	return titleText as string
+
 }

 /**
@@ -267,23 +228,39 @@ export function get_route(page : Page | null = null) : RouteParams {
 		}
 		return data
 	}
-
+	let url_params : string
+	let options : any
+	// #ifdef MP-WEIXIN
+	options = _self.$scope.options
+	// #endif
+	// #ifndef MP-WEIXIN
+	options = _self.options
+	// #endif
 	// TODO 条件编译处理参数问题，安卓上 options返回的是map，需要处理成 utsobject
 	// #ifdef APP-ANDROID
-	const opts = new UTSJSONObject(_self.options)
+	const opts = new UTSJSONObject(options)
 	// TODO 上报页面参数需要处理
-	let url_params = Serialize(opts)
+	url_params = Serialize(opts)
 	// #endif
 	// #ifndef APP-ANDROID
 	// @ts-ignore
-	let url_params = Serialize(_self.options)
+	url_params = Serialize(options)
 	// #endif
 	let params = ''
 	// 如果参数只有 ？则说明没有参数
 	if (url_params != '?') {
 		params = url_params
 	}
-	let route = _self.route
+
+	// 兼容不同小程序下的不同取值
+	let route : string
+
+	// #ifdef MP-WEIXIN
+	route = (_self.$scope && _self.$scope.route) ?? ""
+	// #endif
+	// #ifndef MP-WEIXIN
+	route = _self.route
+	// #endif

 	const data : RouteParams = {
 		path: route,
@@ -394,15 +371,13 @@ export const get_report_Interval = (defaultTime : number) : number => {
 	return time as number
 }

-
-
 /**
 * 获取uniCloud服务空间配置
 * @returns {Object}
 */
 export const uni_cloud_config = () : UniCloudInitOptions | null => {
+	// TODO 当前版本暂时不使用
 	// return process.env.UNI_STAT_UNI_CLOUD || {}
-	// const custemUnicloudConfig: = {}
 	return null
 }


--- a/uni_modules/uni-stat/utssdk/common/utils/pageTime.uts
+++ b/uni_modules/uni-stat/utssdk/common/utils/pageTime.uts
@@ -63,6 +63,7 @@ export const get_last_visit_time = () : number => {
 	if (timeStorge != null && timeStorge != 0) {
 		time = timeStorge as number
 	}
+	
 	dbSet(LAST_VISIT_TIME_KEY, get_time())
 	return time
 }