SDK / GameSDK-Doc

Commit c69691da8744cb8b3e140d57dcc910d51c0fcea7

Authored by 赵康 2015-03-04 15:47:07 +0800

Exists in master

修复mycard memeber支付的在传金额时的异常

完善统计项
清理资源

Showing 10 changed files with 9 additions and 15 deletions Inline Diff

android/GameSDKRelease/AndroidManifest.xml
android/GameSDKRelease/libs/GameSDK_v2.5.1_proguard.jar
android/GameSDKRelease/libs/GameSDK_v2.5.3_proguard.jar
android/GameSDKRelease/res/values-pt/strings.xml
android/GameSDKRelease/res/values-th/strings.xml
android/GameSDKRelease/res/values-zh-rTW/strings.xml
android/GameSDKRelease/res/values-zh/strings.xml
android/GameSDKRelease/res/values/strings.xml
android/GameSDKSample/res/values/strings.xml
android/GameSDKSample/src/com/gumptech/loginsdk/sample/MainActivity.java

android/GameSDKRelease/AndroidManifest.xml

Diff comments View file @ c69691d

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.facebook.android"
     android:versionCode="1"
     android:versionName="1.0" >
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="19" />
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_launcher" >
-        android:label="@string/app_name" >
     </application>
 </manifest>

android/GameSDKRelease/libs/GameSDK_v2.5.1_proguard.jar

View file @ c69691d

No preview for this file type

android/GameSDKRelease/libs/GameSDK_v2.5.3_proguard.jar

Diff comments View file @ c69691d

No preview for this file type

android/GameSDKRelease/res/values-pt/strings.xml

Diff comments View file @ c69691d

 <resources>
-    <string name="app_name">LoginSDK</string>
     <string name="user_name_hint">Email</string>
     <string name="password_hint">Senha</string>
     <string name="login">Login</string>
     <string name="signup">Registrar</string>
     <string name="bind">Vincular ao email</string>
     <string name="loading">Carregando</string>
     <!-- toast -->
     <string name="illegal_uname_tip">Email inválido</string>
     <string name="illegal_pwd_tip">Senha Inválida (6-20 caracteres)</string>
     <string name="illegal_user_exist">Email já está em uso</string>
     <string name="illegal_pwd_invalid">Senha incorreta, favor tentar novamente</string>
     <string name="illegal_user_not_exist">Email Inválido</string>
     <string name="invalid_email">Favor inserir seu email</string>
     <string name="login_fail">Login falhou</string>
     <string name="signup_fail">Registrar falhou</string>
     <string name="bind_fail">Vincular falhou</string>
     <!-- facebook id -->
 </resources>

android/GameSDKRelease/res/values-th/strings.xml

Diff comments View file @ c69691d

 <resources>
-    <string name="app_name">LoginSDK</string>
     <string name="user_name_hint">อีเมลล์</string>
     <string name="password_hint">พาสเวิร์ด</string>
     <string name="login">ล็อกอิน</string>
     <string name="signup">ลงทะเบียน</string>
     <string name="bind">ผูกอีเมลล์</string>
     <string name="loading">กำลังโหลด</string>
     <!-- toast -->
     <string name="illegal_uname_tip">อีเมลล์ไม่ถูกต้อง</string>
     <string name="illegal_pwd_tip">พาสเวิร์ดไม่ถูกต้อง(6-20 ตัวอักษร)</string>
     <string name="illegal_user_exist">อีเมลล์นี้ได้ถูกใช้แล้ว</string>
     <string name="illegal_pwd_invalid">พาสเวิร์ดไม่ถูกต้อง, โปรดลองใหม่อีกครั้ง</string>
     <string name="illegal_user_not_exist">อีเมลล์ไม่ถูกต้อง</string>
     <string name="invalid_email">ใส่อีเมลล์ของคุณ</string>
     <string name="login_fail">ล็อกอินผิดพลาด</string>
     <string name="signup_fail">ลงทะเบียนไม่สำเร็จ</string>
     <string name="bind_fail">ผูกอีเมลล์ไม่สำเร็จ</string>
     <string name="signup_success">สำเร็จ</string>
     <!-- facebook id -->
     <!-- payment -->
     <string name="title_payment_choice">เลือกช่องทางชำระเงิน</string>
     <!-- summary title -->
     <string name="summary_title">ตารางแลกเปลี่ยน:</string>
     <string name="useranme_pattern">ชื่อผู้ใช้:%s</string>
-<!--     <string name="mol_channel_title">เลือกช่องทางชำระเงิน</string> -->
+    <!-- <string name="mol_channel_title">เลือกช่องทางชำระเงิน</string> -->
     <string name="mol_card_hint">กรุณากรอกรหัสบัตร</string>
     <string name="mol_pass_hint">กรุณาใส่รหัส</string>
     <string name="pay_ok">OK</string>
     <string name="pay_error">การชำระล้มเหลว กรุณาลองใหม่อีกครั้ง</string>
     <string name="card_input_tip">กรุณากรอกรายละเอียดบัตร</string>
     <string name="amount_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
     <!-- paypal -->
     <string name="paypal_amount_hint">กรุณาใส่จำนวนเงินที่ต้องการ(%s-10000เป็นจำนวนเต็ม)</string>
     <string name="paypal_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
-	 <!-- gp -->
+    <!-- gp -->
-	<string name="gp_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
+    <string name="gp_choice_tip">กรุณาเลือกยอดเติมเงิน</string>

android/GameSDKRelease/res/values-zh-rTW/strings.xml

Diff comments View file @ c69691d

 <resources>
-    <string name="app_name">LoginSDK</string>
     <string name="user_name_hint">郵箱</string>
     <string name="password_hint">密碼</string>
     <string name="login">登錄</string>
     <string name="signup">註冊</string>
     <string name="bind">綁定郵箱</string>
     <string name="loading">加載中……</string>
     <!-- toast -->
     <string name="illegal_uname_tip">郵箱格式不正確</string>
     <string name="illegal_pwd_tip">密碼格式不正確 (6–20字符)</string>
     <string name="illegal_user_exist">郵箱已註冊</string>
     <string name="illegal_pwd_invalid">密碼不正確，請重試</string>
     <string name="illegal_user_not_exist">郵箱不存在</string>
     <string name="invalid_email">請輸入正確的郵箱</string>
     <string name="login_fail">登錄失敗</string>
     <string name="signup_fail">註冊失敗</string>
     <string name="bind_fail">綁定失敗</string>
     <!-- facebook id -->
     <!-- 支付相关 -->
     <!-- title -->
     <string name="title_payment_choice">請選擇支付方式</string>
     <!-- summary title -->
     <string name="summary_title">兌換表:</string>
     <string name="mol_card_hint">請輸入卡號</string>
     <string name="mol_pass_hint">請輸入密碼</string>
     <string name="pay_ok">OK</string>
     <string name="pay_error">支付失敗，請再重試。</string>
     <string name="card_input_tip">請輸入點卡信息</string>
     <string name="amount_choice_tip">請選擇支付金額</string>
     <!-- paypal -->
     <string name="paypal_choice_tip">請選擇支付金額</string>
     <!-- gp -->
     <string name="gp_choice_tip">請選擇支付金額</string>
 </resources>

android/GameSDKRelease/res/values-zh/strings.xml

Diff comments View file @ c69691d

 <resources>
-    <string name="app_name">LoginSDK</string>
     <string name="user_name_hint">邮箱</string>
     <string name="password_hint">密码</string>
     <string name="login">登录</string>
     <string name="signup">注册</string>
     <string name="bind">绑定邮箱</string>
     <string name="loading">加载中……</string>
     <!-- toast -->
     <string name="illegal_uname_tip">请输入正确的邮箱</string>
     <string name="illegal_pwd_tip">密码格式不正确 (6–20字符)</string>
     <string name="illegal_user_exist">邮箱已注册</string>
     <string name="illegal_pwd_invalid">密码不正确，请重试</string>
     <string name="illegal_user_not_exist">邮箱未注册</string>
     <string name="invalid_email">请输入正确的邮箱</string>
     <string name="login_fail">登录失败</string>
     <string name="signup_fail">注册失败</string>
     <string name="bind_fail">绑定失败</string>
     <string name="net_error">网络无法连接，请查看网络设置</string>
     <!-- facebook id -->
     <!-- 支付 -->
     <!-- title -->
     <string name="title_payment_choice">请选择支付方式</string>
     <!-- summary title -->
     <string name="summary_title">兑换表:</string>
     <!-- payment -->
     <string name="mol_card_hint">请输入卡号</string>
     <string name="mol_pass_hint">请输入密码</string>
     <string name="pay_ok">OK</string>
     <string name="pay_error">充值失败，请重试</string>
     <string name="card_input_tip">请输入点卡信息</string>
     <string name="amount_choice_tip">请选择支付金额</string>
     <!-- paypal -->
     <string name="paypal_choice_tip">请选择支付金额</string>
-	 <!-- gp -->
+    <!-- gp -->
-	<string name="gp_choice_tip">请选择支付金额</string>
+    <string name="gp_choice_tip">请选择支付金额</string>
 </resources>

android/GameSDKRelease/res/values/strings.xml

Diff comments View file @ c69691d

 <resources>
-    <string name="app_name">LoginSDK</string>
     <string name="user_name_hint">Email</string>
     <string name="password_hint">Password</string>
     <string name="quick_login">Play(%sS)</string>
     <string name="quick_play">Play</string>
     <string name="login">Login</string>
     <string name="signup">Signup</string>
     <string name="bind">Bound to email</string>
     <string name="loading">Loading</string>
     <!-- toast -->
     <string name="illegal_uname_tip">Invalid Email</string>
     <string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string>
     <string name="illegal_user_exist">Email has already used</string>
     <string name="illegal_pwd_invalid">Password is incorrect. Please try again.</string>
     <string name="illegal_user_not_exist">Invalid Email</string>
     <string name="invalid_email">Invalid Email</string>
     <string name="login_fail">Login failed</string>
     <string name="signup_fail">Signup failed</string>
     <string name="bind_fail">Bound failed</string>
     <string name="net_error">Internet unavailable, please check</string>
     <string name="gump_login">Login with Gumptech</string>
     <string name="fb_login">Login with Facebook</string>
     <string name="signup_success">Sign Up Successfully</string>
     <!-- facebook -->
     <!-- 支付相关 -->
     <!-- title -->
     <string name="title_mycard">Mycard點數儲值</string>
     <string name="title_mycard_member">Mycard會員扣點</string>
     <string name="title_mycard_billing">Mycard Billing</string>
     <string name="title_mol">MOLPoints Gift Card</string>
     <string name="title_mol_wallet">MOLPoints E-Wallet</string>
     <string name="title_12call">12Call</string>
     <string name="title_tm">True Money</string>
     <string name="title_zest">Zest</string>
     <string name="title_gp">Google play</string>
     <string name="title_paypal">Paypal</string>
     <string name="title_rixty">Rixty</string>
     <string name="title_ngan">NganLoung</string>
     <string name="title_easy2pay">Easy2Pay</string>
     <string name="title_boa">BOACompra</string>
     <string name="title_indomog_voucher">Indomog</string>
     <string name="title_indomog_account">Indomog Account Balance</string>
     <string name="title_yandex">Yandex</string>
     <string name="title_vnpt_vnp">VinaPhone</string>
     <string name="title_vnpt_vms">MobiFone</string>
     <string name="title_vnpt_onc">Oncash</string>
     <string name="title_vnpt_fpt">FPT</string>
     <string name="title_vnpt_vtt">Viettel</string>
     <string name="title_vnpt_mgc">MegaCard</string>
     <string name="title_coda">Coda Payment</string>
     <string name="title_cherry">Cherry Credits</string>
     <string name="title_payment_choice">Select payment methods</string>
     <!-- summary title -->
     <string name="summary_title">Price list:</string>
     <!-- payment -->
     <string name="useranme_pattern">Account:%s</string>
     <string name="mol_card_hint">Card No.</string>
     <string name="mol_pass_hint">Password</string>
     <string name="pay_ok">OK</string>
     <string name="pay_error">Charging Failed, please try again.</string>
     <string name="card_input_tip">Card information</string>
     <string name="amount_choice_tip">Please select the amount</string>
     <!-- paypal -->
     <string name="paypal_amount_hint">Please enter the payment amount (Integer between %s to 10000)</string>
     <string name="paypal_choice_tip">Please select the amount</string>
     <!-- gp -->
     <string name="gp_choice_tip">Please select the amount</string>
     <!-- yandex -->
     <string name="yandex_money">Yandex Money</string>
     <string name="yandex_bank">Yandex Bank</string>
     <string name="yandex_cash">Yandex Cash</string>
 </resources>

android/GameSDKSample/res/values/strings.xml

Diff comments View file @ c69691d

1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<resources>	2	<resources>
3		3
4	<string name="app_name">LoginSDKSample</string>	4	<string name="app_name">GameSDKSample</string>
5	<string name="hello_world">Hello world!</string>	5	<string name="hello_world">Hello world!</string>
6	<string name="action_settings">Settings</string>	6	<string name="action_settings">Settings</string>
7		7
8	</resources>	8	</resources>
9		9

android/GameSDKSample/src/com/gumptech/loginsdk/sample/MainActivity.java

Diff comments View file @ c69691d

1	package com.gumptech.loginsdk.sample;	1	package com.gumptech.loginsdk.sample;
2		2
3	import android.app.Activity;	3	import android.app.Activity;
4	import android.content.Intent;	4	import android.content.Intent;
5	import android.os.Bundle;	5	import android.os.Bundle;
6	import android.util.Log;	6	import android.util.Log;
7	import android.view.View;	7	import android.view.View;
8	import android.widget.Button;	8	import android.widget.Button;
9	import android.widget.TextView;	9	import android.widget.TextView;
10	import android.widget.Toast;	10	import android.widget.Toast;
11		11
12	import com.gumptech.sdk.GumpSDK;	12	import com.gumptech.sdk.GumpSDK;
13		13
14	public class MainActivity extends Activity implements GumpSDK.Callback {	14	public class MainActivity extends Activity implements GumpSDK.Callback {
15		15
16	private TextView tvVersion;	16	private TextView tvVersion;
17	private TextView userInfo;	17	private TextView userInfo;
18		18
19	private Button btnLoginOrLogout;	19	private Button btnLoginOrLogout;
20		20
21	private String appId = "10021";	21	private String appId = "10022";
22		22
23	@Override	23	@Override
24	protected void onCreate(Bundle savedInstanceState) {	24	protected void onCreate(Bundle savedInstanceState) {
25	super.onCreate(savedInstanceState);	25	super.onCreate(savedInstanceState);
26	setContentView(R.layout.activity_main);	26	setContentView(R.layout.activity_main);
27	tvVersion = (TextView) findViewById(R.id.version);	27	tvVersion = (TextView) findViewById(R.id.version);
28	userInfo = (TextView) findViewById(R.id.user_info);	28	userInfo = (TextView) findViewById(R.id.user_info);
29	btnLoginOrLogout = (Button) findViewById(R.id.login_or_logout);	29	btnLoginOrLogout = (Button) findViewById(R.id.login_or_logout);
30	btnLoginOrLogout.setOnClickListener(new View.OnClickListener() {	30	btnLoginOrLogout.setOnClickListener(new View.OnClickListener() {
31		31
32	@Override	32	@Override
33	public void onClick(View v) {	33	public void onClick(View v) {
34	if (btnLoginOrLogout.getTag() == null \|\| (Integer) btnLoginOrLogout.getTag() == 0)	34	if (btnLoginOrLogout.getTag() == null \|\| (Integer) btnLoginOrLogout.getTag() == 0)
35	GumpSDK.start(MainActivity.this);	35	GumpSDK.start(MainActivity.this);
36	else	36	else
37	GumpSDK.logout(MainActivity.this, MainActivity.this);	37	GumpSDK.logout(MainActivity.this, MainActivity.this);
38	}	38	}
39	});	39	});
40	findViewById(R.id.pay).setOnClickListener(new View.OnClickListener() {	40	findViewById(R.id.pay).setOnClickListener(new View.OnClickListener() {
41		41
42	@Override	42	@Override
43	public void onClick(View v) {	43	public void onClick(View v) {
44	Bundle payInfo = new Bundle();	44	Bundle payInfo = new Bundle();
45	payInfo.putString("nick", "thi");	45	payInfo.putString("nick", "thi");
46	payInfo.putString("product", "元宝");	46	payInfo.putString("product", "元宝");
47	payInfo.putFloat("amount", 0.0f);	47	payInfo.putFloat("amount", 0.0f);
48	payInfo.putString("extraInfo", "This is demo!");	48	payInfo.putString("extraInfo", "This is demo!");
49	payInfo.putString("serverId", "B4003");	49	payInfo.putString("serverId", "B4003");
50	payInfo.putString("roleId", "10010");	50	payInfo.putString("roleId", "10010");
51	GumpSDK.pay(MainActivity.this, payInfo);	51	GumpSDK.pay(MainActivity.this, payInfo);
52	}	52	}
53	});	53	});
54	GumpSDK.init(getApplicationContext(), appId, "f702defbc67edb455949f46babab0c18", "1000");	54	GumpSDK.init(getApplicationContext(), appId, "f702defbc67edb455949f46babab0c18", "1000");
55	GumpSDK.setLogoShow(true);	55	GumpSDK.setLogoShow(true);
56	tvVersion.setText("SDK Version:" + GumpSDK.getVersion());	56	tvVersion.setText("SDK Version:" + GumpSDK.getVersion());
57	GumpSDK.start(this);	57	GumpSDK.start(this);
58	}	58	}
59		59
60	@Override	60	@Override
61	protected void onActivityResult(int requestCode, int resultCode, Intent data) {	61	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
62	Log.d("Main", "activity requestCode:" + requestCode + ",resultCode:" + resultCode);	62	Log.d("Main", "activity requestCode:" + requestCode + ",resultCode:" + resultCode);
63	if (requestCode == GumpSDK.LOGIN_REQUEST_CODE) {	63	if (requestCode == GumpSDK.LOGIN_REQUEST_CODE) {
64	if (resultCode == RESULT_OK) {	64	if (resultCode == RESULT_OK) {
65	String uid = data.getStringExtra("userId");	65	String uid = data.getStringExtra("userId");
66	int accountType = data.getIntExtra("accountType", -1);	66	int accountType = data.getIntExtra("accountType", -1);
67	String sessionkey = data.getStringExtra("sessionKey");	67	String sessionkey = data.getStringExtra("sessionKey");
68	userInfo.setText(" userid:" + uid + "\n accountType:" + accountType + "\n sessionKey:" + sessionkey);	68	userInfo.setText(" userid:" + uid + "\n accountType:" + accountType + "\n sessionKey:" + sessionkey);
69	btnLoginOrLogout.setText("Logout");	69	btnLoginOrLogout.setText("Logout");
70	btnLoginOrLogout.setTag(1);	70	btnLoginOrLogout.setTag(1);
71	} else if (resultCode == RESULT_CANCELED) {	71	} else if (resultCode == RESULT_CANCELED) {
72	Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show();	72	Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show();
73	}	73	}
74	} else if (requestCode == GumpSDK.PAY_REQUEST_CODE) {	74	} else if (requestCode == GumpSDK.PAY_REQUEST_CODE) {
75	if (resultCode == RESULT_OK) {	75	if (resultCode == RESULT_OK) {
76	int code = data.getIntExtra("code", -1);	76	int code = data.getIntExtra("code", -1);
77	String msg = data.getStringExtra("msg");	77	String msg = data.getStringExtra("msg");
78	String orderId = data.getStringExtra("orderId");	78	String orderId = data.getStringExtra("orderId");
79	String extraInfo = data.getStringExtra("extraInfo");	79	String extraInfo = data.getStringExtra("extraInfo");
80	Toast.makeText(this, "pay result: " + code + "," + msg + ",orderId:" + orderId + ",extraInfo:" + extraInfo, Toast.LENGTH_SHORT).show();	80	Toast.makeText(this, "pay result: " + code + "," + msg + ",orderId:" + orderId + ",extraInfo:" + extraInfo, Toast.LENGTH_SHORT).show();
81	} else if (resultCode == RESULT_CANCELED) {	81	} else if (resultCode == RESULT_CANCELED) {
82	Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show();	82	Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show();
83	}	83	}
84	}	84	}
85	super.onActivityResult(requestCode, resultCode, data);	85	super.onActivityResult(requestCode, resultCode, data);
86	}	86	}
87		87
88	@Override	88	@Override
89	public void onLogout() {	89	public void onLogout() {
90	btnLoginOrLogout.setText("Login");	90	btnLoginOrLogout.setText("Login");
91	btnLoginOrLogout.setTag(0);	91	btnLoginOrLogout.setTag(0);
92	userInfo.append("\n User is logout");	92	userInfo.append("\n User is logout");
93	}	93	}
94		94
95	}	95	}
96		96