public_service / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
xuguohong
acc6ddc3 1 parent 52bcf774

update xingwan sdk

Expand all
Inline Side-by-side
Showing 67 changed files with 147 additions and 155 deletions
No preview for this file type
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
No preview for this file type
No preview for this file type
No preview for this file type

7.05 KB | W: | H:

7.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.68 KB | W: | H:

7.68 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -139,8 +139,9 @@ function initMatching(){ ...@@ -139,8 +139,9 @@ function initMatching(){
139 var ratio = window.devicePixelRatio; 139 var ratio = window.devicePixelRatio;
140 Core.ratio = ratio; 140 Core.ratio = ratio;
141 141
142 - Core.server = 'http://sdk.shxingwan.com'; 142 + Core.PLATFORM_NAME = '星玩';
143 143
144 + Core.server = 'http://sdk.shxingwan.com';
144 var lastServer = localStorage.getItem('last_server'); 145 var lastServer = localStorage.getItem('last_server');
145 if(lastServer && lastServer.indexOf('http:')==0){ 146 if(lastServer && lastServer.indexOf('http:')==0){
146 if(Core.isFile){ 147 if(Core.isFile){
...@@ -280,7 +281,17 @@ function initMatching(){ ...@@ -280,7 +281,17 @@ function initMatching(){
280 // },3000); 281 // },3000);
281 //} 282 //}
282 } 283 }
283 - 284 + core.get_url = function(url){
285 + var url = url
286 + if (core.isFile) {
287 + url = Core.server + url;
288 + }
289 + if (core.Data.open_id && core.Data.login_key){
290 + var connect_str = url.indexOf('?') >=0 ? '&' : '?'
291 + url = url + connect_str + 'open_id=' + core.Data.open_id + '&login_key=' + core.Data.login_key;
292 + }
293 + return url
294 + }
284 //格式化输出字符串 295 //格式化输出字符串
285 // core.format = function(str){ 296 // core.format = function(str){
286 // var params = Array.prototype.slice.call(arguments, 1); 297 // var params = Array.prototype.slice.call(arguments, 1);
...@@ -298,22 +309,7 @@ function initMatching(){ ...@@ -298,22 +309,7 @@ function initMatching(){
298 if (!data) { 309 if (!data) {
299 Core.Data.username = null; 310 Core.Data.username = null;
300 Core.Data.nickname = null; 311 Core.Data.nickname = null;
301 - // Core.Data.username = null; 312 +
302 - // Core.Data.youai_star = null;
303 - // Core.Data.power = null;
304 - // Core.Data.bind_phone = null;
305 - // Core.Data.bind_statu = null;
306 - // Core.Data.nickname = null;
307 - // Core.Data.is_guest = null;
308 - // Core.Data.face = null;
309 - // Core.Data["open_id"] = null;
310 - // Core.Data["token"] = null;
311 - // Core.Data["timestamp"] = null;
312 - // Core.Data["login_key"] = null;
313 - // Core.Data.safe_question = null;
314 - // Core.Data.bind_mail_statu = null;
315 - // Core.Data.mail = null;
316 - // Core.Data.safe_answer = null;
317 return; 313 return;
318 } 314 }
319 Core.Data = data 315 Core.Data = data
...@@ -323,23 +319,7 @@ function initMatching(){ ...@@ -323,23 +319,7 @@ function initMatching(){
323 if(data.face){ 319 if(data.face){
324 Core.Data.face = Core.server + data.face; 320 Core.Data.face = Core.server + data.face;
325 } 321 }
326 - // Core.Data.username = data.username; 322 +
327 - // Core.Data.nickname = data.nickname;
328 - // Core.Data.youai_star = data.youai_star;
329 - // Core.Data.power = data.power;
330 - // Core.Data.bind_phone = data.bind_phone;
331 - // Core.Data.bind_statu = data.bind_statu;
332 - // Core.Data.is_guest = data.is_guest;
333 - // Core.Data.face = data.face;
334 - // Core.Data.score = data.score;
335 - // Core.Data["open_id"] = data.open_id + '';
336 - // Core.Data["token"] = data.token;
337 - // Core.Data["timestamp"] = data.timestamp + '';
338 - // Core.Data["login_key"] = data.login_key;
339 - // Core.Data.safe_question = data.safe_question;
340 - // Core.Data.safe_answer = data.safe_answer;
341 - // Core.Data.bind_mail_statu = data.bind_mail_statu;
342 - // Core.Data.mail = data.mail;
343 } 323 }
344 324
345 /** 325 /**
...@@ -473,7 +453,24 @@ function initMatching(){ ...@@ -473,7 +453,24 @@ function initMatching(){
473 } 453 }
474 return result; 454 return result;
475 } 455 }
456 + core.ajax = function(settings){
457 + //跨域修复https://github.com/imweb/mobile/issues/6
458 + settings.url = Core.get_url(settings.url)
459 + settings.beforeSend = function(xhr) {
460 + try {
461 + xhr.withCredentials = true;
462 + } catch (e) {
463 + var nativeOpen = xhr.open;
464 + xhr.open = function() {
465 + var result = nativeOpen.apply(xhr, arguments);
466 + xhr.withCredentials = true;
467 + return result;
468 + };
469 + }
470 + }
476 471
472 + return $.ajax(settings);
473 + },
477 core.ajax_do = function($obj, func, context) { 474 core.ajax_do = function($obj, func, context) {
478 var param = ''; 475 var param = '';
479 var action_methon = null; 476 var action_methon = null;
...@@ -510,15 +507,26 @@ function initMatching(){ ...@@ -510,15 +507,26 @@ function initMatching(){
510 } else { 507 } else {
511 post_url += '?format=json'; 508 post_url += '?format=json';
512 } 509 }
513 - if(Core.isFile){ 510 +
514 - post_url = core.server + post_url; 511 +
515 - }
516 var options = { 512 var options = {
517 type: action_method, 513 type: action_method,
518 - url: post_url, 514 + url: Core.get_url(post_url),
519 dataType: 'json', 515 dataType: 'json',
520 contentType: "application/x-www-form-urlencoded; charset=utf-8", 516 contentType: "application/x-www-form-urlencoded; charset=utf-8",
521 data: param, 517 data: param,
518 + beforeSend: function(xhr) {
519 + try {
520 + xhr.withCredentials = true;
521 + } catch (e) {
522 + var nativeOpen = xhr.open;
523 + xhr.open = function() {
524 + var result = nativeOpen.apply(xhr, arguments);
525 + xhr.withCredentials = true;
526 + return result;
527 + };
528 + }
529 + },
522 success: function(result, textStatus) { 530 success: function(result, textStatus) {
523 if (result.code == -10) { 531 if (result.code == -10) {
524 // 未登录，跳转的登录界面 532 // 未登录，跳转的登录界面
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 var params = location.hash.slice(1); 11 var params = location.hash.slice(1);
12 var args = params.match(/app_id=(\w*)&?/); 12 var args = params.match(/app_id=(\w*)&?/);
13 var start_page = params.match(/mod=(\w*)&?/); 13 var start_page = params.match(/mod=(\w*)&?/);
14 + var core_server = params.match(/core_server=(.*)&?/);
14 var appId = ''; 15 var appId = '';
15 16
16 var skin_v = '?' + $('#skin').attr('data-v'); 17 var skin_v = '?' + $('#skin').attr('data-v');
...@@ -23,6 +24,9 @@ ...@@ -23,6 +24,9 @@
23 Core.start_page = start_page[1]; 24 Core.start_page = start_page[1];
24 console.log(Core.start_page); 25 console.log(Core.start_page);
25 } 26 }
27 + if (core_server){
28 + Core.server = core_server[1]
29 + }
26 location.hash = ''; 30 location.hash = '';
27 if (appId == '') { 31 if (appId == '') {
28 //刷新地址出错 32 //刷新地址出错
...@@ -47,7 +51,7 @@ ...@@ -47,7 +51,7 @@
47 var tryAutoLogin = false; 51 var tryAutoLogin = false;
48 var _skin = localStorage.getItem('skin_' + appId); 52 var _skin = localStorage.getItem('skin_' + appId);
49 if (_skin) { 53 if (_skin) {
50 - $('#skin').attr('href', Core.server + '/static/sdk_3/skin/' + _skin + '/skin.css' + skin_v); 54 + $('#skin').attr('href', Core.server + '/static/sdk/skin/' + _skin + '/skin.css' + skin_v);
51 setSkin = true; 55 setSkin = true;
52 } 56 }
53 if ($('#login').length != 0) { 57 if ($('#login').length != 0) {
...@@ -69,6 +73,7 @@ ...@@ -69,6 +73,7 @@
69 if (Core.isFile) { 73 if (Core.isFile) {
70 url = Core.server + url; 74 url = Core.server + url;
71 } 75 }
76 +
72 $.ajax({ 77 $.ajax({
73 type: 'GET', 78 type: 'GET',
74 url: url + '?' + params, 79 url: url + '?' + params,
...@@ -94,7 +99,7 @@ ...@@ -94,7 +99,7 @@
94 } 99 }
95 100
96 if (!setSkin && data.skin) { 101 if (!setSkin && data.skin) {
97 - $('#skin').attr('href', Core.server + '/static/sdk_3/skin/' + data.skin + '/skin.css' + skin_v); 102 + $('#skin').attr('href', Core.server + '/static/sdk/skin/' + data.skin + '/skin.css' + skin_v);
98 localStorage.setItem('skin_' + appId, data.skin); 103 localStorage.setItem('skin_' + appId, data.skin);
99 } 104 }
100 localStorage.setItem('data_' + url, JSON.stringify(data.msg)); 105 localStorage.setItem('data_' + url, JSON.stringify(data.msg));
...@@ -119,9 +124,7 @@ ...@@ -119,9 +124,7 @@
119 // 核心初始化 124 // 核心初始化
120 Core.loadFinished(); 125 Core.loadFinished();
121 } 126 }
122 -// if (!Core.isFile) { 127 +
123 -// $('<iframe class="hide" width="0" height="0" src="/sdk/manifest/' + appId + '"></iframe>').appendTo($('body'));
124 -// }
125 }, 128 },
126 error: function(xhr, type) { 129 error: function(xhr, type) {
127 // 请求失败，服务器崩溃 130 // 请求失败，服务器崩溃
......
...@@ -217,14 +217,14 @@ ...@@ -217,14 +217,14 @@
217 Core.first_user = this.$c.find('[name="username"]').val() 217 Core.first_user = this.$c.find('[name="username"]').val()
218 Core.first_password = this.$c.find('[name="password"]').val() 218 Core.first_password = this.$c.find('[name="password"]').val()
219 this.cache(); 219 this.cache();
220 - Core.showTips('成功登录，欢迎使用游戏平台'); 220 + Core.showTips('成功登录，欢迎使用'+ Core.PLATFORM_NAME +'游戏平台');
221 Core.updateMod('home'); 221 Core.updateMod('home');
222 } 222 }
223 Login.prototype.login_eg_cb = function(result) { 223 Login.prototype.login_eg_cb = function(result) {
224 Core.updateData(result.msg); 224 Core.updateData(result.msg);
225 // 跳转进入游戏 225 // 跳转进入游戏
226 this.cache(); 226 this.cache();
227 - Core.showTips('成功登录，欢迎使用游戏平台, 正在进入游戏'); 227 + Core.showTips('成功登录，欢迎使用'+ Core.PLATFORM_NAME +'游戏平台, 正在进入游戏');
228 setTimeout(function() { 228 setTimeout(function() {
229 Core.finishLogin(); 229 Core.finishLogin();
230 }, 1000); 230 }, 1000);
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
369 Core.ajax_do(that.$c.find('.ajax'), that.register_cb, 369 Core.ajax_do(that.$c.find('.ajax'), that.register_cb,
370 that); 370 that);
371 } else{ 371 } else{
372 - Core.showTips('请同意网络协议',1); 372 + Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
373 } 373 }
374 return false; 374 return false;
375 }); 375 });
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
400 Core.first_password = this.$c.find('[name="password"]').val() 400 Core.first_password = this.$c.find('[name="password"]').val()
401 // 显示一个注册成功信息，并跳转到home 401 // 显示一个注册成功信息，并跳转到home
402 this.cache(); 402 this.cache();
403 - Core.showTips('成功注册，欢迎使用游戏平台'); 403 + Core.showTips('成功注册，欢迎使用' + Core.PLATFORM_NAME + '游戏平台');
404 Core.updateMod('home'); 404 Core.updateMod('home');
405 } 405 }
406 Register.prototype.show_after = function() { 406 Register.prototype.show_after = function() {
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
488 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码 488 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码
489 var $self = $(this) 489 var $self = $(this)
490 phone = $("#js_findPSW_mobile").val(); 490 phone = $("#js_findPSW_mobile").val();
491 - $.ajax({ 491 + Core.ajax({
492 type:"post", 492 type:"post",
493 url:"/sms_validate_code/?mobile="+phone, 493 url:"/sms_validate_code/?mobile="+phone,
494 success:function(msg){ 494 success:function(msg){
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
533 Core.showTips('请输入验证码!', true); 533 Core.showTips('请输入验证码!', true);
534 return false; 534 return false;
535 } 535 }
536 - $.ajax({ 536 + Core.ajax({
537 type:"post", 537 type:"post",
538 url:"/user/password_by_mobile?mobile="+phoneTest+"&username="+accout+"&vcode="+code, 538 url:"/user/password_by_mobile?mobile="+phoneTest+"&username="+accout+"&vcode="+code,
539 data:{format:"json"}, 539 data:{format:"json"},
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
559 account = $("input[name='loginUserName']").val(); 559 account = $("input[name='loginUserName']").val();
560 var names = localStorage.getItem('user_names'); 560 var names = localStorage.getItem('user_names');
561 names = JSON.parse(names); 561 names = JSON.parse(names);
562 - $.ajax({ 562 + Core.ajax({
563 type:"post", 563 type:"post",
564 url:"/user/reset_passwd?pwd_code="+NewKey+"&password="+NewPsw, 564 url:"/user/reset_passwd?pwd_code="+NewKey+"&password="+NewPsw,
565 data:{format:"json"}, 565 data:{format:"json"},
...@@ -779,7 +779,7 @@ ...@@ -779,7 +779,7 @@
779 ele.on("click",element,function(){ 779 ele.on("click",element,function(){
780 var phoneTest = $(iphone).val(); 780 var phoneTest = $(iphone).val();
781 if(self.mobileReg(iphone) == false) return false; 781 if(self.mobileReg(iphone) == false) return false;
782 - $.ajax({ 782 + Core.ajax({
783 type:"post", 783 type:"post",
784 url:"/sms_validate_code/?mobile="+phoneTest, 784 url:"/sms_validate_code/?mobile="+phoneTest,
785 success:function(msg){ 785 success:function(msg){
...@@ -815,7 +815,7 @@ ...@@ -815,7 +815,7 @@
815 Core.showTips('请输入验证码!', true); 815 Core.showTips('请输入验证码!', true);
816 return false; 816 return false;
817 } 817 }
818 - $.ajax({ 818 + Core.ajax({
819 type:"post", 819 type:"post",
820 url:"/user/bind_mobile?mobile="+phoneTest+"&vcode="+code, 820 url:"/user/bind_mobile?mobile="+phoneTest+"&vcode="+code,
821 data:{format:"json"}, 821 data:{format:"json"},
...@@ -853,7 +853,7 @@ ...@@ -853,7 +853,7 @@
853 that.$c.on("click","#js_unbind_getcode",function(){ 853 that.$c.on("click","#js_unbind_getcode",function(){
854 var $self = $(this), 854 var $self = $(this),
855 phone = Core.Data.bind_phone; 855 phone = Core.Data.bind_phone;
856 - $.ajax({ 856 + Core.ajax({
857 type:"post", 857 type:"post",
858 url:"/sms_validate_code/?mobile="+phone, 858 url:"/sms_validate_code/?mobile="+phone,
859 success:function(msg){ 859 success:function(msg){
...@@ -884,7 +884,7 @@ ...@@ -884,7 +884,7 @@
884 Core.showTips('请输入验证码!', true); 884 Core.showTips('请输入验证码!', true);
885 return false; 885 return false;
886 } 886 }
887 - $.ajax({ 887 + Core.ajax({
888 type:"post", 888 type:"post",
889 url:"/user/unbind_mobile?mobile="+phoneTest+"&vcode="+code, 889 url:"/user/unbind_mobile?mobile="+phoneTest+"&vcode="+code,
890 data:{format:"json"}, 890 data:{format:"json"},
......
...@@ -314,9 +314,9 @@ ...@@ -314,9 +314,9 @@
314 <div class="function-list-content hide"> 314 <div class="function-list-content hide">
315 <div class="pwd_txt"> 315 <div class="pwd_txt">
316 <div class="default_text" style="display: none;"> 316 <div class="default_text" style="display: none;">
317 - <p>客服QQ：<a href="javascript:;" id="js_kefu_qq">2739920773</a></p> 317 + <p>客服QQ：<a href="javascript:;" id="js_kefu_qq"></a></p>
318 - <p>客服电话：<a href="tel:020-87510588">020-87510588</a></p> 318 + <p>客服电话：<a href="tel:"></a></p>
319 - <p>玩家交流群：<a href="javascript:;" id="js_player">167355030</a></p> 319 + <p>玩家交流群：<a href="javascript:;" id="js_player"></a></p>
320 </div> 320 </div>
321 <div class="get_text"></div> 321 <div class="get_text"></div>
322 </div> 322 </div>
...@@ -358,12 +358,7 @@ ...@@ -358,12 +358,7 @@
358 <div class="container"> 358 <div class="container">
359 <div class="box_info_center"> 359 <div class="box_info_center">
360 <div class='align-left'> 360 <div class='align-left'>
361 - <p class="">登陆手游平台官网(<span class='text-error'> www.9133.com</span>)就可以:</p> 361 +
362 - <p class="text-indent">1.上传酷炫头像,设置更多个性资料</p>
363 - <p class="text-indent">2.绑定微博帐号,绑定邮箱,增强帐号安全</p>
364 - <p class="text-indent">3.用电脑方便充值还能获得返利</p>
365 - <p class="text-indent">4.海量精品游戏免费下载,附带攻略大全</p>
366 - <p class="text-indent">5.更多玩法,等你发现...</p>
367 </div> 362 </div>
368 </div> 363 </div>
369 </div> 364 </div>
...@@ -657,8 +652,6 @@ ...@@ -657,8 +652,6 @@
657 <div class="new-sdk-box"> 652 <div class="new-sdk-box">
658 <p>问题：{{=Core.Data.safe_question}}</p> 653 <p>问题：{{=Core.Data.safe_question}}</p>
659 <p>答案：{{=Core.Data.safe_answer}}</p> 654 <p>答案：{{=Core.Data.safe_answer}}</p>
660 -
661 - <p>修改密保设置请访问<a href="javascript:Core.goTo('http://m.9133.com')">www.9133.com</a></p>
662 </div> 655 </div>
663 </form> 656 </form>
664 </div> 657 </div>
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.

7.05 KB | W: | H:

7.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.68 KB | W: | H:

7.68 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -139,8 +139,9 @@ function initMatching(){ ...@@ -139,8 +139,9 @@ function initMatching(){
139 var ratio = window.devicePixelRatio; 139 var ratio = window.devicePixelRatio;
140 Core.ratio = ratio; 140 Core.ratio = ratio;
141 141
142 - Core.server = 'http://sdk.shxingwan.com'; 142 + Core.PLATFORM_NAME = '星玩';
143 143
144 + Core.server = 'http://sdk.shxingwan.com';
144 var lastServer = localStorage.getItem('last_server'); 145 var lastServer = localStorage.getItem('last_server');
145 if(lastServer && lastServer.indexOf('http:')==0){ 146 if(lastServer && lastServer.indexOf('http:')==0){
146 if(Core.isFile){ 147 if(Core.isFile){
...@@ -280,7 +281,17 @@ function initMatching(){ ...@@ -280,7 +281,17 @@ function initMatching(){
280 // },3000); 281 // },3000);
281 //} 282 //}
282 } 283 }
283 - 284 + core.get_url = function(url){
285 + var url = url
286 + if (core.isFile) {
287 + url = Core.server + url;
288 + }
289 + if (core.Data.open_id && core.Data.login_key){
290 + var connect_str = url.indexOf('?') >=0 ? '&' : '?'
291 + url = url + connect_str + 'open_id=' + core.Data.open_id + '&login_key=' + core.Data.login_key;
292 + }
293 + return url
294 + }
284 //格式化输出字符串 295 //格式化输出字符串
285 // core.format = function(str){ 296 // core.format = function(str){
286 // var params = Array.prototype.slice.call(arguments, 1); 297 // var params = Array.prototype.slice.call(arguments, 1);
...@@ -298,22 +309,7 @@ function initMatching(){ ...@@ -298,22 +309,7 @@ function initMatching(){
298 if (!data) { 309 if (!data) {
299 Core.Data.username = null; 310 Core.Data.username = null;
300 Core.Data.nickname = null; 311 Core.Data.nickname = null;
301 - // Core.Data.username = null; 312 +
302 - // Core.Data.youai_star = null;
303 - // Core.Data.power = null;
304 - // Core.Data.bind_phone = null;
305 - // Core.Data.bind_statu = null;
306 - // Core.Data.nickname = null;
307 - // Core.Data.is_guest = null;
308 - // Core.Data.face = null;
309 - // Core.Data["open_id"] = null;
310 - // Core.Data["token"] = null;
311 - // Core.Data["timestamp"] = null;
312 - // Core.Data["login_key"] = null;
313 - // Core.Data.safe_question = null;
314 - // Core.Data.bind_mail_statu = null;
315 - // Core.Data.mail = null;
316 - // Core.Data.safe_answer = null;
317 return; 313 return;
318 } 314 }
319 Core.Data = data 315 Core.Data = data
...@@ -323,23 +319,7 @@ function initMatching(){ ...@@ -323,23 +319,7 @@ function initMatching(){
323 if(data.face){ 319 if(data.face){
324 Core.Data.face = Core.server + data.face; 320 Core.Data.face = Core.server + data.face;
325 } 321 }
326 - // Core.Data.username = data.username; 322 +
327 - // Core.Data.nickname = data.nickname;
328 - // Core.Data.youai_star = data.youai_star;
329 - // Core.Data.power = data.power;
330 - // Core.Data.bind_phone = data.bind_phone;
331 - // Core.Data.bind_statu = data.bind_statu;
332 - // Core.Data.is_guest = data.is_guest;
333 - // Core.Data.face = data.face;
334 - // Core.Data.score = data.score;
335 - // Core.Data["open_id"] = data.open_id + '';
336 - // Core.Data["token"] = data.token;
337 - // Core.Data["timestamp"] = data.timestamp + '';
338 - // Core.Data["login_key"] = data.login_key;
339 - // Core.Data.safe_question = data.safe_question;
340 - // Core.Data.safe_answer = data.safe_answer;
341 - // Core.Data.bind_mail_statu = data.bind_mail_statu;
342 - // Core.Data.mail = data.mail;
343 } 323 }
344 324
345 /** 325 /**
...@@ -473,7 +453,24 @@ function initMatching(){ ...@@ -473,7 +453,24 @@ function initMatching(){
473 } 453 }
474 return result; 454 return result;
475 } 455 }
456 + core.ajax = function(settings){
457 + //跨域修复https://github.com/imweb/mobile/issues/6
458 + settings.url = Core.get_url(settings.url)
459 + settings.beforeSend = function(xhr) {
460 + try {
461 + xhr.withCredentials = true;
462 + } catch (e) {
463 + var nativeOpen = xhr.open;
464 + xhr.open = function() {
465 + var result = nativeOpen.apply(xhr, arguments);
466 + xhr.withCredentials = true;
467 + return result;
468 + };
469 + }
470 + }
476 471
472 + return $.ajax(settings);
473 + },
477 core.ajax_do = function($obj, func, context) { 474 core.ajax_do = function($obj, func, context) {
478 var param = ''; 475 var param = '';
479 var action_methon = null; 476 var action_methon = null;
...@@ -510,15 +507,26 @@ function initMatching(){ ...@@ -510,15 +507,26 @@ function initMatching(){
510 } else { 507 } else {
511 post_url += '?format=json'; 508 post_url += '?format=json';
512 } 509 }
513 - if(Core.isFile){ 510 +
514 - post_url = core.server + post_url; 511 +
515 - }
516 var options = { 512 var options = {
517 type: action_method, 513 type: action_method,
518 - url: post_url, 514 + url: Core.get_url(post_url),
519 dataType: 'json', 515 dataType: 'json',
520 contentType: "application/x-www-form-urlencoded; charset=utf-8", 516 contentType: "application/x-www-form-urlencoded; charset=utf-8",
521 data: param, 517 data: param,
518 + beforeSend: function(xhr) {
519 + try {
520 + xhr.withCredentials = true;
521 + } catch (e) {
522 + var nativeOpen = xhr.open;
523 + xhr.open = function() {
524 + var result = nativeOpen.apply(xhr, arguments);
525 + xhr.withCredentials = true;
526 + return result;
527 + };
528 + }
529 + },
522 success: function(result, textStatus) { 530 success: function(result, textStatus) {
523 if (result.code == -10) { 531 if (result.code == -10) {
524 // 未登录，跳转的登录界面 532 // 未登录，跳转的登录界面
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 var params = location.hash.slice(1); 11 var params = location.hash.slice(1);
12 var args = params.match(/app_id=(\w*)&?/); 12 var args = params.match(/app_id=(\w*)&?/);
13 var start_page = params.match(/mod=(\w*)&?/); 13 var start_page = params.match(/mod=(\w*)&?/);
14 + var core_server = params.match(/core_server=(.*)&?/);
14 var appId = ''; 15 var appId = '';
15 16
16 var skin_v = '?' + $('#skin').attr('data-v'); 17 var skin_v = '?' + $('#skin').attr('data-v');
...@@ -23,6 +24,9 @@ ...@@ -23,6 +24,9 @@
23 Core.start_page = start_page[1]; 24 Core.start_page = start_page[1];
24 console.log(Core.start_page); 25 console.log(Core.start_page);
25 } 26 }
27 + if (core_server){
28 + Core.server = core_server[1]
29 + }
26 location.hash = ''; 30 location.hash = '';
27 if (appId == '') { 31 if (appId == '') {
28 //刷新地址出错 32 //刷新地址出错
...@@ -47,7 +51,7 @@ ...@@ -47,7 +51,7 @@
47 var tryAutoLogin = false; 51 var tryAutoLogin = false;
48 var _skin = localStorage.getItem('skin_' + appId); 52 var _skin = localStorage.getItem('skin_' + appId);
49 if (_skin) { 53 if (_skin) {
50 - $('#skin').attr('href', Core.server + '/static/sdk_3/skin/' + _skin + '/skin.css' + skin_v); 54 + $('#skin').attr('href', Core.server + '/static/sdk/skin/' + _skin + '/skin.css' + skin_v);
51 setSkin = true; 55 setSkin = true;
52 } 56 }
53 if ($('#login').length != 0) { 57 if ($('#login').length != 0) {
...@@ -69,6 +73,7 @@ ...@@ -69,6 +73,7 @@
69 if (Core.isFile) { 73 if (Core.isFile) {
70 url = Core.server + url; 74 url = Core.server + url;
71 } 75 }
76 +
72 $.ajax({ 77 $.ajax({
73 type: 'GET', 78 type: 'GET',
74 url: url + '?' + params, 79 url: url + '?' + params,
...@@ -94,7 +99,7 @@ ...@@ -94,7 +99,7 @@
94 } 99 }
95 100
96 if (!setSkin && data.skin) { 101 if (!setSkin && data.skin) {
97 - $('#skin').attr('href', Core.server + '/static/sdk_3/skin/' + data.skin + '/skin.css' + skin_v); 102 + $('#skin').attr('href', Core.server + '/static/sdk/skin/' + data.skin + '/skin.css' + skin_v);
98 localStorage.setItem('skin_' + appId, data.skin); 103 localStorage.setItem('skin_' + appId, data.skin);
99 } 104 }
100 localStorage.setItem('data_' + url, JSON.stringify(data.msg)); 105 localStorage.setItem('data_' + url, JSON.stringify(data.msg));
...@@ -119,9 +124,7 @@ ...@@ -119,9 +124,7 @@
119 // 核心初始化 124 // 核心初始化
120 Core.loadFinished(); 125 Core.loadFinished();
121 } 126 }
122 -// if (!Core.isFile) { 127 +
123 -// $('<iframe class="hide" width="0" height="0" src="/sdk/manifest/' + appId + '"></iframe>').appendTo($('body'));
124 -// }
125 }, 128 },
126 error: function(xhr, type) { 129 error: function(xhr, type) {
127 // 请求失败，服务器崩溃 130 // 请求失败，服务器崩溃
......
...@@ -217,14 +217,14 @@ ...@@ -217,14 +217,14 @@
217 Core.first_user = this.$c.find('[name="username"]').val() 217 Core.first_user = this.$c.find('[name="username"]').val()
218 Core.first_password = this.$c.find('[name="password"]').val() 218 Core.first_password = this.$c.find('[name="password"]').val()
219 this.cache(); 219 this.cache();
220 - Core.showTips('成功登录，欢迎使用游戏平台'); 220 + Core.showTips('成功登录，欢迎使用'+ Core.PLATFORM_NAME +'游戏平台');
221 Core.updateMod('home'); 221 Core.updateMod('home');
222 } 222 }
223 Login.prototype.login_eg_cb = function(result) { 223 Login.prototype.login_eg_cb = function(result) {
224 Core.updateData(result.msg); 224 Core.updateData(result.msg);
225 // 跳转进入游戏 225 // 跳转进入游戏
226 this.cache(); 226 this.cache();
227 - Core.showTips('成功登录，欢迎使用游戏平台, 正在进入游戏'); 227 + Core.showTips('成功登录，欢迎使用'+ Core.PLATFORM_NAME +'游戏平台, 正在进入游戏');
228 setTimeout(function() { 228 setTimeout(function() {
229 Core.finishLogin(); 229 Core.finishLogin();
230 }, 1000); 230 }, 1000);
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
369 Core.ajax_do(that.$c.find('.ajax'), that.register_cb, 369 Core.ajax_do(that.$c.find('.ajax'), that.register_cb,
370 that); 370 that);
371 } else{ 371 } else{
372 - Core.showTips('请同意网络协议',1); 372 + Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
373 } 373 }
374 return false; 374 return false;
375 }); 375 });
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
400 Core.first_password = this.$c.find('[name="password"]').val() 400 Core.first_password = this.$c.find('[name="password"]').val()
401 // 显示一个注册成功信息，并跳转到home 401 // 显示一个注册成功信息，并跳转到home
402 this.cache(); 402 this.cache();
403 - Core.showTips('成功注册，欢迎使用游戏平台'); 403 + Core.showTips('成功注册，欢迎使用' + Core.PLATFORM_NAME + '游戏平台');
404 Core.updateMod('home'); 404 Core.updateMod('home');
405 } 405 }
406 Register.prototype.show_after = function() { 406 Register.prototype.show_after = function() {
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
488 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码 488 that.$c.on("click","#js_findPSW_getcode",function(){//找回密码获取验证码
489 var $self = $(this) 489 var $self = $(this)
490 phone = $("#js_findPSW_mobile").val(); 490 phone = $("#js_findPSW_mobile").val();
491 - $.ajax({ 491 + Core.ajax({
492 type:"post", 492 type:"post",
493 url:"/sms_validate_code/?mobile="+phone, 493 url:"/sms_validate_code/?mobile="+phone,
494 success:function(msg){ 494 success:function(msg){
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
533 Core.showTips('请输入验证码!', true); 533 Core.showTips('请输入验证码!', true);
534 return false; 534 return false;
535 } 535 }
536 - $.ajax({ 536 + Core.ajax({
537 type:"post", 537 type:"post",
538 url:"/user/password_by_mobile?mobile="+phoneTest+"&username="+accout+"&vcode="+code, 538 url:"/user/password_by_mobile?mobile="+phoneTest+"&username="+accout+"&vcode="+code,
539 data:{format:"json"}, 539 data:{format:"json"},
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
559 account = $("input[name='loginUserName']").val(); 559 account = $("input[name='loginUserName']").val();
560 var names = localStorage.getItem('user_names'); 560 var names = localStorage.getItem('user_names');
561 names = JSON.parse(names); 561 names = JSON.parse(names);
562 - $.ajax({ 562 + Core.ajax({
563 type:"post", 563 type:"post",
564 url:"/user/reset_passwd?pwd_code="+NewKey+"&password="+NewPsw, 564 url:"/user/reset_passwd?pwd_code="+NewKey+"&password="+NewPsw,
565 data:{format:"json"}, 565 data:{format:"json"},
...@@ -779,7 +779,7 @@ ...@@ -779,7 +779,7 @@
779 ele.on("click",element,function(){ 779 ele.on("click",element,function(){
780 var phoneTest = $(iphone).val(); 780 var phoneTest = $(iphone).val();
781 if(self.mobileReg(iphone) == false) return false; 781 if(self.mobileReg(iphone) == false) return false;
782 - $.ajax({ 782 + Core.ajax({
783 type:"post", 783 type:"post",
784 url:"/sms_validate_code/?mobile="+phoneTest, 784 url:"/sms_validate_code/?mobile="+phoneTest,
785 success:function(msg){ 785 success:function(msg){
...@@ -815,7 +815,7 @@ ...@@ -815,7 +815,7 @@
815 Core.showTips('请输入验证码!', true); 815 Core.showTips('请输入验证码!', true);
816 return false; 816 return false;
817 } 817 }
818 - $.ajax({ 818 + Core.ajax({
819 type:"post", 819 type:"post",
820 url:"/user/bind_mobile?mobile="+phoneTest+"&vcode="+code, 820 url:"/user/bind_mobile?mobile="+phoneTest+"&vcode="+code,
821 data:{format:"json"}, 821 data:{format:"json"},
...@@ -853,7 +853,7 @@ ...@@ -853,7 +853,7 @@
853 that.$c.on("click","#js_unbind_getcode",function(){ 853 that.$c.on("click","#js_unbind_getcode",function(){
854 var $self = $(this), 854 var $self = $(this),
855 phone = Core.Data.bind_phone; 855 phone = Core.Data.bind_phone;
856 - $.ajax({ 856 + Core.ajax({
857 type:"post", 857 type:"post",
858 url:"/sms_validate_code/?mobile="+phone, 858 url:"/sms_validate_code/?mobile="+phone,
859 success:function(msg){ 859 success:function(msg){
...@@ -884,7 +884,7 @@ ...@@ -884,7 +884,7 @@
884 Core.showTips('请输入验证码!', true); 884 Core.showTips('请输入验证码!', true);
885 return false; 885 return false;
886 } 886 }
887 - $.ajax({ 887 + Core.ajax({
888 type:"post", 888 type:"post",
889 url:"/user/unbind_mobile?mobile="+phoneTest+"&vcode="+code, 889 url:"/user/unbind_mobile?mobile="+phoneTest+"&vcode="+code,
890 data:{format:"json"}, 890 data:{format:"json"},
......
...@@ -314,9 +314,9 @@ ...@@ -314,9 +314,9 @@
314 <div class="function-list-content hide"> 314 <div class="function-list-content hide">
315 <div class="pwd_txt"> 315 <div class="pwd_txt">
316 <div class="default_text" style="display: none;"> 316 <div class="default_text" style="display: none;">
317 - <p>客服QQ：<a href="javascript:;" id="js_kefu_qq">2739920773</a></p> 317 + <p>客服QQ：<a href="javascript:;" id="js_kefu_qq"></a></p>
318 - <p>客服电话：<a href="tel:020-87510588">020-87510588</a></p> 318 + <p>客服电话：<a href="tel:"></a></p>
319 - <p>玩家交流群：<a href="javascript:;" id="js_player">167355030</a></p> 319 + <p>玩家交流群：<a href="javascript:;" id="js_player"></a></p>
320 </div> 320 </div>
321 <div class="get_text"></div> 321 <div class="get_text"></div>
322 </div> 322 </div>
...@@ -358,12 +358,7 @@ ...@@ -358,12 +358,7 @@
358 <div class="container"> 358 <div class="container">
359 <div class="box_info_center"> 359 <div class="box_info_center">
360 <div class='align-left'> 360 <div class='align-left'>
361 - <p class="">登陆手游平台官网(<span class='text-error'> www.9133.com</span>)就可以:</p> 361 +
362 - <p class="text-indent">1.上传酷炫头像,设置更多个性资料</p>
363 - <p class="text-indent">2.绑定微博帐号,绑定邮箱,增强帐号安全</p>
364 - <p class="text-indent">3.用电脑方便充值还能获得返利</p>
365 - <p class="text-indent">4.海量精品游戏免费下载,附带攻略大全</p>
366 - <p class="text-indent">5.更多玩法,等你发现...</p>
367 </div> 362 </div>
368 </div> 363 </div>
369 </div> 364 </div>
...@@ -657,8 +652,6 @@ ...@@ -657,8 +652,6 @@
657 <div class="new-sdk-box"> 652 <div class="new-sdk-box">
658 <p>问题：{{=Core.Data.safe_question}}</p> 653 <p>问题：{{=Core.Data.safe_question}}</p>
659 <p>答案：{{=Core.Data.safe_answer}}</p> 654 <p>答案：{{=Core.Data.safe_answer}}</p>
660 -
661 - <p>修改密保设置请访问<a href="javascript:Core.goTo('http://m.9133.com')">www.9133.com</a></p>
662 </div> 655 </div>
663 </form> 656 </form>
664 </div> 657 </div>
......
...@@ -22,14 +22,13 @@ public final class R { ...@@ -22,14 +22,13 @@ public final class R {
22 public static final int public_sdk_self_ya_login_bt_selector=0x7f020008; 22 public static final int public_sdk_self_ya_login_bt_selector=0x7f020008;
23 } 23 }
24 public static final class id { 24 public static final class id {
25 - public static final int forum_bt=0x7f050005; 25 + public static final int forum_bt=0x7f050004;
26 - public static final int logout_bt=0x7f050004; 26 + public static final int logout_bt=0x7f050003;
27 public static final int ya_channel_center=0x7f050000; 27 public static final int ya_channel_center=0x7f050000;
28 - public static final int ya_enter_game_bt=0x7f050007; 28 + public static final int ya_enter_game_bt=0x7f050006;
29 - public static final int ya_login_bt=0x7f050006; 29 + public static final int ya_login_bt=0x7f050005;
30 public static final int ya_pay_bt=0x7f050001; 30 public static final int ya_pay_bt=0x7f050001;
31 - public static final int ya_submit_role_data_bt=0x7f050003; 31 + public static final int ya_submit_role_data_bt=0x7f050002;
32 - public static final int ya_switch_account_bt=0x7f050002;
33 } 32 }
34 public static final class layout { 33 public static final class layout {
35 public static final int public_sdk_self_game=0x7f030000; 34 public static final int public_sdk_self_game=0x7f030000;
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
13 android:background="@drawable/public_sdk_self_ya_bt_selector" 13 android:background="@drawable/public_sdk_self_ya_bt_selector"
14 android:onClick="yaOnClick"/> 14 android:onClick="yaOnClick"/>
15 15
16 - <Button 16 + <!-- <Button
17 android:id="@+id/ya_switch_account_bt" 17 android:id="@+id/ya_switch_account_bt"
18 android:layout_width="180dp" 18 android:layout_width="180dp"
19 android:layout_height="60dp" 19 android:layout_height="60dp"
20 android:layout_alignParentRight="true" 20 android:layout_alignParentRight="true"
21 android:layout_alignTop="@+id/ya_submit_role_data_bt" 21 android:layout_alignTop="@+id/ya_submit_role_data_bt"
22 android:background="@drawable/public_sdk_self_ya_bt_selector" 22 android:background="@drawable/public_sdk_self_ya_bt_selector"
23 - android:onClick="yaOnClick" /> 23 + android:onClick="yaOnClick" /> -->
24 24
25 <Button 25 <Button
26 android:id="@+id/ya_submit_role_data_bt" 26 android:id="@+id/ya_submit_role_data_bt"
......
...@@ -34,7 +34,6 @@ public class AppActivity extends Activity { ...@@ -34,7 +34,6 @@ public class AppActivity extends Activity {
34 private Button yaPayBt; 34 private Button yaPayBt;
35 private Button yaSubmitRoleDataBt; 35 private Button yaSubmitRoleDataBt;
36 private Button yaChannelCenter; 36 private Button yaChannelCenter;
37 - private Button yaSwitchAccountBt;
38 private Button yaLogoutBt; 37 private Button yaLogoutBt;
39 private Button yaForumBt; 38 private Button yaForumBt;
40 39
...@@ -238,9 +237,6 @@ public class AppActivity extends Activity { ...@@ -238,9 +237,6 @@ public class AppActivity extends Activity {
238 yaChannelCenter = (Button) findViewById(getRedIdByName( 237 yaChannelCenter = (Button) findViewById(getRedIdByName(
239 "ya_channel_center", "id")); 238 "ya_channel_center", "id"));
240 yaChannelCenter.setText("渠道中心"); 239 yaChannelCenter.setText("渠道中心");
241 - yaSwitchAccountBt = (Button) findViewById(getRedIdByName(
242 - "ya_switch_account_bt", "id"));
243 - yaSwitchAccountBt.setText("切换账号");
244 PoolSdkLog.logError("" + yaPayBt + "yachannel:" + yaChannelCenter); 240 PoolSdkLog.logError("" + yaPayBt + "yachannel:" + yaChannelCenter);
245 241
246 yaLogoutBt = (Button) findViewById(getRedIdByName("logout_bt", "id")); 242 yaLogoutBt = (Button) findViewById(getRedIdByName("logout_bt", "id"));
...@@ -261,8 +257,6 @@ public class AppActivity extends Activity { ...@@ -261,8 +257,6 @@ public class AppActivity extends Activity {
261 submitRoleData(); 257 submitRoleData();
262 } else if (view == yaChannelCenter) { 258 } else if (view == yaChannelCenter) {
263 channelCenter(); 259 channelCenter();
264 - } else if (view == yaSwitchAccountBt) {
265 - switchAccount();
266 } else if (view == yaLogoutBt){ 260 } else if (view == yaLogoutBt){
267 logout(); 261 logout();
268 } else if (view == yaForumBt){ 262 } else if (view == yaForumBt){
...@@ -397,15 +391,6 @@ public class AppActivity extends Activity { ...@@ -397,15 +391,6 @@ public class AppActivity extends Activity {
397 } 391 }
398 392
399 /** 393 /**
400 - * 切换帐号
401 - */
402 - private void switchAccount() {
403 - if(PoolSdkHelper.hasSwitchAccount()){
404 - PoolSdkHelper.switchAccount(this);
405 - }
406 - }
407 -
408 - /**
409 * 扩展接口 394 * 扩展接口
410 */ 395 */
411 private void expansionInterface() { 396 private void expansionInterface() {
......
No preview for this file type