diff --git a/sdk/shareTools.ts b/sdk/shareTools.ts index 6e5775d..f5a76af 100644 --- a/sdk/shareTools.ts +++ b/sdk/shareTools.ts @@ -1,4 +1,3 @@ -import { utils } from "../Base/utils"; import { WxHelper } from "../Base/WxHelper"; import WXSDK from "../wxsdk/WXSDK"; import { OnlineKeys, SDKTools } from "./SDKTools"; @@ -50,7 +49,11 @@ export class ShareTools { } this.onShowAd = false; if (!params || !params.fail) { - utils.tips(err.msg) + wx.showToast({ + title: err.msg, + icon: 'none', + duration: 1500 + }) } else { params && params.fail && params.fail(err); } diff --git a/wxsdk/base/SDKConst.ts b/wxsdk/base/SDKConst.ts index 6bd9d64..1f1b12a 100644 --- a/wxsdk/base/SDKConst.ts +++ b/wxsdk/base/SDKConst.ts @@ -1,23 +1,23 @@ // 游戏配置数据 只需要改动这里的配置信息 // 游戏配置数据 只需要改动这里的配置信息 export const GAMEDATA = { - game_id: '10045', - channel_id: '10045', - version: '1.0.0', - appkey: '6c7d8ee586f3c4a1a6b5c84554f49079', - interstitialAdId: 'adunit-e8f80e01fb6e1b8e',//插屏ID - bannerId: 'adunit-cc8fff6dee9188d4',//banner + game_id: '10000', + channel_id: '10080', + version: '1.0.0', //游戏版本号,发版前+1 + appkey: 'cf2ea5aca60b562d927805c52876a96c', + interstitialAdId: 'adunit-638f9158bce2c31e',//插屏ID + bannerId: '',//banner gridId: '',//格子 - customId: 'adunit-cf69738dc3970fa7',//原生模板单个 //adunit-fb925feb16d2c13b - videoAd: 'adunit-4f1adc59ecc219bb',//初始化视频广告id + customId: 'adunit-3ecef510636baa07',//原生模板单个 //adunit-fb925feb16d2c13b + videoAd: 'adunit-638f9158bce2c31e',//初始化视频广告id shareMessageToFriend: { // 暂时只支持一个场景值 scene: 10, //定向分享场景值1-50 配>0的会初始化 sharekey: 'shareMessageToFriendScene',//定向分享对应后台的分享key share_id: 26,//定向分享对应后台的分享key }, default_share: { - content: '2021最新的数独题库来啦!', - icon: 'https://cdn-wxsdk.miso-lab.com/0a/1c4c9d24237b33a4c6fd81d35e7ade.png?attname=share.png', + content: '分享标题.....', + icon: '分享图链接', id: '9999', key: 'default', title: '默认', @@ -25,7 +25,7 @@ export const GAMEDATA = { videoid: '' }, MidasPay: { // 米大师虚拟支付配置 - OfferId: "1450031480", // 在米大师申请的应用id + OfferId: "0000000000", // 在米大师申请的应用id ZoneId: "1", // 分区ID,默认:1 Mode: "game", // 默认:game CurrencyType: "CNY", // 默认:CNY diff --git a/wxsdk/service/GameService.ts b/wxsdk/service/GameService.ts index cc904cc..d22e20b 100644 --- a/wxsdk/service/GameService.ts +++ b/wxsdk/service/GameService.ts @@ -137,11 +137,12 @@ export default class GameService { let model = WxSystem.I.model; let version = WxSystem.I.version; let system = WxSystem.I.system; - let platform = WxSystem.I.platform == "ios" ? "ios" : "android"; + let platform = WxSystem.I.platform; let sdkversion = WxSystem.I.SDKVersion; let scene = DataService.I.Scene + ''; let uid = DataService.I.UserId; let env = DataService.I.EnvEnum === 1 ? 'pre' : 'prod'; + let openid = DataService.I.OpenId; return { gameid, channel, @@ -153,7 +154,8 @@ export default class GameService { sdkversion, scene, uid, - env + env, + openid }; } diff --git a/wxsdk/service/LogService.ts b/wxsdk/service/LogService.ts index 9c253ff..1c7f059 100644 --- a/wxsdk/service/LogService.ts +++ b/wxsdk/service/LogService.ts @@ -38,11 +38,7 @@ export default class LogService { setRegFinishState(state: number) { this.regFinishState = state; } - - private get SystemId() { - return DataService.I.SystemId; - } - + private get LaunchTime() { return DataService.I.LaunchTime; } diff --git a/wxsdk/service/ShareVideoService.ts b/wxsdk/service/ShareVideoService.ts index 9165347..2d89729 100644 --- a/wxsdk/service/ShareVideoService.ts +++ b/wxsdk/service/ShareVideoService.ts @@ -48,7 +48,7 @@ export default class ShareVideoService { * 分享 * @param shareKey * @param params - * @param opts 目前支持4个key 1,title自定义分享标题 2,img_url自定义分享图片 3,share_type(不走后台配置写死走视频or分享。1分享2视频3无视频则分享)4,closeSimulate是否关闭模拟分享 + * @param opts 目前支持4个key 1,title自定义分享标题 2,img_url自定义分享图片 3,share_type(不走后台配置写死走视频or分享。1分享2视频3无视频则分享)4,closeSimulate是否关闭模拟分享 5,query需要拼接到query的字段 */ share(shareKey: string, params: any = {}, opts: any = {}): Promise { return new Promise((resolve, reject) => { @@ -57,7 +57,7 @@ export default class ShareVideoService { title: content, imageUrl: icon, share_id: id, - query: this.createQuery({ share_key: key, share_id: id }), + query: this.createQuery({ share_key: key, share_id: id, query: opts.query }), }; if (opts) { if (opts.title) _params.title = opts.title; @@ -399,11 +399,18 @@ export default class ShareVideoService { } private createQuery(params = {}): string { + let q = params["query"]; + delete params["query"]; + if (q) { + for (let i in q) { + params[i] = q[i]; + } + } params = { ...params, channel_id: GAMEDATA.channel_id, user_invite_uid: DataService.I.UserId, - user_invite_openid:DataService.I.OpenId + user_invite_openid: DataService.I.OpenId }; let query = ''; for (let key in params) { diff --git a/wxsdk/wx/WxPay.ts b/wxsdk/wx/WxPay.ts index 378e539..0e58014 100644 --- a/wxsdk/wx/WxPay.ts +++ b/wxsdk/wx/WxPay.ts @@ -15,7 +15,7 @@ export default class WxPay { // 环境配置,0:米大师正式环境 1:米大师沙箱环境 let env = DataService.I.EnvEnum === EnvCode.Prod ? 0 : 1; // 平台类型,android or ios,config.js有配置走配置,否则判断系统id - let platform = Platform || (DataService.I.SystemId === 0 ? 'ios' : 'android'); + let platform = DataService.I.Platform; let pms = { mode: Mode, env, -- libgit2 0.21.0