Commit 38c441fb authored by liuxinjun's avatar liuxinjun

更新事件上传机制

parent 88ae3c4a
...@@ -185,7 +185,7 @@ var sdk = { ...@@ -185,7 +185,7 @@ var sdk = {
} }
} }
this.setWeChatListener();
}, },
/** /**
...@@ -287,16 +287,17 @@ var sdk = { ...@@ -287,16 +287,17 @@ var sdk = {
} }
this.setWeChatListener();
} }
}, },
setWeChatListener() setWeChatListener()
{ {
let self =this;
wx.onHide(function(res){ wx.onHide(function(res){
//监听小游戏隐藏到后台事件。锁屏、按 HOME 键退到桌面、显示在聊天顶部等操作会触发此事件。 //监听小游戏隐藏到后台事件。锁屏、按 HOME 键退到桌面、显示在聊天顶部等操作会触发此事件。
console.log("小游戏隐藏到后台"); console.log("小游戏隐藏到后台");
this.uploadSceneEvent(null,'隐藏小游戏到后台',null); self.uploadSceneEvent(null,'隐藏小游戏到后台',null);
}); });
...@@ -314,6 +315,39 @@ var sdk = { ...@@ -314,6 +315,39 @@ var sdk = {
//},10000); //},10000);
}, },
WeChatLoginNoAuth(callback){
//根据sdk_conf初始化api
this.init_api();
var self = this;
if (cc.sys.platform === cc.sys.WECHAT_GAME)
{
var userinfo = this.getUser();
if(userinfo){
console.log("sdk 直接进入游戏");
//用户信息获取到并且授权了
self.init({},(config)=>{
console.log('sdk 初始化结果:', config);
callback(userinfo);
});
}
else{
//没有用户信息,也没有授权,就应该去登陆并且去授权后调用服务端member/update用户信息
self.WxLogin((userData) => {
self.init({},(config)=>{
console.log('sdk 初始化结果:', config);
callback(userData);
});
});
}
}
},
/** /**
* @apiGroup C * @apiGroup C
* @apiName wxLogin * @apiName wxLogin
...@@ -1846,6 +1880,37 @@ var sdk = { ...@@ -1846,6 +1880,37 @@ var sdk = {
return str; return str;
}, },
getUploadRowCount(){
var res = sdk_conf.default_upload_row_count;
try{
res= this.getConfig4().uploadRowCount;
if(!res)
{
res = sdk_conf.default_upload_row_count;
}
}catch(e)
{
res = sdk_conf.default_upload_row_count;
}
return res;
},
getUploadInterval(){
var res = sdk_conf.default_upload_interval;
try{
res = this.getConfig4().uploadInterval;
if(!res)
{
res = sdk_conf.default_upload_interval;
}
}catch(e)
{
res = sdk_conf.default_upload_interval;
}
return res;
},
/** /**
* @apiGroup C * @apiGroup C
* @apiName uploadSceneEvent * @apiName uploadSceneEvent
...@@ -1855,6 +1920,7 @@ var sdk = { ...@@ -1855,6 +1920,7 @@ var sdk = {
* sdk.uploadSceneEvent(jsonArray,'',null) //将要上传的数据传递过来 * sdk.uploadSceneEvent(jsonArray,'',null) //将要上传的数据传递过来
*/ */
uploadSceneEvent(eventJsonArray,uploadEvent,callbackFunction){ uploadSceneEvent(eventJsonArray,uploadEvent,callbackFunction){
var lastUploadDataTime = this.getItem("lastUploadDataTime"); var lastUploadDataTime = this.getItem("lastUploadDataTime");
var nowTime = new Date().getTime()/1000; var nowTime = new Date().getTime()/1000;
...@@ -1890,17 +1956,17 @@ var sdk = { ...@@ -1890,17 +1956,17 @@ var sdk = {
}else if(eventJsonArray.data.length>=this.getConfig4().uploadRowCount) }else if(eventJsonArray.data.length>=this.getUploadRowCount())
{ {
uploadEvent="数据累计("+this.getConfig4().uploadRowCount+"条)上传"; uploadEvent="数据累计("+this.getUploadRowCount()+"条)上传";
console.log(uploadEvent); console.log(uploadEvent);
this.uploadData(eventJsonArray,uploadEvent,callbackFunction); this.uploadData(eventJsonArray,uploadEvent,callbackFunction);
}else if((nowTime-lastUploadDataTime)>=this.getConfig4().uploadInterval) }else if((nowTime-lastUploadDataTime)>=this.getUploadInterval())
{ {
uploadEvent="定时("+this.getConfig4().uploadInterval+"秒)上传"; uploadEvent="定时("+this.getUploadInterval()+"秒)上传";
console.log(uploadEvent); console.log(uploadEvent);
this.uploadData(eventJsonArray,uploadEvent,callbackFunction); this.uploadData(eventJsonArray,uploadEvent,callbackFunction);
} }
...@@ -1936,7 +2002,7 @@ var sdk = { ...@@ -1936,7 +2002,7 @@ var sdk = {
* @apiParam {String} eventId 事件ID 通常谢按钮的英文或者中文名字,比如:首页-开始闯关 * @apiParam {String} eventId 事件ID 通常谢按钮的英文或者中文名字,比如:首页-开始闯关
* @apiParam {JSON} params 参数相关 * @apiParam {JSON} params 参数相关
* @apiSuccessExample {json} 示例: * @apiSuccessExample {json} 示例:
* sdk.setEvent("点击","首页-开始闯关",{'uid':'8975621'},null) * sdk.setSceneEvent("第一关","点击","首页-开始闯关",{'uid':'8975621'},null)
*/ */
setSceneEvent(sceneName,eventName,eventId,params,callbackFunction){ setSceneEvent(sceneName,eventName,eventId,params,callbackFunction){
...@@ -1958,7 +2024,13 @@ var sdk = { ...@@ -1958,7 +2024,13 @@ var sdk = {
//console.log("已经存在:"+data); //console.log("已经存在:"+data);
} }
insertData.uid=this.getUser().uid; var uid = -1;
try{
uid = this.getUser().uid;
}catch (e) {
uid = -1;
}
insertData.uid=uid;
insertData.scene_name= sceneName; insertData.scene_name= sceneName;
insertData.event_id = eventId; insertData.event_id = eventId;
insertData.event_name =eventName; insertData.event_name =eventName;
......
...@@ -33,7 +33,9 @@ var sdk_conf = { ...@@ -33,7 +33,9 @@ var sdk_conf = {
ip3: "https://log.test.llewan.com", ip3: "https://log.test.llewan.com",
ip4: "https://res.test.llewan.com", ip4: "https://res.test.llewan.com",
} }
} },
default_upload_row_count:20,
default_upload_interval:120,
}; };
module.exports = sdk_conf; module.exports = sdk_conf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment