public_service / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
xuguohong
249b3533 1 parent 28ae3cf0

update sdk

Expand all
Inline Side-by-side
Showing 10 changed files with 105 additions and 19 deletions
No preview for this file type
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<projectDescription>
3 + <name>sdk_3</name>
4 + <comment></comment>
5 + <projects>
6 + </projects>
7 + <buildSpec>
8 + <buildCommand>
9 + <name>com.aptana.editor.php.aptanaPhpBuilder</name>
10 + <arguments>
11 + </arguments>
12 + </buildCommand>
13 + <buildCommand>
14 + <name>com.aptana.ide.core.unifiedBuilder</name>
15 + <arguments>
16 + </arguments>
17 + </buildCommand>
18 + </buildSpec>
19 + <natures>
20 + <nature>com.aptana.projects.webnature</nature>
21 + <nature>com.aptana.editor.php.phpNature</nature>
22 + </natures>
23 + <filteredResources>
24 + <filter>
25 + <id>1489975865951</id>
26 + <name></name>
27 + <type>26</type>
28 + <matcher>
29 + <id>org.eclipse.ui.ide.multiFilter</id>
30 + <arguments>1.0-name-matches-false-false-node_modules</arguments>
31 + </matcher>
32 + </filter>
33 + </filteredResources>
34 +</projectDescription>
This diff is collapsed. Click to expand it.
...@@ -143,10 +143,14 @@ function initMatching(){ ...@@ -143,10 +143,14 @@ function initMatching(){
143 var ratio = window.devicePixelRatio; 143 var ratio = window.devicePixelRatio;
144 Core.ratio = ratio; 144 Core.ratio = ratio;
145 145
146 - Core.PLATFORM_NAME = '游娱'; 146 + Core.PLATFORM_NAME = '海豹';
147 147
148 - 148 + if(Core.isIos){
149 - Core.server = 'https://sdk.uuufish.com'; 149 + Core.server = 'https://sdk.uuufish.com';
150 + }else{
151 + Core.server = 'http://sdk.uuufish.com';
152 + }
153 +
150 154
151 var lastServer = localStorage.getItem('last_server'); 155 var lastServer = localStorage.getItem('last_server');
152 if(lastServer && lastServer.indexOf('http:')==0){ 156 if(lastServer && lastServer.indexOf('http:')==0){
......
...@@ -70,6 +70,8 @@ ...@@ -70,6 +70,8 @@
70 if (!tryAutoLogin) 70 if (!tryAutoLogin)
71 goInit(); 71 goInit();
72 72
73 +
74 +
73 75
74 Core.ajax({ 76 Core.ajax({
75 type: 'GET', 77 type: 'GET',
......
...@@ -49,6 +49,10 @@ ...@@ -49,6 +49,10 @@
49 Core.showMod('help'); 49 Core.showMod('help');
50 return false; 50 return false;
51 }); 51 });
52 + that.$c.on("click",".js-enter-game",function(e){//强制进入实名认证界面
53 + e.stopPropagation();
54 + Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！");
55 + });
52 } 56 }
53 57
54 Home.prototype.logout_cb = function(data) { 58 Home.prototype.logout_cb = function(data) {
...@@ -58,7 +62,7 @@ ...@@ -58,7 +62,7 @@
58 62
59 } 63 }
60 Home.prototype.show_after = function(){ 64 Home.prototype.show_after = function(){
61 - $('#login').hide() 65 + $('#login').hide();
62 } 66 }
63 Core.registerMod('home', Home); 67 Core.registerMod('home', Home);
64 68
......
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 <div class="SDK-titlebox"></div> 171 <div class="SDK-titlebox"></div>
172 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div> 172 <div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
173 <div class="new-sdk-content" style="overflow: hidden;"> 173 <div class="new-sdk-content" style="overflow: hidden;">
174 - <h3>网络服务协议</h3> 174 + <h3>海豹游戏服务协议</h3>
175 <div class="content-main" style="height: 220px;"> 175 <div class="content-main" style="height: 220px;">
176 176
177 <iframe src="agreement.html" name="myiframe" id="iframepage" frameborder="0" scrolling="auto" width="100%"></iframe> 177 <iframe src="agreement.html" name="myiframe" id="iframepage" frameborder="0" scrolling="auto" width="100%"></iframe>
...@@ -419,7 +419,11 @@ ...@@ -419,7 +419,11 @@
419 <p>{{=Core.Data.nickname}}</p> 419 <p>{{=Core.Data.nickname}}</p>
420 </div> 420 </div>
421 <div class="inline-btn pull-right w_45"> 421 <div class="inline-btn pull-right w_45">
422 - <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 422 + {{? Core.Data.force_auth == 1 && Core.Data.compellation_name == "" && Core.Data.identity_card == ""}}
423 + <a href="#identityCard" class="btn btn-orange js-enter-game">进入游戏</a>
424 + {{??}}
425 + <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
426 + {{?}}
423 </div> 427 </div>
424 </div> 428 </div>
425 <div class="bind-user"> 429 <div class="bind-user">
...@@ -430,6 +434,7 @@ ...@@ -430,6 +434,7 @@
430 <a class="btn btn-bind" href="#modify_pwd">马上升级</a> 434 <a class="btn btn-bind" href="#modify_pwd">马上升级</a>
431 </div> 435 </div>
432 </div> 436 </div>
437 + <p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
433 </div> 438 </div>
434 {{?? Core.Data.is_guest == 2}}<!--1:游客登录；2：第三方登录；0：正式用户登录--> 439 {{?? Core.Data.is_guest == 2}}<!--1:游客登录；2：第三方登录；0：正式用户登录-->
435 <div class="user-center-box"> 440 <div class="user-center-box">
...@@ -439,7 +444,11 @@ ...@@ -439,7 +444,11 @@
439 <p>{{=Core.Data.nickname}}</p> 444 <p>{{=Core.Data.nickname}}</p>
440 </div> 445 </div>
441 <div class="inline-btn pull-right w_45"> 446 <div class="inline-btn pull-right w_45">
442 - <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 447 + {{? Core.Data.force_auth == 1 && Core.Data.compellation_name == "" && Core.Data.identity_card == ""}}
448 + <a href="#identityCard" class="btn btn-orange js-enter-game">进入游戏</a>
449 + {{??}}
450 + <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
451 + {{?}}
443 </div> 452 </div>
444 </div> 453 </div>
445 {{? Core.Data.bind_phone === ""}} 454 {{? Core.Data.bind_phone === ""}}
...@@ -457,6 +466,7 @@ ...@@ -457,6 +466,7 @@
457 <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li> 466 <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
458 <li style="width:50%;"><a href="#identityCard">实名认证</a></li> 467 <li style="width:50%;"><a href="#identityCard">实名认证</a></li>
459 </ul> 468 </ul>
469 + <p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
460 {{?}} 470 {{?}}
461 </div> 471 </div>
462 {{?? Core.Data.is_guest == 0}} 472 {{?? Core.Data.is_guest == 0}}
...@@ -467,19 +477,21 @@ ...@@ -467,19 +477,21 @@
467 <p>{{=Core.Data.nickname}}</p> 477 <p>{{=Core.Data.nickname}}</p>
468 </div> 478 </div>
469 <div class="inline-btn pull-right w_45"> 479 <div class="inline-btn pull-right w_45">
470 - <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a> 480 + {{? Core.Data.force_auth == 1 && Core.Data.compellation_name == "" && Core.Data.identity_card == ""}}
481 + <a href="#identityCard" class="btn btn-orange js-enter-game">进入游戏</a>
482 + {{??}}
483 + <a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
484 + {{?}}
471 </div> 485 </div>
472 </div> 486 </div>
473 - 487 +
474 - {{? Core.Data.bind_phone === ""}} 488 + {{? Core.Data.force_auth == 1}}
475 - <ul class="list-item clearfix">
476 - <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
477 - <li><a href="#mibao">设置密保</a></li>
478 - <li><a href="#modify_pwd">修改密码</a></li>
479 - </ul>
480 - {{??}}
481 <ul class="list-item clearfix"> 489 <ul class="list-item clearfix">
482 - <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li> 490 + {{? Core.Data.bind_phone === ""}}
491 + <li style="position: relative;width:50%;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
492 + {{??}}
493 + <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
494 + {{?}}
483 <li style="width:50%;"><a href="#mibao">设置密保</a></li> 495 <li style="width:50%;"><a href="#mibao">设置密保</a></li>
484 </ul> 496 </ul>
485 <ul class="list-item clearfix" style="border-top:none;"> 497 <ul class="list-item clearfix" style="border-top:none;">
...@@ -492,7 +504,33 @@ ...@@ -492,7 +504,33 @@
492 </a></li> 504 </a></li>
493 {{?}} 505 {{?}}
494 </ul> 506 </ul>
495 - {{?}} 507 + <p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
508 + {{??}}
509 + {{? Core.Data.bind_phone === ""}}
510 + <ul class="list-item clearfix">
511 + <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
512 + <li><a href="#mibao">设置密保</a></li>
513 + <li><a href="#modify_pwd">修改密码</a></li>
514 + </ul>
515 + <p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 1em;left:0;">{{=Core.Data.kefu_info[0]}}</p>
516 + {{??}}
517 + <ul class="list-item clearfix">
518 + <li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
519 + <li style="width:50%;"><a href="#mibao">设置密保</a></li>
520 + </ul>
521 + <ul class="list-item clearfix" style="border-top:none;">
522 + <li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
523 + {{? Core.Data.compellation_name === "" && Core.Data.identity_card === ""}}
524 + <li style="width:50%;"><a href="#identityCard">实名认证</a></li>
525 + {{??}}
526 + <li style="width:50%;position:relative;"><a href="#identityCard_ok">实名认证
527 + <span style="position:absolute;right:5px;top:5px;color:#fff;background:#ff9600;padding:3px 10px;border-radius:10px;font-size:20px;">已认证</span>
528 + </a></li>
529 + {{?}}
530 + </ul>
531 + <p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
532 + {{?}}
533 + {{?}}
496 <!--<ul class="list-item clearfix"> 534 <!--<ul class="list-item clearfix">
497 {{? Core.Data.bind_phone === ""}} 535 {{? Core.Data.bind_phone === ""}}
498 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li> 536 <li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
......
...@@ -119,9 +119,10 @@ body{ ...@@ -119,9 +119,10 @@ body{
119 .new-sdk-container .new-sdk-logo{ 119 .new-sdk-container .new-sdk-logo{
120 text-align: center; 120 text-align: center;
121 width:100%; 121 width:100%;
122 + height:53px;
122 } 123 }
123 .new-sdk-container .new-sdk-logo img{ 124 .new-sdk-container .new-sdk-logo img{
124 - display: block; 125 + display: none;
125 width: 210px; 126 width: 210px;
126 margin: 0 auto; 127 margin: 0 auto;
127 padding: 15px 0 0 0; 128 padding: 15px 0 0 0;
......
...@@ -6,6 +6,7 @@ import android.content.DialogInterface; ...@@ -6,6 +6,7 @@ import android.content.DialogInterface;
6 import android.content.Intent; 6 import android.content.Intent;
7 import android.content.res.Configuration; 7 import android.content.res.Configuration;
8 import android.os.Bundle; 8 import android.os.Bundle;
9 +import android.util.Log;
9 import android.view.KeyEvent; 10 import android.view.KeyEvent;
10 import android.view.View; 11 import android.view.View;
11 import android.view.WindowManager.LayoutParams; 12 import android.view.WindowManager.LayoutParams;
...@@ -297,6 +298,8 @@ public class AppActivity extends Activity { ...@@ -297,6 +298,8 @@ public class AppActivity extends Activity {
297 } 298 }
298 299
299 private void login() { 300 private void login() {
301 +
302 + Log.e("gamechanelId", PoolSdkHelper.getGameChannelId());
300 PoolSdkHelper.login("登录自定义字段", new PoolLoginListener() { 303 PoolSdkHelper.login("登录自定义字段", new PoolLoginListener() {
301 @Override 304 @Override
302 public void onLoginSuccess(PoolLoginInfo poolLoginInfo) { 305 public void onLoginSuccess(PoolLoginInfo poolLoginInfo) {
......