public_service / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
xuguohong
0cc549aa 1 parent 3201d5c3

update sdk

Inline Side-by-side
Showing 26 changed files with 108 additions and 16 deletions
......@@ -145,7 +145,11 @@ function initMatching(){
Core.PLATFORM_NAME = '星玩';
if(Core.isIos){
Core.server = 'https://sdk.shxingwan.com';
}else{
Core.server = 'http://sdk.shxingwan.com';
}
var lastServer = localStorage.getItem('last_server');
if(lastServer && lastServer.indexOf('http:')==0){
......
......@@ -70,7 +70,6 @@
if (!tryAutoLogin)
goInit();
Core.ajax({
type: 'GET',
url: url + '?' + params,
......
......@@ -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);
......@@ -221,6 +225,7 @@
Core.first_password = this.$c.find('[name="password"]').val()
this.cache();
Core.showTips('成功登录，欢迎使用'+ Core.PLATFORM_NAME +'游戏平台');
Core.updateMod('home');
}
Login.prototype.login_eg_cb = function(result) {
......
......@@ -423,7 +423,11 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
{{? 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">
......@@ -434,6 +438,7 @@
<a class="btn btn-bind" href="#modify_pwd">马上升级</a>
</div>
</div>
<p style="text-align: center;font-size: 20px; color: #949494; 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">
......@@ -443,7 +448,11 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
{{? 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 === ""}}
......@@ -461,6 +470,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: #949494; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{?}}
</div>
{{?? Core.Data.is_guest == 0}}
......@@ -471,16 +481,42 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
{{? 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.force_auth == 1}}
<ul class="list-item clearfix">
{{? 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;">
<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: #949494; 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: #949494; 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>
......@@ -496,6 +532,8 @@
</a></li>
{{?}}
</ul>
<p style="text-align: center;font-size: 20px; color: #949494; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{?}}
{{?}}
<!--<ul class="list-item clearfix">
{{? Core.Data.bind_phone === ""}}
......@@ -1009,9 +1047,9 @@ FastClick.attach(document.body);
<script type="text/javascript" src="js/identity_id.js" ></script>
<script type="text/javascript">
window.onload = window.onresize = initMatching;
(function(){
$(function(){
getData('/sdk/login/json');
})();
});
simpScroller(document.querySelector(".horizontall"), {});
// $(document).ready(function(){
// setTimeout(function(){Core.showTips($("meta[name='viewport']")[0].getAttribute("content"));}, 2000)
......
......@@ -786,13 +786,12 @@ FastClick.attach(document.body);
<script type="text/javascript" src="js/loader.min.js?201504218001"></script>
<script type="text/javascript">
(function(){
getData('/sdk/pay/json');
})();
$(function(){
if (Core.isIos) {
$('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
}
getData('/sdk/pay/json');
});
</script>
......
......@@ -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;
......
......@@ -145,7 +145,11 @@ function initMatching(){
Core.PLATFORM_NAME = '星玩';
if(Core.isIos){
Core.server = 'https://sdk.shxingwan.com';
}else{
Core.server = 'http://sdk.shxingwan.com';
}
var lastServer = localStorage.getItem('last_server');
if(lastServer && lastServer.indexOf('http:')==0){
......
......@@ -70,7 +70,6 @@
if (!tryAutoLogin)
goInit();
Core.ajax({
type: 'GET',
url: url + '?' + params,
......
......@@ -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);
......@@ -221,6 +225,7 @@
Core.first_password = this.$c.find('[name="password"]').val()
this.cache();
Core.showTips('成功登录，欢迎使用'+ Core.PLATFORM_NAME +'游戏平台');
Core.updateMod('home');
}
Login.prototype.login_eg_cb = function(result) {
......
......@@ -423,7 +423,11 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
{{? 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">
......@@ -434,6 +438,7 @@
<a class="btn btn-bind" href="#modify_pwd">马上升级</a>
</div>
</div>
<p style="text-align: center;font-size: 20px; color: #949494; 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">
......@@ -443,7 +448,11 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
{{? 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 === ""}}
......@@ -461,6 +470,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: #949494; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{?}}
</div>
{{?? Core.Data.is_guest == 0}}
......@@ -471,16 +481,42 @@
<p>{{=Core.Data.nickname}}</p>
</div>
<div class="inline-btn pull-right w_45">
{{? 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.force_auth == 1}}
<ul class="list-item clearfix">
{{? 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;">
<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: #949494; 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: #949494; 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>
......@@ -496,6 +532,8 @@
</a></li>
{{?}}
</ul>
<p style="text-align: center;font-size: 20px; color: #949494; position: absolute; width: 100%; bottom: 10px;left:0;">{{=Core.Data.kefu_info[0]}}</p>
{{?}}
{{?}}
<!--<ul class="list-item clearfix">
{{? Core.Data.bind_phone === ""}}
......@@ -1009,9 +1047,9 @@ FastClick.attach(document.body);
<script type="text/javascript" src="js/identity_id.js" ></script>
<script type="text/javascript">
window.onload = window.onresize = initMatching;
(function(){
$(function(){
getData('/sdk/login/json');
})();
});
simpScroller(document.querySelector(".horizontall"), {});
// $(document).ready(function(){
// setTimeout(function(){Core.showTips($("meta[name='viewport']")[0].getAttribute("content"));}, 2000)
......
......@@ -786,13 +786,12 @@ FastClick.attach(document.body);
<script type="text/javascript" src="js/loader.min.js?201504218001"></script>
<script type="text/javascript">
(function(){
getData('/sdk/pay/json');
})();
$(function(){
if (Core.isIos) {
$('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
}
getData('/sdk/pay/json');
});
</script>
......
......@@ -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;
......