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
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sdk_3</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.aptana.editor.php.aptanaPhpBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.aptana.projects.webnature</nature>
<nature>com.aptana.editor.php.phpNature</nature>
</natures>
<filteredResources>
<filter>
<id>1489975865951</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
This diff is collapsed. Click to expand it.
......@@ -143,10 +143,14 @@ function initMatching(){
var ratio = window.devicePixelRatio;
Core.ratio = ratio;
Core.PLATFORM_NAME = '游娱';
Core.PLATFORM_NAME = '海豹';
Core.server = 'https://sdk.uuufish.com';
if(Core.isIos){
Core.server = 'https://sdk.uuufish.com';
}else{
Core.server = 'http://sdk.uuufish.com';
}
var lastServer = localStorage.getItem('last_server');
if(lastServer && lastServer.indexOf('http:')==0){
......
......@@ -70,6 +70,8 @@
if (!tryAutoLogin)
goInit();
Core.ajax({
type: 'GET',
......
......@@ -49,6 +49,10 @@
Core.showMod('help');
return false;
});
that.$c.on("click",".js-enter-game",function(e){//强制进入实名认证界面
e.stopPropagation();
Core.showTips("根据政策规定，通过实名认证才能进入游戏哦！");
});
}
Home.prototype.logout_cb = function(data) {
......@@ -58,7 +62,7 @@
}
Home.prototype.show_after = function(){
$('#login').hide()
$('#login').hide();
}
Core.registerMod('home', Home);
......
......@@ -171,7 +171,7 @@
<div class="SDK-titlebox"></div>
<div class="new-sdk-logo"><a href="#"><img src="images/new-sdk-logo.png"></a></div>
<div class="new-sdk-content" style="overflow: hidden;">
<h3>网络服务协议</h3>
<h3>海豹游戏服务协议</h3>
<div class="content-main" style="height: 220px;">
<iframe src="agreement.html" name="myiframe" id="iframepage" frameborder="0" scrolling="auto" width="100%"></iframe>
......@@ -419,7 +419,11 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
<a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
{{? Core.Data.force_auth == 1 && Core.Data.compellation_name == "" && Core.Data.identity_card == ""}}
<a href="#identityCard" class="btn btn-orange js-enter-game">进入游戏</a>
{{??}}
<a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
{{?}}
</div>
</div>
<div class="bind-user">
......@@ -430,6 +434,7 @@
<a class="btn btn-bind" href="#modify_pwd">马上升级</a>
</div>
</div>
<p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
</div>
{{?? Core.Data.is_guest == 2}}<!--1:游客登录；2：第三方登录；0：正式用户登录-->
<div class="user-center-box">
......@@ -439,7 +444,11 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
<a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
{{? Core.Data.force_auth == 1 && Core.Data.compellation_name == "" && Core.Data.identity_card == ""}}
<a href="#identityCard" class="btn btn-orange js-enter-game">进入游戏</a>
{{??}}
<a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
{{?}}
</div>
</div>
{{? Core.Data.bind_phone === ""}}
......@@ -457,6 +466,7 @@
<li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
<li style="width:50%;"><a href="#identityCard">实名认证</a></li>
</ul>
<p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{?}}
</div>
{{?? Core.Data.is_guest == 0}}
......@@ -467,19 +477,21 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
<a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
{{? Core.Data.force_auth == 1 && Core.Data.compellation_name == "" && Core.Data.identity_card == ""}}
<a href="#identityCard" class="btn btn-orange js-enter-game">进入游戏</a>
{{??}}
<a href="javascript:Core.finishLogin()" class="btn btn-orange">进入游戏</a>
{{?}}
</div>
</div>
{{? Core.Data.bind_phone === ""}}
<ul class="list-item clearfix">
<li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
<li><a href="#mibao">设置密保</a></li>
<li><a href="#modify_pwd">修改密码</a></li>
</ul>
{{??}}
{{? Core.Data.force_auth == 1}}
<ul class="list-item clearfix">
<li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
{{? Core.Data.bind_phone === ""}}
<li style="position: relative;width:50%;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
{{??}}
<li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
{{?}}
<li style="width:50%;"><a href="#mibao">设置密保</a></li>
</ul>
<ul class="list-item clearfix" style="border-top:none;">
......@@ -492,7 +504,33 @@
</a></li>
{{?}}
</ul>
{{?}}
<p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{??}}
{{? Core.Data.bind_phone === ""}}
<ul class="list-item clearfix">
<li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
<li><a href="#mibao">设置密保</a></li>
<li><a href="#modify_pwd">修改密码</a></li>
</ul>
<p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 1em;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{??}}
<ul class="list-item clearfix">
<li style="width:50%;"><a href="#unbindMobile">解绑手机</a></li>
<li style="width:50%;"><a href="#mibao">设置密保</a></li>
</ul>
<ul class="list-item clearfix" style="border-top:none;">
<li style="width:50%;"><a href="#modify_pwd">修改密码</a></li>
{{? Core.Data.compellation_name === "" && Core.Data.identity_card === ""}}
<li style="width:50%;"><a href="#identityCard">实名认证</a></li>
{{??}}
<li style="width:50%;position:relative;"><a href="#identityCard_ok">实名认证
<span style="position:absolute;right:5px;top:5px;color:#fff;background:#ff9600;padding:3px 10px;border-radius:10px;font-size:20px;">已认证</span>
</a></li>
{{?}}
</ul>
<p style="text-align: center;font-size: 20px; color: #ff0000; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{?}}
{{?}}
<!--<ul class="list-item clearfix">
{{? Core.Data.bind_phone === ""}}
<li style="position: relative;"><a href="#bindMobile">绑定手机</a><span class="redround"></span></li>
......
......@@ -119,9 +119,10 @@ body{
.new-sdk-container .new-sdk-logo{
text-align: center;
width:100%;
height:53px;
}
.new-sdk-container .new-sdk-logo img{
display: block;
display: none;
width: 210px;
margin: 0 auto;
padding: 15px 0 0 0;
......
......@@ -6,6 +6,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager.LayoutParams;
......@@ -297,6 +298,8 @@ public class AppActivity extends Activity {
}
private void login() {
Log.e("gamechanelId", PoolSdkHelper.getGameChannelId());
PoolSdkHelper.login("登录自定义字段", new PoolLoginListener() {
@Override
public void onLoginSuccess(PoolLoginInfo poolLoginInfo) {
......