zhanghongliang/jcfw-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加jc.gg.extcfg配置项

Browse Source
This commit is contained in:
zhl 2020-03-24 20:39:37 +08:00
parent 79a2eb2d3f
commit 40884f4e75
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jcfw/jcfw.js
View File

@ -366,6 +366,8 @@ var JCFW = {
this.maincfg.failcb = failcb; this.maincfg.failcb = failcb;
} }
this.cloud.getServerConfig((cfg) => { this.cloud.getServerConfig((cfg) => {
console.log('get server config');
console.log(JSON.stringify(cfg));
this._handleCfg(cfg); this._handleCfg(cfg);
this.rsp && this.rsp.onServerConfig && this.rsp.onServerConfig(cfg); this.rsp && this.rsp.onServerConfig && this.rsp.onServerConfig(cfg);
this.maincfg.successcb && this.maincfg.successcb(cfg); this.maincfg.successcb && this.maincfg.successcb(cfg);
@ -1349,12 +1351,22 @@ var JCFW = {
return; return;
} }
jc.gg.basecfg = cfg; jc.gg.basecfg = cfg;
jc.gg.extcfg = {};
this.maincfg.info = cfg; this.maincfg.info = cfg;
this.maincfg.info.openAD ? this.setADSwitch(false) : this.setADSwitch(true); this.maincfg.info.openAD ? this.setADSwitch(false) : this.setADSwitch(true);
this.maincfg.info.openAdBanner ? this.setBannerADSwitch(false) : this.setBannerADSwitch(true); this.maincfg.info.openAdBanner ? this.setBannerADSwitch(false) : this.setBannerADSwitch(true);
this.maincfg.info.openADInsert ? this.setInsertADSwitch(false) : this.setInsertADSwitch(true); this.maincfg.info.openADInsert ? this.setInsertADSwitch(false) : this.setInsertADSwitch(true);
this.maincfg.info.isTestMode ? this.setTestModeSwitch(true) : this.setTestModeSwitch(false); this.maincfg.info.isTestMode ? this.setTestModeSwitch(true) : this.setTestModeSwitch(false);
this.maincfg.info.blackTech ? this.setAuditSwitch(false) : this.setAuditSwitch(true); this.maincfg.info.blackTech ? this.setAuditSwitch(false) : this.setAuditSwitch(true);
if (cfg.ext_json_cfg) {
try {
let extCfg = JSON.parse(cfg.ext_json_cfg);
jc.gg.extcfg = extCfg;
console.log(jc.gg.extcfg);
} catch (err){
console.log('parse ext cfg error', err);
}
}
this.setVideoLimit(this.maincfg.info.video_count); this.setVideoLimit(this.maincfg.info.video_count);
this._bannerids = this.maincfg.info.wxBannerAdId ? this.maincfg.info.wxBannerAdId.split('|') : []; this._bannerids = this.maincfg.info.wxBannerAdId ? this.maincfg.info.wxBannerAdId.split('|') : [];
this._bannertimeout = this.maincfg.info.wxBannerOvertime ? this.maincfg.info.wxBannerOvertime : 0; this._bannertimeout = this.maincfg.info.wxBannerOvertime ? this.maincfg.info.wxBannerOvertime : 0;

5
jcfw/platform/plat_oppo.js
View File

@ -133,7 +133,10 @@ var PLAT_OPPO = {
success: (res) => { success: (res) => {
console.log('[qg.login]success'); console.log('[qg.login]success');
console.log(JSON.stringify(res)); console.log(JSON.stringify(res));
this._owner.login.login({token: res.token, successcb, failcb, openid: res.uid}); this._owner.login.login({token: res.token, successcb: function(data) {
data.client_token = res.token;
successcb && successcb(data);
}, failcb, openid: res.uid});
this._owner.login.updateuserinfo(res); this._owner.login.updateuserinfo(res);
}, },
fail: (res) => { fail: (res) => {