Skip to content

D
dxw_sdk_release
提交 6cdeefac 作者: 王进
操作

修改西游的输出符号

上级 9bf12fdc
正在显示 包含 31 行增加 和 31 行删除
20181218_西游/SDK.ts
/** /**
...@@ -41,7 +41,7 @@ class WechatSDK { ...@@ -41,7 +41,7 @@ class WechatSDK {
_selt.actId = options.actId || ''; _selt.actId = options.actId || '';
await _selt.getNetworkType(); await _selt.getNetworkType();
await _selt.getSystemInfo(); await _selt.getSystemInfo();
console.log("@@SDK初始化结束", _selt.ReportParams); console.log("%%SDK初始化结束", _selt.ReportParams);
} }
public async updateShareMsgInfo(updateInfo) { // 更新动态消息接口 public async updateShareMsgInfo(updateInfo) { // 更新动态消息接口
if (!updateInfo.activity_id) { if (!updateInfo.activity_id) {
...@@ -50,9 +50,9 @@ class WechatSDK { ...@@ -50,9 +50,9 @@ class WechatSDK {
} }
const postData = this.deepCopy({}, this.sdkParams, updateInfo); const postData = this.deepCopy({}, this.sdkParams, updateInfo);
let res = await this.sdkRequest(Links.setActShareInfo, postData, 'POST').catch(err => { let res = await this.sdkRequest(Links.setActShareInfo, postData, 'POST').catch(err => {
console.log("@@SDK异常::updateShareMsgInfo", err); console.log("%%SDK异常::updateShareMsgInfo", err);
}); });
console.log("@@SDK更新动态消息接口::", res); console.log("%%SDK更新动态消息接口::", res);
} }
public async getActiveShareInfo() { // 查询动态消息接口 public async getActiveShareInfo() { // 查询动态消息接口
let _self = this; let _self = this;
...@@ -61,7 +61,7 @@ class WechatSDK { ...@@ -61,7 +61,7 @@ class WechatSDK {
activity_id: _self.actId activity_id: _self.actId
} }
let res = await this.sdkRequest(Links.getActShareInfo, postData, 'POST').catch(err => { let res = await this.sdkRequest(Links.getActShareInfo, postData, 'POST').catch(err => {
console.log("@@SDK异常::getActiveShareInfo", err); console.log("%%SDK异常::getActiveShareInfo", err);
}); });
if (res.code == 0) { if (res.code == 0) {
return res.data; return res.data;
...@@ -97,10 +97,10 @@ class WechatSDK { ...@@ -97,10 +97,10 @@ class WechatSDK {
// SDK激活 // SDK激活
private async sdkActive() { private async sdkActive() {
const _selt = this const _selt = this
console.log("@@SDK激活", _selt.sdkParams) console.log("%%SDK激活", _selt.sdkParams)
let sdkActData = await _selt.sdkRequest(Links.active, this.sdkParams).catch(err => { let sdkActData = await _selt.sdkRequest(Links.active, this.sdkParams).catch(err => {
console.log("@@SDK激活异常:", err) console.log("%%SDK激活异常:", err)
_selt.sdkAlert("@@SDK激活异常:" + err) _selt.sdkAlert("%%SDK激活异常:" + err)
}); });
_selt.sdkParams.pay_channel = sdkActData.data.default_pay_channel; _selt.sdkParams.pay_channel = sdkActData.data.default_pay_channel;
_selt.getAuthorize = sdkActData.data.weixin_from; _selt.getAuthorize = sdkActData.data.weixin_from;
...@@ -112,8 +112,8 @@ class WechatSDK { ...@@ -112,8 +112,8 @@ class WechatSDK {
// 获取用户信息 // 获取用户信息
_selt.sdkParams.token = '' // 强制清空登录toekn _selt.sdkParams.token = '' // 强制清空登录toekn
let sdkLoginData = await _selt.sdkRequest(Links.login, _selt.sdkParams).catch(err => { let sdkLoginData = await _selt.sdkRequest(Links.login, _selt.sdkParams).catch(err => {
console.log("@@SDK登陆异常:", err) console.log("%%SDK登陆异常:", err)
_selt.sdkAlert("@@SDK登陆异常:" + err) _selt.sdkAlert("%%SDK登陆异常:" + err)
}); });
if (sdkLoginData.code == 0) { if (sdkLoginData.code == 0) {
// 根据SDK返回用户状态来判断用户是否注册 // 根据SDK返回用户状态来判断用户是否注册
...@@ -123,7 +123,7 @@ class WechatSDK { ...@@ -123,7 +123,7 @@ class WechatSDK {
os: _selt.sdkParams.os, // 返回系统类型IOS或者android os: _selt.sdkParams.os, // 返回系统类型IOS或者android
session_key: _selt.sdkParams.session_key // 返回session_key session_key: _selt.sdkParams.session_key // 返回session_key
}) })
console.log("@@SDK登陆成功..") console.log("%%SDK登陆成功..")
return LoginCallBack return LoginCallBack
} }
} }
...@@ -139,9 +139,9 @@ class WechatSDK { ...@@ -139,9 +139,9 @@ class WechatSDK {
// 支付前先获取用户订单状态，如果没有未完成订单则继续支付 // 支付前先获取用户订单状态，如果没有未完成订单则继续支付
let res = await _selt.sdkRequest(Links.order, _selt.deepCopy({}, _selt.sdkParams, Params)).catch(err => { let res = await _selt.sdkRequest(Links.order, _selt.deepCopy({}, _selt.sdkParams, Params)).catch(err => {
_selt.LoadingOff(); _selt.LoadingOff();
console.log("@@SDK异常::payOrder", err); console.log("%%SDK异常::payOrder", err);
}); });
console.log("@@订单返回---->", res); console.log("%%订单返回---->", res);
_selt.LoadingOff(); _selt.LoadingOff();
if (res.code == 0) { if (res.code == 0) {
if (res.data.weixin_mini_program_app_id) { // 跳小程序支付 if (res.data.weixin_mini_program_app_id) { // 跳小程序支付
...@@ -166,12 +166,12 @@ class WechatSDK { ...@@ -166,12 +166,12 @@ class WechatSDK {
// 根据返回的用户订单状态判断是新订单还是未完成订单 // 根据返回的用户订单状态判断是新订单还是未完成订单
if (res.data.order_type == 1) { // 新订单 if (res.data.order_type == 1) { // 新订单
_selt.MidasPaymentParams.buyQuantity = <number>(Params.money / 100) * <number>res.data.weixin_proportion // 充值金额 _selt.MidasPaymentParams.buyQuantity = <number>(Params.money / 100) * <number>res.data.weixin_proportion // 充值金额
console.log("@@SDK -> 发起支付参数:", _selt.MidasPaymentParams); console.log("%%SDK -> 发起支付参数:", _selt.MidasPaymentParams);
// 调微信米大师支付接口 // 调微信米大师支付接口
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
(wx as any).requestMidasPayment(_selt.deepCopy({}, _selt.MidasPaymentParams, { (wx as any).requestMidasPayment(_selt.deepCopy({}, _selt.MidasPaymentParams, {
success: async function (data) { success: async function (data) {
console.log("@@SDK -> 支付成功:", data); console.log("%%SDK -> 支付成功:", data);
let coinsResult = await _selt.getCoins(_selt.deepCopy({}, _selt.sdkParams, { order_num: res.data.order_num })); let coinsResult = await _selt.getCoins(_selt.deepCopy({}, _selt.sdkParams, { order_num: res.data.order_num }));
if (coinsResult.code == 0 || coinsResult.code == 3012) { if (coinsResult.code == 0 || coinsResult.code == 3012) {
resolve(200); resolve(200);
...@@ -244,9 +244,9 @@ class WechatSDK { ...@@ -244,9 +244,9 @@ class WechatSDK {
} }
} }
private async getCoins(orderParams) { // 通知服务端扣费 private async getCoins(orderParams) { // 通知服务端扣费
console.log("@@SDK通知扣费", orderParams) console.log("%%SDK通知扣费", orderParams)
let coinsResult = await this.sdkRequest(Links.pay, orderParams).catch(err => { let coinsResult = await this.sdkRequest(Links.pay, orderParams).catch(err => {
console.log("@@SDK异常::getCoins", err); console.log("%%SDK异常::getCoins", err);
}); });
return coinsResult; return coinsResult;
} }
...@@ -268,7 +268,7 @@ class WechatSDK { ...@@ -268,7 +268,7 @@ class WechatSDK {
postData.type = 'SDK.BIND_MOBILE'; // 小程序专属短信类型 postData.type = 'SDK.BIND_MOBILE'; // 小程序专属短信类型
// 发送验证码接口 // 发送验证码接口
let res = await this.sdkRequest(Links.sendCode, postData).catch(err => { let res = await this.sdkRequest(Links.sendCode, postData).catch(err => {
console.log("@@SDK::验证码发送失败", err); console.log("%%SDK::验证码发送失败", err);
_selt.sdkAlert("发送失败，请重试.."); _selt.sdkAlert("发送失败，请重试..");
}); });
if (res.code == 0) { if (res.code == 0) {
...@@ -283,12 +283,12 @@ class WechatSDK { ...@@ -283,12 +283,12 @@ class WechatSDK {
postData.source = 'WEIXIN'; // 用户平台来源 postData.source = 'WEIXIN'; // 用户平台来源
//保存用户手机信息 //保存用户手机信息
let res = await this.sdkRequest(Links.saveNum, postData).catch(err => { let res = await this.sdkRequest(Links.saveNum, postData).catch(err => {
console.log("@@SDK::保存手机失败", err); console.log("%%SDK::保存手机失败", err);
}); });
if (res.code == 0) { if (res.code == 0) {
callback.call(thisObj, true); callback.call(thisObj, true);
} else { } else {
console.log("@@绑定失败::", res.msg); console.log("%%绑定失败::", res.msg);
callback.call(thisObj, false); callback.call(thisObj, false);
} }
} }
...@@ -406,7 +406,7 @@ class WechatSDK { ...@@ -406,7 +406,7 @@ class WechatSDK {
public getOptionsInfo(all?) { public getOptionsInfo(all?) {
const _selt = this const _selt = this
const options = (wx as any).getLaunchOptionsSync() const options = (wx as any).getLaunchOptionsSync()
console.log("@@启动参数--->", options) console.log("%%启动参数--->", options)
if (all) return options if (all) return options
if (options.query && Object.keys(options.query).length > 0) { if (options.query && Object.keys(options.query).length > 0) {
if (options.query.scene && options.query.scene != '') { // 扫码参数 if (options.query.scene && options.query.scene != '') { // 扫码参数
...@@ -429,7 +429,7 @@ class WechatSDK { ...@@ -429,7 +429,7 @@ class WechatSDK {
_selt.ReportParams.networkType = res.networkType _selt.ReportParams.networkType = res.networkType
}, },
fail: (err) => { fail: (err) => {
console.log("@@SDK错误->getNetworkType", err) console.log("%%SDK错误->getNetworkType", err)
} }
}) })
} }
...@@ -463,7 +463,7 @@ class WechatSDK { ...@@ -463,7 +463,7 @@ class WechatSDK {
reject("执行wx.login返回失败"); reject("执行wx.login返回失败");
}, },
complete: (res) => { complete: (res) => {
console.log("@@SDK执行登录,微信返回数据：", res); console.log("%%SDK执行登录,微信返回数据：", res);
} }
}); });
} catch (err) { } } catch (err) { }
...@@ -487,7 +487,7 @@ class WechatSDK { ...@@ -487,7 +487,7 @@ class WechatSDK {
// SDK上报接口 // SDK上报接口
private sdkRequest(link: string, portData, method?) { private sdkRequest(link: string, portData, method?) {
this.md5_sign(portData) // 附上签名参数 this.md5_sign(portData) // 附上签名参数
console.log("##SDK激活上报参数", portData) console.log("%%SDK激活上报参数", portData)
return this.request(link, portData, method) return this.request(link, portData, method)
} }
// 上报激活 // 上报激活
...@@ -507,7 +507,7 @@ class WechatSDK { ...@@ -507,7 +507,7 @@ class WechatSDK {
const that = this const that = this
portData = that.deepCopy({}, that.ReportParams, portData) portData = that.deepCopy({}, that.ReportParams, portData)
portData.time = Date.parse(new Date().toString()) // 获取当前时间戳秒 portData.time = Date.parse(new Date().toString()) // 获取当前时间戳秒
console.log("##SDK统计上报参数", portData) console.log("%%SDK统计上报参数", portData)
this.request(SDKConfig.report, portData, 'POST') this.request(SDKConfig.report, portData, 'POST')
} }
// 调用微信请求接口 // 调用微信请求接口
...@@ -580,7 +580,7 @@ class WechatSDK { ...@@ -580,7 +580,7 @@ class WechatSDK {
// if (isAuthorize) { // if (isAuthorize) {
return new Promise(async function (resolve, reject) { return new Promise(async function (resolve, reject) {
let status = await _selt._getSetting(); let status = await _selt._getSetting();
console.log("@@SDK用户授权状态", status) console.log("%%SDK用户授权状态", status)
switch (status) { switch (status) {
case 1: case 1:
try { try {
...@@ -629,7 +629,7 @@ class WechatSDK { ...@@ -629,7 +629,7 @@ class WechatSDK {
}); });
OpenSettingButton.onTap(async function (res) { OpenSettingButton.onTap(async function (res) {
let t_status = await _selt._getSetting(); let t_status = await _selt._getSetting();
console.log("@@SDK:点击设置按钮返回t_status=", t_status); console.log("%%SDK:点击设置按钮返回t_status=", t_status);
if (t_status == 1) { if (t_status == 1) {
OpenSettingButton.offTap(this); OpenSettingButton.offTap(this);
OpenSettingButton.destroy(); OpenSettingButton.destroy();
...@@ -694,7 +694,7 @@ class WechatSDK { ...@@ -694,7 +694,7 @@ class WechatSDK {
resolve(userInfo); resolve(userInfo);
}, },
fail: (res: any) => { fail: (res: any) => {
console.log("@@SDK:玩家头像等数据失败，用户未授权"); console.log("%%SDK:玩家头像等数据失败，用户未授权");
reject(); reject();
} }
}); });
...@@ -738,7 +738,7 @@ class WechatSDK { ...@@ -738,7 +738,7 @@ class WechatSDK {
} }
else { else {
reject(sharePromise) reject(sharePromise)
console.log("@@SDK分享错误", sharePromise) console.log("%%SDK分享错误", sharePromise)
} }
} catch (err) { } catch (err) {
reject(err) reject(err)
...@@ -778,7 +778,7 @@ class WechatSDK { ...@@ -778,7 +778,7 @@ class WechatSDK {
target_state: 0 // 新建动态消息状态 target_state: 0 // 新建动态消息状态
}); });
let actInfo = await _self.sdkRequest(Links.getActShareId, postData, 'POST').catch(err => { let actInfo = await _self.sdkRequest(Links.getActShareId, postData, 'POST').catch(err => {
console.log("@@SDDK错误::createActiveSahre", err); console.log("%%SDDK错误::createActiveSahre", err);
}); });
if (actInfo.code == 0) { if (actInfo.code == 0) {
const actId = actInfo.data.activity_id; const actId = actInfo.data.activity_id;
...@@ -808,7 +808,7 @@ class WechatSDK { ...@@ -808,7 +808,7 @@ class WechatSDK {
fail: function (err) { } fail: function (err) { }
}); });
} else { } else {
console.log("@@SDK错误::createActiveSahre", actInfo.msg); console.log("%%SDK错误::createActiveSahre", actInfo.msg);
} }
} }
private shareInit() { private shareInit() {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论