X

宋庆平
1 parent c0c82ab4
Showing 5 changed files with 17 additions and 24 deletions Show diff stats
sdk/shareTools.ts
wxsdk/base/SDKConst.ts
wxsdk/http/SDKApi.ts
wxsdk/service/DataService.ts
wxsdk/service/LogService.ts
-import { WxHelper } from "../Base/WxHelper";
 import WXSDK from "../wxsdk/WXSDK";
-import { OnlineKeys, SDKTools } from "./SDKTools";
-
 /*
 * 分享与视频工具类;
 */
 export class ShareTools {
-    private static isFail: boolean = false;
     /**
      * 是否进入分享  onShow有插屏的话用这个判断
      */
@@ -29,24 +25,6 @@ export class ShareTools {
             this.onShowAd = false;
             params && params.success && params.success(res);
         }).catch(async err => {
-            console.log("err", err)
-            if (err && err.code && err.code === 1006) {
-                if (Math.random() > SDKTools.getParamsInt(OnlineKeys.shareRandom, 1) && !this.isFail) {
-                    this.isFail = true;
-                    let modalRes = await WxHelper.showModal({
-                        title: '分享失败',
-                        content: `${Math.random() > 0.5 ? '分享失败,请重新分享！' : '请分享其它群试试！'}`,
-                        showCancel: true,
-                        confirmText: '去分享'
-                    })
-                    if (modalRes) {
-                        ShareTools.share(shareKey, params, opts);
-                        return
-                    }
-                } else {
-                    this.isFail = false;
-                }
-            }
             this.onShowAd = false;
             if (!params || !params.fail) {
                 wx.showToast({
@@ -4,7 +4,7 @@ export const GAMEDATA = {
   game_id: '10001',//游戏id
   channel_id: '10001',//渠道id 暂时和游戏id一致
   version: '1.0.1', //版本号 中台控制正式还是测试服，尽量保持和小游戏版本一致
-  appkey: 'd959274a83ea3b95bd1d9b765683eff6',//中台appkey
+  appkey: 'd959274a83ea3b95bd1d9b765683e777',//中台appkey
   interstitialAdId: 'adunit-4bd19de3c351233e',//插屏ID
   bannerId: 'adunit-25341fff11681315',//banner
   customId: 'adunit-193590de82ede6a4',//原生模板单个
@@ -33,8 +33,9 @@ export const GAMEDATA = {
 }
  
  
+
 // sdk版本
-export const SDKVersion = 'v1.0.5';
+export const SDKVersion = 'v1.0.6';
 // 是否打印
 export const __LOG__ = false;
 // 是否mock
@@ -88,6 +89,7 @@ export const HostKeys = {
   role: 'logstores/role/track',                //创建角色
   client_log: 'logstores/client_log/track',    //客户端日志
   consume: 'logstores/consume/track',          //资源上报
+  daystay: 'logstores/daystay/track',          //300s停留上报
  
   //登录
   Login: 'api/login',                         //登录
@@ -67,6 +67,8 @@ export class SDKApi {
     public static client_log = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.client_log, ...args);
  
     public static consume = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.consume, ...args);
+    
+    public static daystay = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.daystay, ...args);
  
  
     // OrderApi 
@@ -4,6 +4,7 @@ import StorageUtils from &quot;../utils/StorageUtils&quot;;
 import { StorageKeys, GAMEDATA, LoginHost, GameHost, DotHost, OrderHost, GMHost } from "../base/SDKConst";
 import { Gender, NetworkType } from "../base/SDKEnum";
 import WxLaunch from "../wx/WxLaunch";
+import LogService from "./LogService";
  
 /**
  * SDK数据管理类
@@ -539,6 +540,7 @@ export default class DataService {
         if (time >= 300 && dot == 0) {
             StorageUtils.I.set("pcsdk_today_online_time_300", 1, expiration);
             this.setPtm(1)
+            LogService.I.daystay();
             clearInterval(this.timeInterval);
             // 定时重启
             setTimeout(() => {
@@ -501,6 +501,15 @@ export default class LogService {
         })
         this.checkLogin(fun);
     }
+    /**
+     * 300s停留上报
+     */
+    daystay() {
+        let fun = () => SDKApi.daystay({
+            ...this.buildParams(),
+        })
+        this.checkLogin(fun);
+    }
  
  
     /**
1		-import { WxHelper } from "../Base/WxHelper";
2	1	import WXSDK from "../wxsdk/WXSDK";
3		-import { OnlineKeys, SDKTools } from "./SDKTools";
4		-
5	2	/*
6	3	* 分享与视频工具类;
7	4	*/
8	5	export class ShareTools {
9		- private static isFail: boolean = false;
10	6	/**
11	7	* 是否进入分享 onShow有插屏的话用这个判断
12	8	*/
...	...	@@ -29,24 +25,6 @@ export class ShareTools {
29	25	this.onShowAd = false;
30	26	params && params.success && params.success(res);
31	27	}).catch(async err => {
32		- console.log("err", err)
33		- if (err && err.code && err.code === 1006) {
34		- if (Math.random() > SDKTools.getParamsInt(OnlineKeys.shareRandom, 1) && !this.isFail) {
35		- this.isFail = true;
36		- let modalRes = await WxHelper.showModal({
37		- title: '分享失败',
38		- content: `${Math.random() > 0.5 ? '分享失败,请重新分享！' : '请分享其它群试试！'}`,
39		- showCancel: true,
40		- confirmText: '去分享'
41		- })
42		- if (modalRes) {
43		- ShareTools.share(shareKey, params, opts);
44		- return
45		- }
46		- } else {
47		- this.isFail = false;
48		- }
49		- }
50	28	this.onShowAd = false;
51	29	if (!params \|\| !params.fail) {
52	30	wx.showToast({
...	...
...	...	@@ -4,7 +4,7 @@ export const GAMEDATA = {
4	4	game_id: '10001',//游戏id
5	5	channel_id: '10001',//渠道id 暂时和游戏id一致
6	6	version: '1.0.1', //版本号中台控制正式还是测试服，尽量保持和小游戏版本一致
7		- appkey: 'd959274a83ea3b95bd1d9b765683eff6',//中台appkey
	7	+ appkey: 'd959274a83ea3b95bd1d9b765683e777',//中台appkey
8	8	interstitialAdId: 'adunit-4bd19de3c351233e',//插屏ID
9	9	bannerId: 'adunit-25341fff11681315',//banner
10	10	customId: 'adunit-193590de82ede6a4',//原生模板单个
...	...	@@ -33,8 +33,9 @@ export const GAMEDATA = {
33	33	}
34	34
35	35
	36	+
36	37	// sdk版本
37		-export const SDKVersion = 'v1.0.5';
	38	+export const SDKVersion = 'v1.0.6';
38	39	// 是否打印
39	40	export const __LOG__ = false;
40	41	// 是否mock
...	...	@@ -88,6 +89,7 @@ export const HostKeys = {
88	89	role: 'logstores/role/track', //创建角色
89	90	client_log: 'logstores/client_log/track', //客户端日志
90	91	consume: 'logstores/consume/track', //资源上报
	92	+ daystay: 'logstores/daystay/track', //300s停留上报
91	93
92	94	//登录
93	95	Login: 'api/login', //登录
...	...
...	...	@@ -67,6 +67,8 @@ export class SDKApi {
67	67	public static client_log = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.client_log, ...args);
68	68
69	69	public static consume = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.consume, ...args);
	70	+
	71	+ public static daystay = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.daystay, ...args);
70	72
71	73
72	74	// OrderApi
...	...
...	...	@@ -4,6 +4,7 @@ import StorageUtils from "../utils/StorageUtils";
4	4	import { StorageKeys, GAMEDATA, LoginHost, GameHost, DotHost, OrderHost, GMHost } from "../base/SDKConst";
5	5	import { Gender, NetworkType } from "../base/SDKEnum";
6	6	import WxLaunch from "../wx/WxLaunch";
	7	+import LogService from "./LogService";
7	8
8	9	/**
9	10	* SDK数据管理类
...	...	@@ -539,6 +540,7 @@ export default class DataService {
539	540	if (time >= 300 && dot == 0) {
540	541	StorageUtils.I.set("pcsdk_today_online_time_300", 1, expiration);
541	542	this.setPtm(1)
	543	+ LogService.I.daystay();
542	544	clearInterval(this.timeInterval);
543	545	// 定时重启
544	546	setTimeout(() => {
...	...
...	...	@@ -501,6 +501,15 @@ export default class LogService {
501	501	})
502	502	this.checkLogin(fun);
503	503	}
	504	+ /**
	505	+ * 300s停留上报
	506	+ */
	507	+ daystay() {
	508	+ let fun = () => SDKApi.daystay({
	509	+ ...this.buildParams(),
	510	+ })
	511	+ this.checkLogin(fun);
	512	+ }
504	513
505	514
506	515	/**
...	...