SDK / GameSDK-Doc

Download as
Browse Code »

Commit 7a00ee2787bf70285270cc5794bc2f75213a1d90

Authored by 赵康
1 parent f633382ee8
Exists in master

version3.3.8 

更新bluePay支付，增加linepay
增加修改密码和重置密码功能

Showing 14 changed files with 214 additions and 73 deletions Side-by-side Diff

android/GameSDKRelease/libs/GameSDK_v3.3.7_proguard.jar
View file @ 7a00ee2
No preview for this file type
android/GameSDKRelease/libs/GameSDK_v3.3.8_proguard.jar
Diff comments   View file @ 7a00ee2
No preview for this file type
android/GameSDKRelease/res/layout/fragment_loging.xml
Diff comments   View file @ 7a00ee2
... ... @@ -20,6 +20,17 @@
20 20 android:text="@string/switch_user"
21 21 android:textColor="@color/black_text" />
22 22  
  23 + <TextView
  24 + android:id="@+id/change_pwd"
  25 + android:layout_width="wrap_content"
  26 + android:layout_height="wrap_content"
  27 + android:layout_alignParentLeft="true"
  28 + android:layout_centerVertical="true"
  29 + android:layout_marginLeft="17dp"
  30 + android:text="@string/mod_pwd"
  31 + android:visibility="gone"
  32 + android:textColor="@color/black_text" />
  33 +
23 34 <View
24 35 android:layout_width="fill_parent"
25 36 android:layout_height="1dp"
android/GameSDKRelease/res/layout/fragment_mod_password.xml
Diff comments   View file @ 7a00ee2
... ... @@ -10,6 +10,8 @@
10 10 android:minWidth="292dp"
11 11 android:orientation="vertical" >
12 12  
  13 + <include layout="@layout/title" />
  14 +
13 15 <LinearLayout
14 16 android:layout_width="match_parent"
15 17 android:layout_height="wrap_content"
... ... @@ -21,79 +23,146 @@
21 23 android:layout_height="1dp"
22 24 android:background="@color/light_gray" />
23 25  
24   - <EditText
25   - android:id="@+id/username"
  26 + <LinearLayout
26 27 android:layout_width="match_parent"
27 28 android:layout_height="31dp"
28   - android:layout_marginBottom="10dp"
29 29 android:layout_marginLeft="35dp"
30 30 android:layout_marginRight="35dp"
31   - android:layout_marginTop="15dp"
32   - android:paddingLeft="8dp"
33   - android:background="@color/white"
34   - android:hint="@string/user_name_hint"
35   - android:imeOptions="flagNoExtractUi"
36   - android:textColor="@color/black_text" />
  31 + android:layout_marginTop="13dp"
  32 + android:background="@color/white" >
  33 +
  34 + <ImageView
  35 + android:layout_width="wrap_content"
  36 + android:layout_height="wrap_content"
  37 + android:layout_gravity="center_vertical"
  38 + android:layout_marginLeft="9.5dp"
  39 + android:layout_marginRight="9.5dp"
  40 + android:src="@drawable/ic_user" />
  41 +
  42 + <View
  43 + android:layout_width="1dp"
  44 + android:layout_height="20dp"
  45 + android:layout_gravity="center_vertical"
  46 + android:background="@color/light_gray" />
  47 +
  48 + <EditText
  49 + android:id="@+id/username"
  50 + android:layout_width="match_parent"
  51 + android:layout_height="match_parent"
  52 + android:background="@color/transparent"
  53 + android:hint="@string/user_name_hint"
  54 + android:paddingLeft="6dp" />
  55 + </LinearLayout>
37 56  
38   - <EditText
39   - android:id="@+id/old_pwd"
  57 + <LinearLayout
40 58 android:layout_width="match_parent"
41 59 android:layout_height="31dp"
42   - android:layout_marginBottom="10dp"
43 60 android:layout_marginLeft="35dp"
44 61 android:layout_marginRight="35dp"
45   - android:layout_marginTop="10dp"
46   - android:paddingLeft="8dp"
  62 + android:layout_marginTop="16dp"
47 63 android:background="@color/white"
48   - android:hint="@string/password_hint"
49   - android:imeOptions="flagNoExtractUi"
50   - android:inputType="textPassword"
51   - android:textColor="@color/black_text" />
52   - <EditText
53   - android:id="@+id/new_pwd"
54   - android:layout_width="match_parent"
55   - android:layout_height="31dp"
56   - android:layout_marginBottom="10dp"
57   - android:layout_marginLeft="35dp"
  64 + android:orientation="horizontal" >
  65 +
  66 + <ImageView
  67 + android:layout_width="wrap_content"
  68 + android:layout_height="wrap_content"
  69 + android:layout_gravity="center_vertical"
  70 + android:layout_marginLeft="12.5dp"
  71 + android:layout_marginRight="12.5dp"
  72 + android:src="@drawable/ic_pwd" />
  73 +
  74 + <View
  75 + android:layout_width="1dp"
  76 + android:layout_height="20dp"
  77 + android:layout_gravity="center_vertical"
  78 + android:background="@color/light_gray" />
  79 +
  80 + <EditText
  81 + android:id="@+id/old_pwd"
  82 + android:layout_width="match_parent"
  83 + android:layout_height="match_parent"
  84 + android:background="@color/white"
  85 + android:hint="@string/old_pwd"
  86 + android:inputType="textPassword"
  87 + android:paddingLeft="6dp" />
  88 + </LinearLayout>
  89 +
  90 + <TextView
  91 + android:layout_width="wrap_content"
  92 + android:layout_height="wrap_content"
  93 + android:maxWidth="200dp"
  94 + android:textColor="@color/black_text"
  95 + android:layout_gravity="right"
  96 + android:layout_marginTop="8dp"
58 97 android:layout_marginRight="35dp"
59   - android:layout_marginTop="10dp"
60   - android:paddingLeft="8dp"
61   - android:background="@color/white"
62   - android:hint="@string/password_hint"
63   - android:imeOptions="flagNoExtractUi"
64   - android:inputType="textPassword"
65   - android:textColor="@color/black_text" />
66   - <EditText
67   - android:id="@+id/confirm_pwd"
  98 + android:textSize="10sp"
  99 + android:text="@string/reset_intro" />
  100 +
  101 + <LinearLayout
68 102 android:layout_width="match_parent"
69 103 android:layout_height="31dp"
70   - android:layout_marginBottom="10dp"
71 104 android:layout_marginLeft="35dp"
72 105 android:layout_marginRight="35dp"
73   - android:layout_marginTop="10dp"
74   - android:paddingLeft="8dp"
  106 + android:layout_marginTop="12dp"
75 107 android:background="@color/white"
76   - android:hint="@string/password_hint"
77   - android:imeOptions="flagNoExtractUi"
78   - android:inputType="textPassword"
79   - android:textColor="@color/black_text" />
  108 + android:orientation="horizontal" >
  109 +
  110 + <ImageView
  111 + android:layout_width="wrap_content"
  112 + android:layout_height="wrap_content"
  113 + android:layout_gravity="center_vertical"
  114 + android:layout_marginLeft="12.5dp"
  115 + android:layout_marginRight="12.5dp"
  116 + android:src="@drawable/ic_pwd" />
  117 +
  118 + <View
  119 + android:layout_width="1dp"
  120 + android:layout_height="20dp"
  121 + android:layout_gravity="center_vertical"
  122 + android:background="@color/light_gray" />
  123 +
  124 + <EditText
  125 + android:id="@+id/new_pwd"
  126 + android:layout_width="match_parent"
  127 + android:layout_height="match_parent"
  128 + android:background="@color/white"
  129 + android:hint="@string/new_pwd"
  130 + android:inputType="textPassword"
  131 + android:paddingLeft="6dp" />
  132 + </LinearLayout>
80 133 </LinearLayout>
81 134  
82 135 <LinearLayout
83 136 android:layout_width="match_parent"
84 137 android:layout_height="wrap_content"
85   - android:background="@drawable/bottom_light_bg" >
  138 + android:background="@drawable/bottom_light_bg"
  139 + android:orientation="horizontal" >
86 140  
87 141 <Button
88   - android:id="@+id/submit"
  142 + android:id="@+id/reset"
89 143 android:layout_width="match_parent"
90 144 android:layout_height="wrap_content"
91 145 android:layout_marginLeft="35dp"
92   - android:layout_marginRight="35dp"
93   - android:layout_marginTop="8dp"
  146 + android:layout_marginRight="12dp"
  147 + android:layout_marginTop="10dp"
  148 + android:layout_weight="1"
94 149 android:background="@drawable/btn_orange_bg"
95 150 android:padding="5dp"
96   - android:text="@string/signup"
  151 + android:text="@string/reset"
  152 + android:textColor="@android:color/white"
  153 + android:textSize="16sp" />
  154 +
  155 + <Button
  156 + android:id="@+id/submit"
  157 + android:layout_width="match_parent"
  158 + android:layout_height="wrap_content"
  159 + android:layout_marginLeft="12dp"
  160 + android:layout_marginRight="35dp"
  161 + android:layout_marginTop="10dp"
  162 + android:layout_weight="1"
  163 + android:background="@drawable/btn_green_bg"
  164 + android:padding="5dp"
  165 + android:text="@string/submit"
97 166 android:textColor="@android:color/white"
98 167 android:textSize="16sp" />
99 168 </LinearLayout>
android/GameSDKRelease/res/layout/fragment_sign_choice.xml
Diff comments   View file @ 7a00ee2
... ... @@ -75,12 +75,23 @@
75 75 android:paddingLeft="6dp" />
76 76 </LinearLayout>
77 77  
  78 + <TextView
  79 + android:id="@+id/mod_pwd"
  80 + android:layout_width="wrap_content"
  81 + android:layout_height="wrap_content"
  82 + android:layout_gravity="right"
  83 + android:layout_marginRight="35dp"
  84 + android:layout_marginTop="12dp"
  85 + android:text="@string/mod_pwd"
  86 + android:textColor="@color/black_text"
  87 + android:textSize="11sp" />
  88 +
78 89 <LinearLayout
79 90 android:layout_width="fill_parent"
80 91 android:layout_height="wrap_content"
81 92 android:layout_marginLeft="35dp"
82 93 android:layout_marginRight="35dp"
83   - android:layout_marginTop="16dp"
  94 + android:layout_marginTop="12dp"
84 95 android:orientation="horizontal" >
85 96  
86 97 <Button
... ... @@ -107,20 +118,26 @@
107 118 android:textStyle="bold" />
108 119 </LinearLayout>
109 120  
110   - <Button
111   - android:id="@+id/play"
  121 + <LinearLayout
112 122 android:layout_width="fill_parent"
113 123 android:layout_height="wrap_content"
114   - android:layout_marginBottom="16dp"
115 124 android:layout_marginLeft="35dp"
116 125 android:layout_marginRight="35dp"
117   - android:layout_marginTop="16dp"
118   - android:background="@drawable/btn_orange_bg"
119   - android:padding="5dp"
120   - android:text="@string/quick_play"
121   - android:textColor="@android:color/white"
122   - android:textSize="16sp"
123   - android:textStyle="bold" />
  126 + android:orientation="horizontal"
  127 + android:paddingBottom="16dp"
  128 + android:paddingTop="16dp" >
  129 +
  130 + <Button
  131 + android:id="@+id/play"
  132 + android:layout_width="fill_parent"
  133 + android:layout_height="wrap_content"
  134 + android:background="@drawable/btn_orange_bg"
  135 + android:padding="5dp"
  136 + android:text="@string/quick_play"
  137 + android:textColor="@android:color/white"
  138 + android:textSize="16sp"
  139 + android:textStyle="bold" />
  140 + </LinearLayout>
124 141  
125 142 <ImageView
126 143 android:id="@+id/or_line"
... ... @@ -141,16 +158,16 @@
141 158 android:id="@+id/fb_login"
142 159 android:layout_width="wrap_content"
143 160 android:layout_height="wrap_content"
144   - android:layout_marginTop="10dp"
145 161 android:layout_marginRight="5dp"
  162 + android:layout_marginTop="10dp"
146 163 android:src="@drawable/ic_fb" />
147 164  
148 165 <ImageView
149 166 android:id="@+id/vk_login"
150 167 android:layout_width="wrap_content"
151 168 android:layout_height="wrap_content"
152   - android:layout_marginTop="10dp"
153 169 android:layout_marginLeft="5dp"
  170 + android:layout_marginTop="10dp"
154 171 android:src="@drawable/ic_vk" />
155 172 </LinearLayout>
156 173  
android/GameSDKRelease/res/layout/title.xml
Diff comments   View file @ 7a00ee2
... ... @@ -2,6 +2,7 @@
2 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4 4 android:layout_height="wrap_content"
  5 + android:id="@+id/title_bar"
5 6 android:background="@drawable/title_light_bg" >
6 7  
7 8 <ImageView
android/GameSDKRelease/res/values-pt/strings.xml
Diff comments   View file @ 7a00ee2
... ... @@ -21,6 +21,14 @@
21 21 <string name="bind_fail">Vincular falhou</string>
22 22 <string name="gen_quick_acc_err">Entre falhou, por favor tente novamente</string>
23 23 <string name="quick_login_err">Entre falhou, por favor tente novamente</string>
24   - <!-- facebook id -->
25   -
  24 + <!-- 修改密码 -->
  25 + <string name="old_pwd">Current Password</string>
  26 + <string name="new_pwd">New Password</string>
  27 + <string name="mod_pwd">Change Password</string>
  28 + <string name="cant_change_unknown">Reset fail, please contact customer service</string>
  29 + <string name="submit">Confirm new password</string>
  30 + <string name="reset">Reset Password</string>
  31 + <string name="reset_intro">Current password isn’t required when reset password</string>
  32 + <string name="mod_pwd_success">Reset Succeed</string>
  33 + <string name="mail_sent_success">An email has been sent to you, please follow the instructions in the email.</string>
26 34 </resources>
27 35 \ No newline at end of file
android/GameSDKRelease/res/values-th/strings.xml
Diff comments   View file @ 7a00ee2
... ... @@ -20,7 +20,16 @@
20 20 <string name="signup_fail">ลงทะเบียนไม่สำเร็จ</string>
21 21 <string name="bind_fail">ผูกอีเมลล์ไม่สำเร็จ</string>
22 22 <string name="signup_success">สำเร็จ</string>
23   - <!-- facebook id -->
  23 + <!-- 修改密码 -->
  24 + <string name="old_pwd">พาสเวิร์ดปัจจุบัน</string>
  25 + <string name="new_pwd">พาสเวิร์ดใหม่</string>
  26 + <string name="mod_pwd">แก้ไขพาสเวิร์ด</string>
  27 + <string name="cant_change_unknown">แก้ไขล้มเหลว,กรุณาติดต่อแอดมิน</string>
  28 + <string name="submit">ยืนยัน</string>
  29 + <string name="reset">ตั้งพาสเวิร์ด</string>
  30 + <string name="reset_intro">ไม่สามารถตั้งพาสเวิร์ดซ้ำกับพาสเวิร์ดปัจจุบันได้</string>
  31 + <string name="mod_pwd_success">แก้ไข</string>
  32 + <string name="mail_sent_success">ระบบได้แจ้งข้อมูลการเปลี่ยนพาสเวิร์ดไปยังอีเมลล์สำรอง กรุณาทำตามขั้นตอนในอีเมลล์</string>
24 33 <!-- payment -->
25 34 <string name="title_payment_choice">เลือกช่องทางชำระเงิน</string>
26 35 <!-- summary title -->
android/GameSDKRelease/res/values-zh-rTW/strings.xml
Diff comments   View file @ 7a00ee2
... ... @@ -18,8 +18,16 @@
18 18 <string name="login_fail">登錄失敗</string>
19 19 <string name="signup_fail">註冊失敗</string>
20 20 <string name="bind_fail">綁定失敗</string>
21   - <!-- facebook id -->
22   -
  21 + <!-- 修改密码 -->
  22 + <string name="old_pwd">當前密碼</string>
  23 + <string name="new_pwd">新密碼</string>
  24 + <string name="mod_pwd">修改密碼</string>
  25 + <string name="cant_change_unknown">修改失敗，請與客服聯繫</string>
  26 + <string name="submit">確定修改</string>
  27 + <string name="reset">重置密碼</string>
  28 + <string name="reset_intro">重置密碼時可不填寫當前密碼</string>
  29 + <string name="mod_pwd_success">修改成功</string>
  30 + <string name="mail_sent_success">密碼重置郵件已發送到指定郵箱賬戶，請按郵件內的提示操作</string>
23 31  
24 32 <!-- 支付相关 -->
25 33 <!-- title -->
android/GameSDKRelease/res/values-zh/strings.xml
Diff comments   View file @ 7a00ee2
... ... @@ -20,7 +20,17 @@
20 20 <string name="signup_fail">注册失败</string>
21 21 <string name="bind_fail">绑定失败</string>
22 22 <string name="net_error">网络无法连接，请查看网络设置</string>
23   - <!-- facebook id -->
  23 + <!-- 修改密码 -->
  24 + <string name="old_pwd">当前密码</string>
  25 + <string name="new_pwd">新密码</string>
  26 + <string name="mod_pwd">修改密码</string>
  27 + <string name="cant_change_unknown">修改失败，请与客服联系</string>
  28 + <string name="submit">确定修改</string>
  29 + <string name="reset">重置密码</string>
  30 + <string name="reset_intro">重置密码时可不填写当前密码</string>
  31 + <string name="mod_pwd_success">修改成功</string>
  32 + <string name="mail_sent_success">密码重置邮件已发送到指定账户邮箱，请按邮件内的提示操作</string>
  33 +
24 34 <!-- 支付 -->
25 35 <!-- title -->
26 36 <string name="title_payment_choice">请选择支付方式</string>
android/GameSDKRelease/res/values/colors.xml
Diff comments   View file @ 7a00ee2
... ... @@ -15,8 +15,8 @@
15 15 <color name="btn_green_pressed">#3cca79</color>
16 16  
17 17 <color name="common_gray">#ecf0f0</color>
18   - <color name="common_gray2">#e0e6e8</color>
19   - <color name="translucent">#7e000000</color>
  18 + <color name="common_gray2">#e0e6e8</color>
  19 + <color name="translucent">#7e000000</color>
20 20 <color name="transparent">#00000000</color>
21 21  
22 22 <color name="payment_common_bg">#f2efeb</color>
android/GameSDKRelease/res/values/strings.xml
Diff comments   View file @ 7a00ee2
... ... @@ -27,8 +27,16 @@
27 27 <string name="signup_success">Sign Up Successfully</string>
28 28 <string name="gen_quick_acc_err">Login failed, please try again</string>
29 29 <string name="quick_login_err">Login failed, please try again</string>
30   - <!-- facebook -->
31   -
  30 + <!-- 修改密码 -->
  31 + <string name="old_pwd">Current Password</string>
  32 + <string name="new_pwd">New Password</string>
  33 + <string name="mod_pwd">Change Password</string>
  34 + <string name="cant_change_unknown">Reset fail, please contact customer service</string>
  35 + <string name="submit">Confirm</string>
  36 + <string name="reset">Reset</string>
  37 + <string name="reset_intro">Current password isn’t required when reset password</string>
  38 + <string name="mod_pwd_success">Succeed</string>
  39 + <string name="mail_sent_success">An email has been sent to you, please follow the instructions in the email.</string>
32 40  
33 41 <!-- 支付相关 -->
34 42  
android/GameSDKSample/AndroidManifest.xml
Diff comments   View file @ 7a00ee2
... ... @@ -30,7 +30,7 @@
30 30 android:name="com.gumptech.loginsdk.sample.MainActivity"
31 31 android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
32 32 android:label="@string/app_name"
33   - android:screenOrientation="portrait" >
  33 + android:screenOrientation="landscape" >
34 34 <intent-filter>
35 35 <action android:name="android.intent.action.MAIN" />
36 36  
... ... @@ -56,7 +56,7 @@
56 56  
57 57 <data
58 58 android:host="com.gump.sdk"
59   - android:scheme="gump10044" />
  59 + android:scheme="gump10022" />
60 60 </intent-filter>
61 61 </activity>
62 62 <activity
android/GameSDKSample/src/com/gumptech/loginsdk/sample/MainActivity.java
Diff comments   View file @ 7a00ee2
... ... @@ -28,8 +28,8 @@ public class MainActivity extends Activity implements PurchaseCallback{
28 28  
29 29 private Button btnLoginOrLogout;
30 30  
31   - private String appId = "10044";
32   - private String appKey = "9c16b0e83f09596202f402261f25c8a9";
  31 + private String appId = "10022";
  32 + private String appKey = "93a27b0bd99bac3e68a440b48aa421ab";
33 33 private String sessionKey;
34 34  
35 35 @Override
... ... @@ -66,7 +66,7 @@ public class MainActivity extends Activity implements PurchaseCallback{
66 66 /**
67 67 * 设置否是开启debug模式
68 68 */
69   - GumpSDK.setDebugState(true);
  69 + GumpSDK.setDebugState(false);
70 70 /**
71 71 * 设置是否启用facebook登录
72 72 */