TCG banlist

mobile/assets/changelog.html

@@ -13,10 +13,22 @@
 
     注意：如果您是通过付费购买或者付费获得下载渠道而获得本软件的话，您已经上当受骗。本软件——免费！
 
-    特别感谢： 菜菜,尸体,晓L,废话多,幻兽L,龙道香姐 的支持与努力.
+    特别感谢： 菜菜,尸体,废话多,,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.2.0</li>
+    <li style="color:#ffff00">3.2.1</li>
+</ul>
+<pre>
+    更新：
+    1.更新ygo内核；
+    2.TCG2018.5.21禁卡表
+    3.新卡：CP18；
+    新增：
+    1.WINDBOT本地人机
+
+</pre>
+<ul>
+    <li style="color:#ffffff">3.2.0</li>
 </ul>
 <pre>
     更新：

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 32010514
+        versionCode 32010515
         versionName "3.2.1"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/core/AndroidManifest.xml

@@ -9,12 +9,6 @@
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Translucent"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
-        <activity
-            android:name="cn.garymb.ygomobile.ui.online.mcchat.McchatActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"
-            android:label="@string/app_name"/>
-        <activity
-            android:name="cn.garymb.ygomobile.ui.online.mcchat.SplashActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file

mobile/src/mycard/AndroidManifest.xml

@@ -10,6 +10,12 @@
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Mycard"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
+        <activity
+            android:name="cn.garymb.ygomobile.ui.online.mcchat.McchatActivity"
+            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:label="@string/app_name"/>
+        <activity
+            android:name="cn.garymb.ygomobile.ui.online.mcchat.SplashActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file

mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/MyCard.java

@@ -67,8 +67,6 @@ public class MyCard {
         mDefWebViewClient = new DefWebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                UserManagement.setUserName(mUser.username);
-                UserManagement.setUserPassword(mUser.external_id+"");
                 if (url.startsWith(return_sso_url)) {
                     String sso = Uri.parse(url).getQueryParameter("sso");
                     String data = new String(Base64.decode(Uri.parse(url).getQueryParameter("sso"), Base64.NO_WRAP), UTF_8);
@@ -80,6 +78,8 @@ public class MyCard {
                     mUser.avatar_url = info.getQueryParameter("avatar_url");
                     mUser.admin = info.getBooleanQueryParameter("admin", false);
                     mUser.moderator = info.getBooleanQueryParameter("moderator", false);
+					UserManagement.setUserName(mUser.username);
+					UserManagement.setUserPassword(mUser.external_id+"");
                     mUser.login = true;
                     if (getMyCardListener() != null) {
                         getMyCardListener().onLogin(mUser.name, mUser.avatar_url, null);