Merge pull request #74 from mercury233/patch-pre-download-page

update pre download page

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/WebActivity.java

@@ -134,7 +134,7 @@ public class WebActivity extends BaseActivity {
         });*/
         if (doIntent(getIntent())) {
             mWebViewPlus.loadUrl(mUrl);
-            if (mUrl.equals(URL_YGO233_ADVANCE)) {
+            if (mUrl.startsWith(URL_YGO233_ADVANCE)) {
                 btn_download.setVisibility(View.VISIBLE);
             } else {
                 btn_download.setVisibility(View.GONE);

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java

@@ -703,7 +703,11 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
                 YGOStarter.startGame(getActivity(), null, "-k", "-s");
                 break;
             case R.id.action_download_ex:
-                WebActivity.open(getContext(), getString(R.string.action_download_expansions), Constants.URL_YGO233_ADVANCE);
+                String aurl = Constants.URL_YGO233_ADVANCE;
+                if (ll_new_notice.getVisibility() == View.VISIBLE) {
+                    aurl = aurl + "#pre_update_title";
+                }
+                WebActivity.open(getContext(), getString(R.string.action_download_expansions), aurl);
                 ll_new_notice.setVisibility(View.GONE);
                 break;
             case R.id.action_help: {

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/X5WebView.java

 package cn.garymb.ygomobile.ui.mycard;
+import cn.garymb.ygomobile.lite.BuildConfig;
+
+import java.text.MessageFormat;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -69,6 +72,13 @@ public class X5WebView extends WebView {
         setHorizontalScrollBarEnabled(false);
         webSetting.setAllowContentAccess(true);
         webSetting.setMixedContentMode(WebSettings.LOAD_NORMAL);
+
+        webSetting.setUserAgentString(webSetting.getUserAgentString() + MessageFormat.format(
+                " YGOMobile/{0} ({1} {2,number,#})",
+                BuildConfig.VERSION_NAME,
+                BuildConfig.APPLICATION_ID,
+                BuildConfig.VERSION_CODE
+        ));
     }
 
     @Override