From 3f363f49bcf13ada62be72184229e3ed7e1d48c5 Mon Sep 17 00:00:00 2001
From: purerosefallen <78877@qq.com>
Date: Sat, 7 Jul 2018 11:20:23 +0800
Subject: [PATCH 1/3] support mycard

---
 .../main/java/cn/garymb/ygomobile/Constants.java    |  5 +++++
 .../garymb/ygomobile/ui/online/MyCardActivity.java  | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/java/cn/garymb/ygomobile/Constants.java b/mobile/src/main/java/cn/garymb/ygomobile/Constants.java
index ac44326f..a18706a0 100644
--- a/mobile/src/main/java/cn/garymb/ygomobile/Constants.java
+++ b/mobile/src/main/java/cn/garymb/ygomobile/Constants.java
@@ -5,6 +5,11 @@
 import cn.garymb.ygomobile.lite.BuildConfig;
 
 public interface Constants {
+    //support mycard - will pass to mycard
+    String ORIGIN_APP_ID = "cn.garymb.ygomobile";
+    String ORIGIN_VER_NAME = "3.3.0";
+    int ORIGIN_VER_CODE = 32010530;
+
     boolean DEBUG = BuildConfig.DEBUG;
     String PREF_START = "game_pref_";
     String PREF_LAST_YDK = "pref_last_ydk";
diff --git a/mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/MyCardActivity.java b/mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/MyCardActivity.java
index edcc0e96..fcc80fb0 100644
--- a/mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/MyCardActivity.java
+++ b/mobile/src/mycard/java/cn/garymb/ygomobile/ui/online/MyCardActivity.java
@@ -32,6 +32,10 @@
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
 
+import static cn.garymb.ygomobile.Constants.ORIGIN_APP_ID;
+import static cn.garymb.ygomobile.Constants.ORIGIN_VER_NAME;
+import static cn.garymb.ygomobile.Constants.ORIGIN_VER_CODE;
+
 public class MyCardActivity extends BaseActivity implements MyCard.MyCardListener, NavigationView.OnNavigationItemSelectedListener {
 
     private MyCardWebView mWebViewPlus;
@@ -67,9 +71,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         XWalkSettings settings = mWebViewPlus.getSettings();
         settings.setUserAgentString(settings.getUserAgentString() + MessageFormat.format(
                 " YGOMobile/{0} ({1} {2,number,#})",
-                BuildConfig.VERSION_NAME,
-                BuildConfig.APPLICATION_ID,
-                BuildConfig.VERSION_CODE
+                //BuildConfig.VERSION_NAME,
+                //BuildConfig.APPLICATION_ID,
+                //BuildConfig.VERSION_CODE
+                ORIGIN_VER_NAME,
+                ORIGIN_APP_ID,
+                ORIGIN_VER_CODE
         ));
 
         mWebViewPlus.setUIClient(new XWalkUIClient(mWebViewPlus) {

From 9ef32b9ed57ca5c9993b85cbf3fa761965bf28ea Mon Sep 17 00:00:00 2001
From: purerosefallen <78877@qq.com>
Date: Sat, 7 Jul 2018 11:24:50 +0800
Subject: [PATCH 2/3] oriver

---
 mobile/src/main/java/cn/garymb/ygomobile/Constants.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/cn/garymb/ygomobile/Constants.java b/mobile/src/main/java/cn/garymb/ygomobile/Constants.java
index a18706a0..2f84d118 100644
--- a/mobile/src/main/java/cn/garymb/ygomobile/Constants.java
+++ b/mobile/src/main/java/cn/garymb/ygomobile/Constants.java
@@ -7,8 +7,8 @@
 public interface Constants {
     //support mycard - will pass to mycard
     String ORIGIN_APP_ID = "cn.garymb.ygomobile";
-    String ORIGIN_VER_NAME = "3.3.0";
-    int ORIGIN_VER_CODE = 32010530;
+    String ORIGIN_VER_NAME = "3.3.2";
+    int ORIGIN_VER_CODE = 32010532;
 
     boolean DEBUG = BuildConfig.DEBUG;
     String PREF_START = "game_pref_";

From 10ada55721c72e1dc6d23957735a8f338e94158b Mon Sep 17 00:00:00 2001
From: purerosefallen <78877@qq.com>
Date: Sat, 7 Jul 2018 11:26:34 +0800
Subject: [PATCH 3/3] fixver

---
 mobile/assets/changelog.html | 2 +-
 mobile/build.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/assets/changelog.html b/mobile/assets/changelog.html
index c56abff4..cdf4b7a8 100644
--- a/mobile/assets/changelog.html
+++ b/mobile/assets/changelog.html
@@ -28,7 +28,7 @@ <h3 style="color:#ffffff">敬告</h3>
     - https://github.com/edo9300/ygopro
 </pre>
 <ul>
-    <li style="color:#ffff00">3.3.0</li>
+    <li style="color:#ffff00">3.3.2</li>
 </ul>
 <pre>
     Synced with YGOPro source code.
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 118d2cc7..b50a0164 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile.koishi"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 32010530
+        versionCode 32010532
         versionName "Koishi"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true