Skip to content

L
llewan-weixin-sdk
Commit ffaf2695 authored by liuxinjun's avatar liuxinjun
Browse files
Options

规范化sdk日志输出

parent a4620c5b
Show whitespace changes
Inline Side-by-side
Showing with 216 additions and 226 deletions
assets/llewan-weixin-sdk/sdk.js
View file @ ffaf2695
......@@ -80,7 +80,7 @@ var sdk = {
if(!self.ip1)
{
console.error("请调用WechatLogin!");
console.error("sdk 请调用WechatLogin!");
wx.showToast({title: '请先登录',icon:'loading',duration: 8});
return;
}
......@@ -105,13 +105,13 @@ var sdk = {
if (d2 && d2.c == 1) {
self.ShareList = d2.d;
}else{
console.log("初始化分享信息失败：",d2)
console.log("sdk 初始化分享信息失败：",d2)
}
callback(true);
});
}else{
if(self.debug){
console.log("后台配置信息初始化失败，再次初始化：",d)
console.log("sdk 后台配置信息初始化失败,再次初始化：",d)
}
self.init(args, callback);
// return;
......@@ -160,7 +160,7 @@ var sdk = {
wx.getNetworkType({
success(res2){
loginData.network_type = res2.networkType;
console.log("======loginData=======", loginData)
console.log("sdk LoginData", loginData)
self.Get(self.ip3 + self.Logcommon, { log_type: "LoginData", data: JSON.stringify(loginData) }, function (d) {
//很重要防止因为配置获取失败，重复调用
self.initFlag = 1;
......@@ -180,11 +180,8 @@ var sdk = {
/**
* @apiGroup C
* @apiName WeChatLogin
* @api {微信登录} 微信登录 WeChatLogin（登录）
*
* @api {新增、授权、登陆} 微信登录 WeChatLogin 对外提供新增、授权、登陆调用
* @apiSuccessExample {json} 示例:
* // 2.登录页：获取用户信息
* //.调用sdk登录
* sdk.WeChatLogin((d)=>{
* console.log("用户信息：", d)
* // 登录成功：返回用户信息；
......@@ -203,14 +200,14 @@ var sdk = {
var wxauth = this.getItem("wxauth"); //记录微信是否授权
if(userinfo&&wxauth){
console.log("直接进入游戏");
console.log("sdk 直接进入游戏");
//用户信息获取到并且授权了
callback(userinfo)
}else if(userinfo&&!wxauth)
{
//用户信息存在但是没有授权,就应该去授权后调用服务端member/update用户信息
this.WxAuthLogin((d) => {
console.log("授权1");
callback(d);
});
......@@ -218,27 +215,193 @@ var sdk = {
{
//用户信息没有但是有授权，就应该去登陆并且去授权后调用服务端member/update用户信息
this.WxAuthLogin((d) => {
console.log("授权2");
callback(d);
});
}
else{
//没有用户信息，也没有授权，就应该去登陆并且去授权后调用服务端member/update用户信息
this.WxLogin((d) => {
console.log("登陆");
this.WxAuthLogin((d) => {
console.log("授权3");
callback(d);
});
});
}
}
},
//.根据配置初始化api
init_api(type){
/**
* @apiGroup C
* @apiName wxLogin
* @api {新增} 获取设备信息新增用户 wxLogin 不对外提供调用
*
*/
WxLogin(callback){
var self = this;
if (cc.sys.platform === cc.sys.WECHAT_GAME) {
var options = wx.getLaunchOptionsSync();
var referee_id = options.query.uid; //.推荐人id
var source_id = options.query.source_id; //.用户来源id
var source_id2 = options.query.source_id2; //.用户来源子id
var share_id = options.query.share_id; //.分享素材ID
wx.getSystemInfo({
success(res){
wx.login({
success(res2){
var reqData = {
code: res2.code,
referee_id: referee_id,
source_id: source_id,
source_id2: source_id2,
share_id: share_id,
model: res.model,
platform: res.platform,
wx_version: res.version,
network_type: res.networkType,
scene_value: res.scene,
brand: res.brand,
sdk_version: res.SDKVersion,
}
// console.log('==登录参数==', reqData)
self.Post(self.ip1 + self.login, reqData, function(data){
console.log('sdk 新增登陆结果', data);
if(data.c == 1){
self.setItem('userinfo', JSON.stringify(data.d));
callback(data.d);
}else{
// console.log('==登录接口请求失败==', data)
wx.showToast({title: '登录失败请重试'});
}
});
},
fail(){
wx.showToast({title: '登录失败请重试'});
callback(false)
},
});
}
});
}
},
/**
* @apiGroup C
* @apiName wxAuth
* @api {微信授权} 微信授权登录 WxAuthLogin（授权）不对外提供调用
*
*/
WxAuthLogin(callback){
var self = this;
if (cc.sys.platform === cc.sys.WECHAT_GAME) {
var options = wx.getLaunchOptionsSync();
var referee_id = options.query.uid; //.推荐人id
var source_id = options.query.source_id; //.用户来源id
var source_id2 = options.query.source_id2; //.用户来源子id
var share_id = options.query.share_id; //.分享素材ID
var userinfo = this.getUser();
//.登录遮罩背景
var maskNode = new cc.Node('Sprite');
maskNode.parent = cc.director.getScene().getChildByName('Canvas');
maskNode.addComponent(cc.BlockInputEvents)
var sp = maskNode.addComponent(cc.Sprite);
maskNode.opacity = 178;
maskNode.color = new cc.Color(25,88,95,255);
sp.sizeMode = cc.Sprite.SizeMode.CUSTOM;
self.createImage(sp, self.loginBg);
maskNode.width = cc.view.getVisibleSize().width;
maskNode.height = cc.view.getVisibleSize().height;
// console.log(maskNode.width, maskNode.height)
//.微信登录按钮
if(self.button){
self.button.show();
}else{
wx.getSystemInfo({
success(res){
var width = 507/2;
var height = 464/2;
self.button = wx.createUserInfoButton({
type: 'image',
image: self.loginBt,
style: { width: width, height: height, left: res.screenWidth/2-width/2, top: res.screenHeight/2-height/2 }
})
self.button.onTap((res1) => {
// 处理用户拒绝授权的情况
// if (res1.errMsg.indexOf('auth deny') > -1 || res1.errMsg.indexOf('auth denied') > -1 ) {
// wx.showToast();
// }
wx.showToast({title: '登录中...',icon:'loading',duration: 8});
wx.getSetting({
success(auths){
if(auths.authSetting["scope.userInfo"]){
self.setItem("wxauth",1);
console.log('sdk 用户已经授权');
var reqData = {
rawData: res1.rawData,
iv: res1.iv,
encryptedData: res1.encryptedData,
signature: res1.signature,
referee_id: referee_id,
source_id: source_id,
source_id2: source_id2,
share_id: share_id,
}
// console.log('==登录参数==', reqData)
self.Post(self.ip1 + self.modify, reqData, function(data){
console.log('sdk 更新用户信息结果', data)
if(data.c == 1){
self.setItem('userinfo', JSON.stringify(data.d));
wx.hideToast();
maskNode.destroy();
self.button.hide();
//.登录成功，重新初始化
self.userid = data.d.uid;
self.init({},(d)=>{})
callback(data.d);
}else{
// console.log('==登录接口请求失败==', data)
wx.showToast({title: '登录失败请重试'});
}
});
}else{
callback(false)
}
}
})
})
self.button.show()
}
})
}
}
},
/**
* 初始化接口
*/
init_api(){
if(sdk_conf.env==='prod')
{
this.ip1 = sdk_conf.env_apis.prod.ip1;
......@@ -255,10 +418,10 @@ var sdk = {
this.ip4 = sdk_conf.env_apis.test.ip4;
}
console.log("ip1",this.ip1);
console.log("ip2",this.ip2);
console.log("ip3",this.ip3);
console.log("ip4",this.ip4);
console.log("sdk ip1",this.ip1);
console.log("sdk ip2",this.ip2);
console.log("sdk ip3",this.ip3);
console.log("sdk ip4",this.ip4);
},
......@@ -394,7 +557,7 @@ var sdk = {
if(obj.fail){
shareInfo.fail = obj.fail;
}
console.log("wx share", shareInfo);
console.log("sdk 微信分享", shareInfo);
if (cc.sys.platform === cc.sys.WECHAT_GAME) {
wx.shareAppMessage(shareInfo);
......@@ -503,7 +666,7 @@ var sdk = {
if(obj.fail){
shareInfo.fail = obj.fail;
}
console.log("ald share", shareInfo);
console.log("sdk 阿拉丁分享", shareInfo);
if (cc.sys.platform === cc.sys.WECHAT_GAME) {
wx.aldShareAppMessage(shareInfo);
......@@ -627,13 +790,13 @@ var sdk = {
callback(responseJson);
} else {
if(self.debug){
console.log("返回数据不存在",url)
console.log("sdk 返回数据不存在",url)
}
callback(null);
}
} else {
if(self.debug){
console.log("请求失败",url)
console.log("sdk 请求失败",url)
}
callback(null);
}
......@@ -697,13 +860,13 @@ var sdk = {
callback(responseJson);
} else {
if(self.debug){
console.log("返回数据不存在")
console.log("sdk 返回数据不存在")
}
callback(null);
}
} else {
if(self.debug){
console.log("请求失败",xhr)
console.log("sdk 请求失败",xhr)
}
callback(null);
}
......@@ -727,18 +890,18 @@ var sdk = {
const updateManager = wx.getUpdateManager()
updateManager.onCheckForUpdate(function (res) {
if(self.debug){
console.log("请求完新版本信息的回调", res.hasUpdate)
console.log("sdk 请求完新版本信息的回调", res.hasUpdate)
}
})
updateManager.onUpdateReady(function () {
if(self.debug){
console.log("新的版本已经下载好，调用 applyUpdate 应用新版本并重启")
console.log("sdk 新的版本已经下载好，调用 applyUpdate 应用新版本并重启")
}
updateManager.applyUpdate()
})
updateManager.onUpdateFailed(function () {
if(self.debug){
console.log("新的版本下载失败")
console.log("sdk 新的版本下载失败")
}
})
}
......@@ -1070,180 +1233,7 @@ var sdk = {
}
return dataList;
},
/**
* @apiGroup C
* @apiName wxLogin
* @api {微信登录} 微信登录 wxLogin（登录）
*
* @apiSuccessExample {json} 示例:
* // 2.登录页：获取用户信息
* var user = sdk.getUser();
* if(user){
* console.log("用户信息：", user)
* }else{
* //.调用sdk登录
* sdk.wxLogin((d)=>{
* console.log("用户信息：", d)
* // 登录成功：返回用户信息；
* // 登录失败：返回false
* });
* }
*
*/
WxLogin(callback){
var self = this;
if (cc.sys.platform === cc.sys.WECHAT_GAME) {
var options = wx.getLaunchOptionsSync();
var referee_id = options.query.uid; //.推荐人id
var source_id = options.query.source_id; //.用户来源id
var source_id2 = options.query.source_id2; //.用户来源子id
var share_id = options.query.share_id; //.分享素材ID
wx.login({
success(res2){
var reqData = {
code: res2.code,
referee_id: referee_id,
source_id: source_id,
source_id2: source_id2,
share_id: share_id
}
// console.log('==登录参数==', reqData)
self.Post(self.ip1 + self.login, reqData, function(data){
// console.log('==登录结果==', data)
if(data.c == 1){
self.setItem('userinfo', JSON.stringify(data.d));
callback(data.d);
}else{
// console.log('==登录接口请求失败==', data)
wx.showToast({title: '登录失败请重试'});
}
});
},
fail(){
wx.showToast({title: '登录失败请重试'});
callback(false)
},
})
}
},
/**
* @apiGroup C
* @apiName wxAuth
* @api {微信授权} 微信登录 wxAuth（授权）
*
* @apiSuccessExample {json} 示例:
* // 2.登录页：获取用户信息
* var user = sdk.getUser();
* if(user){
* console.log("用户信息：", user)
* }else{
* //.调用sdk登录
* sdk.wxAuth((d)=>{
* console.log("用户信息：", d)
* // 登录成功：返回用户信息；
* // 登录失败：返回false
* });
* }
*
*/
WxAuthLogin(callback){
var self = this;
if (cc.sys.platform === cc.sys.WECHAT_GAME) {
var options = wx.getLaunchOptionsSync();
var referee_id = options.query.uid; //.推荐人id
var source_id = options.query.source_id; //.用户来源id
var source_id2 = options.query.source_id2; //.用户来源子id
var share_id = options.query.share_id; //.分享素材ID
var userinfo = this.getUser();
//.登录遮罩背景
var maskNode = new cc.Node('Sprite');
maskNode.parent = cc.director.getScene().getChildByName('Canvas');
maskNode.addComponent(cc.BlockInputEvents)
var sp = maskNode.addComponent(cc.Sprite);
maskNode.opacity = 178;
maskNode.color = new cc.Color(25,88,95,255);
sp.sizeMode = cc.Sprite.SizeMode.CUSTOM;
self.createImage(sp, self.loginBg);
maskNode.width = cc.view.getVisibleSize().width;
maskNode.height = cc.view.getVisibleSize().height;
// console.log(maskNode.width, maskNode.height)
//.微信登录按钮
if(self.button){
self.button.show();
}else{
wx.getSystemInfo({
success(res){
var width = 507/2;
var height = 464/2;
self.button = wx.createUserInfoButton({
type: 'image',
image: self.loginBt,
style: { width: width, height: height, left: res.screenWidth/2-width/2, top: res.screenHeight/2-height/2 }
})
self.button.onTap((res1) => {
// 处理用户拒绝授权的情况
// if (res1.errMsg.indexOf('auth deny') > -1 || res1.errMsg.indexOf('auth denied') > -1 ) {
// wx.showToast();
// }
wx.showToast({title: '登录中...',icon:'loading',duration: 8});
wx.getSetting({
success(auths){
if(auths.authSetting["scope.userInfo"]){
self.setItem("wxauth",1);
console.log('===已经授权===');
var reqData = {
rawData: res1.rawData,
iv: res1.iv,
encryptedData: res1.encryptedData,
signature: res1.signature,
referee_id: referee_id,
source_id: source_id,
source_id2: source_id2,
share_id: share_id
}
// console.log('==登录参数==', reqData)
self.Post(self.ip1 + self.modify, reqData, function(data){
// console.log('==登录结果==', data)
if(data.c == 1){
self.setItem('userinfo', JSON.stringify(data.d));
wx.hideToast();
maskNode.destroy();
self.button.hide();
//.登录成功，重新初始化
self.userid = data.d.uid;
self.init({},(d)=>{})
callback(data.d);
}else{
// console.log('==登录接口请求失败==', data)
wx.showToast({title: '登录失败请重试'});
}
});
}else{
callback(false)
}
}
})
})
self.button.show()
}
})
}
}
},
......@@ -1290,15 +1280,15 @@ var sdk = {
style: obj.style,
})
this.BannerAd.onResize(function(res){
console.log("BannerAd广告缩放事件：", res)
console.log("sdk BannerAd广告缩放事件：", res)
self.BannerAd.style.left = self.w - self.BannerAd.style.realWidth/2+0.1;
self.BannerAd.style.top = self.h - self.BannerAd.style.realHeight+0.1;
});
this.BannerAd.onLoad(function(res){
console.log("BannerAd广告加载事件：", res)
console.log("sdk BannerAd广告加载事件：", res)
});
this.BannerAd.onError(function(res){
console.log("BannerAd广告错误事件：", res)
console.log("sdk BannerAd广告错误事件：", res)
});
return this.BannerAd;
......@@ -1324,10 +1314,10 @@ var sdk = {
}else{
this.VideoAd = wx.createRewardedVideoAd({ adUnitId: sdk_conf.videoAdUnitId })
this.VideoAd.onLoad(function(res){
console.log("VideoAd广告加载事件：", res)
console.log("sdk VideoAd广告加载事件：", res)
});
this.VideoAd.onError(function(res){
console.log("VideoAd广告错误事件：", res)
console.log("sdk VideoAd广告错误事件：", res)
});
return this.VideoAd;
}
......@@ -1415,11 +1405,11 @@ var sdk = {
wx.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
success(res2){
console.log('==截图保存=success=',res2)
console.log('sdk 旧版截图保存成功',res2)
callback(true)
},
fail(res2){
console.log('==截图保存=fail=',res2)
console.log('sdk 旧版截图保存失败',res2)
callback(null)
}
})
......@@ -1472,11 +1462,11 @@ var sdk = {
wx.saveImageToPhotosAlbum({
filePath: tempFilePath,
success(res2){
console.log('==截图保存=success=',res2)
console.log('sdk 新版截图保存成功',res2)
callback(true)
},
fail(res2){
console.log('==截图保存=fail=',res2)
console.log('sdk 新版截图保存失败',res2)
callback(null)
}
})
......@@ -1508,12 +1498,12 @@ var sdk = {
}
dataKey = sdk_conf.game+":"+dataType+":"+this.getUser().uid+":"+dataKey;
self.setLocalCache(dataKey,JSON.stringify(data),expireTime);
console.log("setToServer "+dataKey + " value "+JSON.stringify(data));
console.log("sdk setToServer "+dataKey + " ： "+JSON.stringify(data));
this.Get(this.ip2 + this.set, { key: dataKey,data: JSON.stringify(data),data_type:dataType,expireTime:String(expireTime)}, function (d) {
console.log("setToServer 服务端返回",JSON.stringify(d));
console.log("sdk setToServer 服务端返回",JSON.stringify(d));
if(d.c==0)
{
console.error("设置失败，请联系服务端技术查看问题！");
console.error("sdk 设置失败,请联系服务端技术查看问题！");
}
});
......@@ -1539,14 +1529,14 @@ var sdk = {
dataKey = sdk_conf.game+":"+dataType+":"+this.getUser().uid+":"+dataKey;
var cacheData = this.getLocalCache(dataKey)
console.log("getFromServer "+dataKey+" 本地获取值："+cacheData);
console.log("sdk getFromServer "+dataKey+" ："+cacheData);
if(cacheData==-1)
{
//去远程服务器拿数据
this.Get(this.ip2 + this.get, { key: dataKey,data_type:dataType,data: JSON.stringify(data)}, function (d) {
console.log("getFromServer "+dataKey+" 本地不存在，去服务器获取值："+JSON.stringify(d.d));
console.log("sdk getFromServer "+dataKey+" 本地不存在,去服务器获取值："+JSON.stringify(d.d));
callbackFunction(d.d);
});
}else if(cacheData==0)
......@@ -1557,7 +1547,7 @@ var sdk = {
//去远程服务器拿数据
this.Get(this.ip2 + this.get, { key: dataKey,data_type:dataType,data: JSON.stringify(data)}, function (d) {
console.log("getFromServer "+dataKey+" 本地已经过期,去服务器获取值："+JSON.stringify(d.d));
console.log("sdk getFromServer "+dataKey+" 本地已经过期,去服务器获取值："+JSON.stringify(d.d));
callbackFunction(d.d);
});
......@@ -1583,9 +1573,9 @@ var sdk = {
setLocalCache(key, value,expireTime){
var nowTime = new Date().getTime();
console.log("setLocalCache nowTime",nowTime);
console.log("sdk setLocalCache nowTime",nowTime);
expireTime = nowTime+expireTime*1000;
console.log("setLocalCache expireTime",expireTime);
console.log("sdk setLocalCache expireTime",expireTime);
var localData= {'data': value,'expireTime':expireTime};
cc.sys.localStorage.setItem(key, JSON.stringify(localData));
},
......@@ -1601,10 +1591,10 @@ var sdk = {
getLocalCache(key){
var nowTime = new Date().getTime();
console.log("getLocalCache nowTime",nowTime);
console.log("sdk getLocalCache nowTime",nowTime);
var localData = cc.sys.localStorage.getItem(key);
console.log("getLocalCache "+key+" 本地获取值："+localData);
console.log("sdk getLocalCache "+key+" 本地获取值："+localData);
if(localData)
......@@ -1614,13 +1604,13 @@ var sdk = {
if(nowTime>=expireTime)
{
cc.sys.localStorage.removeItem(key);
console.log("getLocalCache dataKey : "+key+" is expire");
console.log("sdk getLocalCache dataKey : "+key+" is expire");
return 0;
}else
{
var data = data.data;
console.log("getLocalCache dataKey : "+key+" is "+data);
console.log("sdk getLocalCache dataKey : "+key+" is "+data);
return data;
}
......@@ -1645,10 +1635,10 @@ var sdk = {
getLocalCache(key){
var nowTime = new Date().getTime();
console.log("getLocalCache nowTime",nowTime);
console.log("sdk getLocalCache nowTime",nowTime);
var localData = cc.sys.localStorage.getItem(key);
console.log("getLocalCache "+key+" 本地获取值："+localData);
console.log("sdk getLocalCache "+key+" 本地获取值："+localData);
if(localData)
......@@ -1658,13 +1648,13 @@ var sdk = {
if(nowTime>=expireTime)
{
cc.sys.localStorage.removeItem(key);
console.log("getLocalCache dataKey : "+key+" is expire");
console.log("sdk getLocalCache dataKey : "+key+" is expire");
return 0;
}else
{
var data = data.data;
console.log("getLocalCache dataKey : "+key+" is "+data);
console.log("sdk getLocalCache dataKey : "+key+" is "+data);
return data;
}
......
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