Commit 0c287634f8bf76537a83232044e25dcafe283e89

Authored by alexYang
1 parent 9c29137767
Exists in master

同步更新版本至老域名

Showing 23 changed files with 93 additions and 83 deletions Side-by-side Diff

... ... @@ -2,8 +2,8 @@
2 2  
3 3  
4 4 接入手册
5   -V 3.5.3
6   -2017年6月14日
  5 +V 3.4.14
  6 +2018年2月1日
7 7  
8 8 ## 概述
9 9 #### 本SDK提供gump账号,fb账号,vk账号,Google帐号四种账号登录,iap支付和第三方支付两种支付功能,其中gump账号登录和fb账号登录功能为必须接入,支付可根据需要选择性接入。
ios/GameSDK.framework/Versions/A/GameSDK
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LSGAccount.h
... ... @@ -6,10 +6,12 @@ typedef NS_ENUM(NSInteger, LSGAccountType) {
6 6 LSGAccountTypeQuickRegist = 4,
7 7 LSGAccountTypeVKRegist = 8,
8 8 LSGAccountTypeGoogleRegist = 16,
  9 + LSGAccountTypeWeChatRegist = 32,
  10 + LSGAccountTypeLineRegist = 64,
9 11 };
10 12  
11 13 //判断是不是自动登录情况
12   -#define LSGAccountTypeBaseLogin 32
  14 +#define LSGAccountTypeBaseLogin 128
13 15  
14 16 @interface LSGAccount : NSObject
15 17  
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
... ... @@ -11,11 +11,18 @@ static BOOL isDisableFB = NO;
11 11  
12 12 static BOOL isEnableVK = NO;
13 13  
  14 +static BOOL isDisableLine = NO;
  15 +
  16 +static BOOL isDisableWeChat = NO;
  17 +
14 18 static BOOL isDisableGoogle = NO;
15 19  
16 20 static BOOL hiddenLogo = NO;
17 21  
18   -static NSString *version = @"3.5.3";
  22 +//默认横屏
  23 +static BOOL DeviceOrientationIsHorizontal = YES;
  24 +
  25 +static NSString *version = @"3.4.14";
19 26  
20 27 @interface LetsGameAPI : NSObject<UIApplicationDelegate>
21 28  
... ... @@ -23,7 +30,6 @@ static NSString *version = @&quot;3.5.3&quot;;
23 30 @property (nonatomic, strong) NSString *appKey;
24 31 @property (nonatomic, copy) LSGLoginSuccBlock succBlock;
25 32 @property (nonatomic, copy) LSGDismissBlock dismissBlock;
26   -//@property (nonatomic, assign) int isDebug;
27 33 @property (nonatomic, assign) int decideWebPay;
28 34 @property (nonatomic,retain) id<VKBridgeProtocol> vkBridge;
29 35 //@property(nonatomic,strong) NSString *version;
... ... @@ -37,15 +43,28 @@ static NSString *version = @&quot;3.5.3&quot;;
37 43  
38 44 +(void)disableFB:(BOOL)isDisable;
39 45 +(void)disableGoogle:(BOOL)isDisable;
  46 ++(void)disableWeChat:(BOOL)isDisable;
  47 ++(void)disableLine:(BOOL)isDissable;
40 48 +(BOOL)isFBDisable;
41 49 +(BOOL)isVKEnable;
  50 ++(BOOL)isWeChatDisable;
42 51 +(BOOL)isGoogleDisable;
  52 ++(BOOL)isLineDisable;
43 53 +(void)hiddenLogo:(BOOL)isHidden;
44 54 +(BOOL)isHiddenLogo;
  55 ++(void)DeviceOrientationIsHorizontal:(BOOL)isDisable;
  56 ++(BOOL)DeviceOrientationIsHorizontal;
45 57  
46 58 - (void)logout;
47 59  
48 60 - (void)hide;
  61 +//是否安装微信
  62 +-(BOOL)isWeChatInstall;
  63 +//向微信注册应用
  64 +-(void)registerAppWeChatWithAppId:(NSString *)appId
  65 + appKey:(NSString *)appKey
  66 + Success:(void (^)())success
  67 + failure:(void (^)())failure;
49 68  
50 69 - (BOOL)handleOpenURL:(NSURL *)url
51 70 sourceApplication:(NSString *)sourceApplication;
... ... @@ -58,8 +77,6 @@ static NSString *version = @&quot;3.5.3&quot;;
58 77  
59 78 -(void)registeIapObserver;
60 79  
61   -//-(void)decideIsDebug:(int)isDebug;
62   -
63 80 -(void)decideWebPayVersion:(int)decideWebPay;
64 81  
65 82 -(void)obtainAccessTokenSuccess:(void (^)(NSString *tokenString, NSString *refreshTime, NSString *expirationTime))success
No preview for this file type
ios/GameSDKResources.bundle/PayJs.txt
... ... @@ -8,12 +8,12 @@ if (window[bridge]) { return }
8 8  
9 9 // 创建隐藏的iframe
10 10 function _createQueueReadyIframe(doc) {
11   -messagingIframe = doc.createElement('iframe');
12   -messagingIframe.style.display = 'none';
13   -doc.documentElement.appendChild(messagingIframe);
14   -webInfoIframe = doc.createElement('iframe');
15   -webInfoIframe.style,display = 'none';
16   -doc.documentElement.appendChild(webInfoIframe);
  11 + messagingIframe = doc.createElement('iframe');
  12 + messagingIframe.style.display = 'none';
  13 + doc.documentElement.appendChild(messagingIframe);
  14 + webInfoIframe = doc.createElement('iframe');
  15 + webInfoIframe.style,display = 'none';
  16 + doc.documentElement.appendChild(webInfoIframe);
17 17 }
18 18  
19 19  
... ... @@ -51,6 +51,6 @@ messagingIframe.src=CUSTOM_PROTOCOL_SCHEME + &#39;:&#39; + arguments.callee.name + &#39;:&#39; +
51 51 _createQueueReadyIframe(document);
52 52 //通知js开始初始化
53 53 if(typeof(onInjectJsOver)=='function')
54   -onInjectJsOver();
  54 + onInjectJsOver();
55 55  
56 56 -})();
  57 +})();
57 58 \ No newline at end of file
ios/GameSDKResources.bundle/en.strings
1   -"user_name_hint" = "Email";
  1 +"user_name_hint" = "Account";
2 2 "password_hint" = "Password";
3   -"quick_play" = "Play as Guest";
4   -"login" = "Login";
  3 +"quick_play" = "Guest login";
  4 +"login" = "Log In";
5 5 "gump_login" = "Login";
6 6 "signup" = "Sign up";
7 7 "bind" = "Bind your email";
... ... @@ -11,19 +11,26 @@
11 11 "illegal_uname_tip" = "Invalid Email";
12 12 "illegal_pwd_tip" = "Invalid Password (6-20 characters)";
13 13 "illegal_user_exist" = "Email has already been used";
14   -"illegal_pwd_invalid" = "Incorrect password. Please try again.";
  14 +"illegal_pwd_invalid" = "Password error";
15 15 "illegal_user_not_exist" = "Invalid Email";
16 16 "invalid_email" = "Please input your email";
17 17 "login_fail" = "Login Failed";
18 18 "signup_fail" = "Signup Failed";
19 19 "bind_fail" = "Bind Failed";
20 20 "switch"="Switch Account";
21   -"change_password" = "Change Password";
  21 +"change_password" = "Modify Password";
22 22 "current_password" = "Current Password";
23 23 "change_password_notice" = “Current passeord isn't required when reset password.";
24 24 "new_password" = "New Password";
25   -"Reset" = "Reset";
  25 +"Reset" = "Forget Password? Touch this";
26 26 "Confirm" = "Confirm";
27 27 "Succeed" = "Succeed";
28 28 "reset_fail" = "Reset failed, please contact customer service";
29   -"reset_success" = "An Email has been sent to you, please follow the instructions in Email.";
30 29 \ No newline at end of file
  30 +"reset_success" = "Verified email has been sent. Please reset Password according to the email";
  31 +"forget_change_password" = "Modify/Forget Password";
  32 +"other_login_style" = "Others";
  33 +"account_pwd_invalid" = "Please input both account and password";
  34 +"new_old_password_diff" = "Password mismatch";
  35 +"Confirm_password" = "Confirm";
  36 +"input_new_pwd" = "Please input new password";
  37 +"back" = "Back";
ios/GameSDKResources.bundle/images/em@2x.png

1.32 KB

ios/GameSDKResources.bundle/images/face@2x.png

1.25 KB

ios/GameSDKResources.bundle/images/google@2x.png

1.75 KB

ios/GameSDKResources.bundle/images/ic_line@2x.png

11.7 KB

ios/GameSDKResources.bundle/images/ic_wc@2x.png

4.82 KB

ios/GameSDKResources.bundle/images/icon_back@2x.png

1.58 KB | W: | H:

1.52 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
ios/GameSDKResources.bundle/images/line@2x.png

2.14 KB

ios/GameSDKResources.bundle/images/pwd@2x.png

1.14 KB

ios/GameSDKResources.bundle/images/split@2x.png

461 Bytes

ios/GameSDKResources.bundle/images/tri@2x.png

550 Bytes

ios/GameSDKResources.bundle/images/vk@2x.png

1.83 KB

ios/GameSDKResources.bundle/images/we@2x.png

2.25 KB

ios/GameSDKResources.bundle/template.html
... ... @@ -1,36 +0,0 @@
1   -<!doctype html>
2   -<html>
3   -<head>
4   -<script src="http://code.angularjs.org/angular-1.0.1.min.js"></script>
5   -
6   -</head>
7   -<body ng-app="myApp" ng-controller="mainCtrl">
8   -
9   -<button ng-click="refresh()">refresh</button>
10   -<div style="background: #07242E; color: #708284;height: auto;overflow: auto;min-height: 600px;max-height:700px" >
11   -
12   -<ul>
13   -<li ng-repeat="x in items" style='font-size:15px'>
14   - {{ x.logtime }} &nbsp; [{{x.level}}]-{{x.filename}}:{{x.line}}/{{x.function}} &nbsp;=> {{x.message}}
15   -</li>
16   -</ul>
17   -
18   -</div>
19   -
20   -<script>
21   -var app = angular.module('myApp', []);
22   -
23   -app.controller('mainCtrl', function($scope, $http) {
24   - $http.get(location+'logs').success(function(response) {
25   - $scope.items = response;
26   - });
27   - $scope.refresh = function(){
28   - $http.get(location+'logs').success(function(response){
29   - $scope.items = response;
30   - });
31   - };
32   -});
33   -
34   -</script>
35   -</body>
36   -</html>
37 0 \ No newline at end of file
ios/GameSDKResources.bundle/th.strings
1   -"user_name_hint" = "อีเมลล์";
  1 +"user_name_hint" = "ชื่อบัญชี";
2 2 "password_hint" = "พาสเวิร์ด";
3   -"quick_play" = "การเล่นของผู้เข้าพัก";
  3 +"quick_play" = "บัญชีนักท่องเที่ยว";
4 4 "quick_login" = "เริ่มเล่น";
5   -"login" = "ล็อกอิน";
6   -"gump_login" = "Login";
  5 +"login" = "ล็อคอินชื่อบัญชีรหัสผ่าน";
  6 +"gump_login" = "ล็อคอิน";
7 7 "signup" = "ลงทะเบียน";
8 8 "bind" = "ผูกอีเมลล์";
9 9 "loading" = "กำลังโหลด";
10 10 "illegal_uname_tip" = "อีเมลล์ไม่ถูกต้อง";
11 11 "illegal_pwd_tip" = "พาสเวิร์ดไม่ถูกต้อง(6-20 ตัวอักษร)";
12 12 "illegal_user_exist" = "อีเมลล์นี้ได้ถูกใช้แล้ว";
13   -"illegal_pwd_invalid" = "พาสเวิร์ดไม่ถูกต้อง, โปรดลองใหม่อีกครั้ง";
  13 +"account_pwd_invalid" = "ชื่อบัญชีและรหัสผ่านห้ามเว้นว่าง";
14 14 "illegal_user_not_exist" = "อีเมลล์ไม่ถูกต้อง";
15 15 "invalid_email" = "ใส่อีเมลล์ของคุณ";
16 16 "login_fail" = "ล็อกอินผิดพลาด";
17 17 "signup_fail" = "ลงทะเบียนไม่สำเร็จ";
18 18 "bind_fail" = "ผูกอีเมลล์ไม่สำเร็จ";
19   -"change_password" = "แก้ไขพาสเวิร์ด";
  19 +"change_password" = "แก้ไขรหัสผ่าน";
20 20 "current_password" = "พาสเวิร์ดปัจจุบัน";
21 21 "change_password_notice" = "ไม่สามารถตั้งพาสเวิร์ดซ้ำกับพาสเวิร์ดปัจจุบันได้.";
22 22 "new_password" = "พาสเวิร์ดใหม่";
23   -"Reset" = "ตั้งพาสเวิร์ด";
  23 +"Reset" = "ลืมรหัสผ่าน?คลิกรีเซ็ตรหัสผ่าน";
24 24 "Confirm" = "ยืนยัน";
25 25 "Succeed" = "แก้ไขสำเร็จ";
26 26 "reset_fail" = "แก้ไขล้มเหลว,กรุณาติดต่อแอดมิน";
27   -"reset_success" = "ระบบได้แจ้งข้อมูลการเปลี่ยนพาสเวิร์ดไปยังอีเมลล์สำรอง กรุณาทำตามขั้นตอนในอีเมลล์.";
  27 +"reset_success" = "ส่งอีเมลล์ยืนยันแล้ว กรุณาทำตามขั้นตอนที่ระบุในอีเมลล์เพื่อรีเซ็ตรหัสผ่าน";
  28 +"forget_change_password" = "แก้ไข/ลืมรหัสผ่าน";
  29 +"other_login_style" = "ล็อคอินช่องทางอื่น";
  30 +"new_old_password_diff" = "รหัสผ่านไม่เหมือนกัน";
  31 +"Confirm_password" = "ยืนยันรหัสผ่าน";
  32 +"input_new_pwd" = "กรุณากรอกรหัสผ่านใหม่";
  33 +"back" = "ย้อนกลับ";
ios/GameSDKResources.bundle/zh-Hans.strings
1   -"user_name_hint" = "邮箱";
  1 +"user_name_hint" = "账号";
2 2 "password_hint" = "密码";
3 3 "quick_login" = "一键进入";
4   -"quick_play" = "Play as Guest";
5   -"gump_login" = "Login";
6   -"login" = "登陆";
  4 +"quick_play" = "游客登录";
  5 +"gump_login" = "登录";
  6 +"login" = "账号密码登录";
7 7 "loginFacebook" = "登录Facebook";
8 8 "signup" = "注册";
9 9 "bind" = "绑定邮箱";
... ... @@ -11,7 +11,7 @@
11 11 "illegal_uname_tip" = "邮箱不存在";
12 12 "illegal_pwd_tip" = "密码格式不正确 (6–20字符)";
13 13 "illegal_user_exist" = "邮箱已注册";
14   -"illegal_pwd_invalid" = "密码不正确,请重试";
  14 +"illegal_pwd_invalid" = "密码错误";
15 15 "illegal_user_not_exist" = "邮箱格式不正确";
16 16 "invalid_email" = "请输入正确的邮箱";
17 17 "login_fail" = "登录失败";
... ... @@ -19,12 +19,19 @@
19 19 "bind_fail" = "绑定失败";
20 20 "GumptechLogin" = "甘普登录";
21 21 "switch" = "切换账户";
22   -"change_password" = "修改密码";
  22 +"change_password" = "修改密码";
23 23 "current_password" = "当前密码";
24 24 "change_password_notice" = "重置密码时可不填写当前密码";
25 25 "new_password" = "新密码";
26   -"Reset" = "重置";
27   -"Confirm" = "确定修改";
  26 +"Reset" = "忘记密码?点此重置";
  27 +"Confirm" = "确定";
28 28 "Succeed" = "修改成功";
29 29 "reset_fail" = "修改失败,请与客服联系";
30   -"reset_success" = "密码重置邮件已发送到指定账户邮箱,请按邮件内的提示操作";
  30 +"reset_success" = "验证邮件已发送,请按照邮件提示进行密码重置";
  31 +"other_login_style" = "其他登录方式";
  32 +"account_pwd_invalid" = "账号和密码不能为空";
  33 +"new_old_password_diff" = "密码不一致";
  34 +"Confirm_password" = "确认密码";
  35 +"forget_change_password" = "修改/忘记密码?";
  36 +"input_new_pwd" = "请输入新密码";
  37 +"back" = "返回";
ios/GameSDKResources.bundle/zh-Hant.strings
1   -"user_name_hint" = "郵箱";
  1 +"user_name_hint" = "帳號";
2 2 "password_hint" = "密碼";
3 3 "quick_login" = "一鍵進入";
4   -"quick_play" = "Play as Guest";
5   -"gump_login" = "Login";
6   -"login" = "登陸";
  4 +"quick_play" = "遊客登陸";
  5 +"gump_login" = "登錄";
  6 +"login" = "帳號密碼登錄";
7 7 "signup" = "註冊";
8 8 "bind" = "綁定郵箱";
9 9 "loading" = "加載中……";
10 10 "illegal_uname_tip" = "郵箱不存在";
11 11 "illegal_pwd_tip" = "密碼格式不爭取 (6–20字符)";
12 12 "illegal_user_exist" = "郵箱已註冊";
13   -"illegal_pwd_invalid" = "密碼不正確,請重試";
  13 +"illegal_pwd_invalid" = "密碼錯誤";
14 14 "illegal_user_not_exist" = "郵箱格式不正確";
15 15 "invalid_email" = "請輸入正確的郵箱";
16 16 "login_fail" = "登陸失敗";
... ... @@ -22,8 +22,15 @@
22 22 "current_password" = "當前密碼";
23 23 "change_password_notice" = "重置密碼時可不填寫當前密碼";
24 24 "new_password" = "新密碼";
25   -"Reset" = "重置";
26   -"Confirm" = "確定修改";
  25 +"Reset" = "忘記密碼點此重置";
  26 +"Confirm" = "確定";
27 27 "Succeed" = "修改成功";
28 28 "reset_fail" = "修改失败,請與客服聯系";
29   -"reset_success" = "密碼重置郵件已發送到指定賬戶郵箱,請按郵件內的提示操作";
30 29 \ No newline at end of file
  30 +"reset_success" = "驗證郵件已發送,請按照郵件提示進行重置";
  31 +"other_login_style" = "其他登錄方式";
  32 +"account_pwd_invalid" = "帳號或密碼不能為空";
  33 +"new_old_password_diff" = "密碼不一致";
  34 +"Confirm_password" = "確認密碼";
  35 +"forget_change_password" = "修改/忘記密碼";
  36 +"input_new_pwd" = "請輸入新密碼";
  37 +"back" = "返回";