Commit 3b0b01ef6f0430a27f104703fa8616c6858fbfbd
1 parent
45cb1782b3
Exists in
master
modify entrance webview function for FB login\nmodify demo UI
Showing 4 changed files with 29 additions and 15 deletions Side-by-side Diff
android/GameSDKRelease/libs/GameSDK2.4.0_proguard.jar
No preview for this file type
android/GameSDKSample/AndroidManifest.xml
... | ... | @@ -15,18 +15,18 @@ |
15 | 15 | <uses-permission android:name="android.permission.WRITE_SETTINGS" /> |
16 | 16 | <uses-permission android:name="android.permission.GET_ACCOUNTS" /> |
17 | 17 | <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> |
18 | - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | |
19 | - <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> | |
18 | + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | |
19 | + <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> | |
20 | 20 | <!-- for card.io card scanning --> |
21 | 21 | <uses-permission android:name="android.permission.CAMERA" /> |
22 | 22 | <uses-permission android:name="android.permission.VIBRATE" /> |
23 | - <uses-permission android:name="android.permission.SEND_SMS"/> | |
23 | + <uses-permission android:name="android.permission.SEND_SMS" /> | |
24 | 24 | <!-- coda --> |
25 | 25 | <uses-permission android:name="android.permission.RECEIVE_SMS" /> |
26 | 26 | <uses-permission android:name="android.permission.READ_SMS" /> |
27 | 27 | <uses-permission android:name="android.permission.WRITE_SMS" /> |
28 | 28 | <uses-permission android:name="android.permission.GET_TASKS" /> |
29 | - | |
29 | + | |
30 | 30 | <uses-feature |
31 | 31 | android:name="android.hardware.camera" |
32 | 32 | android:required="false" /> |
android/GameSDKSample/res/layout/activity_main.xml
... | ... | @@ -5,16 +5,22 @@ |
5 | 5 | android:orientation="vertical" > |
6 | 6 | |
7 | 7 | <TextView |
8 | + android:id="@+id/version" | |
9 | + android:layout_width="wrap_content" | |
10 | + android:layout_height="wrap_content" | |
11 | + android:layout_gravity="center_horizontal" /> | |
12 | + | |
13 | + <TextView | |
8 | 14 | android:id="@+id/user_info" |
9 | 15 | android:layout_width="wrap_content" |
10 | - android:layout_height="wrap_content" /> | |
16 | + android:layout_height="wrap_content" | |
17 | + android:textColor="@android:color/black" /> | |
11 | 18 | |
12 | 19 | <Button |
13 | - android:id="@+id/logout" | |
20 | + android:id="@+id/login_or_logout" | |
14 | 21 | android:layout_width="wrap_content" |
15 | 22 | android:layout_height="wrap_content" |
16 | - android:text="logout" | |
17 | - android:visibility="gone" /> | |
23 | + android:text="Login" /> | |
18 | 24 | |
19 | 25 | <Button |
20 | 26 | android:id="@+id/pay" |
android/GameSDKSample/src/com/gumptech/loginsdk/sample/MainActivity.java
... | ... | @@ -13,9 +13,10 @@ import com.gumptech.sdk.GumpSDK; |
13 | 13 | |
14 | 14 | public class MainActivity extends Activity implements GumpSDK.Callback { |
15 | 15 | |
16 | + private TextView tvVersion; | |
16 | 17 | private TextView userInfo; |
17 | 18 | |
18 | - private Button btnLogout; | |
19 | + private Button btnLoginOrLogout; | |
19 | 20 | |
20 | 21 | private String appId = "10009"; |
21 | 22 | |
... | ... | @@ -23,12 +24,16 @@ public class MainActivity extends Activity implements GumpSDK.Callback { |
23 | 24 | protected void onCreate(Bundle savedInstanceState) { |
24 | 25 | super.onCreate(savedInstanceState); |
25 | 26 | setContentView(R.layout.activity_main); |
27 | + tvVersion = (TextView) findViewById(R.id.version); | |
26 | 28 | userInfo = (TextView) findViewById(R.id.user_info); |
27 | - btnLogout = (Button) findViewById(R.id.logout); | |
28 | - btnLogout.setOnClickListener(new View.OnClickListener() { | |
29 | + btnLoginOrLogout = (Button) findViewById(R.id.login_or_logout); | |
30 | + btnLoginOrLogout.setOnClickListener(new View.OnClickListener() { | |
29 | 31 | |
30 | 32 | @Override |
31 | 33 | public void onClick(View v) { |
34 | + if (btnLoginOrLogout.getTag() == null || (Integer) btnLoginOrLogout.getTag() == 0) | |
35 | + GumpSDK.start(MainActivity.this); | |
36 | + else | |
32 | 37 | GumpSDK.logout(MainActivity.this, MainActivity.this); |
33 | 38 | } |
34 | 39 | }); |
... | ... | @@ -47,6 +52,7 @@ public class MainActivity extends Activity implements GumpSDK.Callback { |
47 | 52 | } |
48 | 53 | }); |
49 | 54 | GumpSDK.init(getApplicationContext(), appId, "483d8df877b31405c1e8fe4247f02d86", "301596413332339", "1000"); |
55 | + tvVersion.setText("SDK Version:" + GumpSDK.getVersion()); | |
50 | 56 | GumpSDK.start(this); |
51 | 57 | } |
52 | 58 | |
... | ... | @@ -58,8 +64,9 @@ public class MainActivity extends Activity implements GumpSDK.Callback { |
58 | 64 | String uid = data.getStringExtra("userId"); |
59 | 65 | int accountType = data.getIntExtra("accountType", -1); |
60 | 66 | String sessionkey = data.getStringExtra("sessionKey"); |
61 | - userInfo.setText("userid:" + uid + ",accountType:" + accountType + ",sessionKey:" + sessionkey); | |
62 | - btnLogout.setVisibility(View.VISIBLE); | |
67 | + userInfo.setText(" userid:" + uid + "\n accountType:" + accountType + "\n sessionKey:" + sessionkey); | |
68 | + btnLoginOrLogout.setText("Logout"); | |
69 | + btnLoginOrLogout.setTag(1); | |
63 | 70 | } else if (resultCode == RESULT_CANCELED) { |
64 | 71 | Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show(); |
65 | 72 | } |
... | ... | @@ -79,8 +86,9 @@ public class MainActivity extends Activity implements GumpSDK.Callback { |
79 | 86 | |
80 | 87 | @Override |
81 | 88 | public void onLogout() { |
82 | - btnLogout.setVisibility(View.GONE); | |
83 | - userInfo.append(" is logout"); | |
89 | + btnLoginOrLogout.setText("Login"); | |
90 | + btnLoginOrLogout.setTag(0); | |
91 | + userInfo.append("\n User is logout"); | |
84 | 92 | } |
85 | 93 | |
86 | 94 | } |