mc新闻界面新增快捷返回mc大厅按键

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

@@ -40,6 +40,8 @@ public class MyCard {
     private static final String mArenaUrl = "https://mycard.moe/ygopro/arena/";
     private static final String mCommunityUrl = "https://ygobbs.com/login";
     private static final String return_sso_url = "https://mycard.moe/mobile/?";
+    private static final String HOST_MC = "mycard.moe";
+    private static final String MC_MAIN_URL = "https://mycard.moe/mobile/ygopro/lobby";
     private static final Charset UTF_8 = Charset.forName("UTF-8");
     private final DefWebViewClient mDefWebViewClient;
     private final User mUser = new User();
@@ -125,6 +127,14 @@ public class MyCard {
         return mCommunityUrl;
     }
 
+    public String getMcHost() {
+        return HOST_MC;
+    }
+
+    public String getMcMainUrl() {
+        return MC_MAIN_URL;
+    }
+
     @SuppressLint("AddJavascriptInterface")
     public void attachWeb(MyCardWebView webView, MyCardListener myCardListener) {
         mMyCardListener = myCardListener;

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

@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
@@ -67,6 +68,7 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         }
     };
     private ProgressBar mProgressBar;
+    private TextView tv_back_mc;
     private ValueCallback<Uri> uploadMessage;
     private ValueCallback<Uri[]> mUploadCallbackAboveL;
 
@@ -86,6 +88,7 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         mWebViewPlus = $(R.id.webbrowser);
         mDrawerlayout = $(R.id.drawer_layout);
         mProgressBar = $(R.id.progressBar);
+        tv_back_mc = $(R.id.tv_back_mc);
         mProgressBar.setMax(100);
 
         NavigationView navigationView = $(R.id.nav_main);
@@ -96,6 +99,10 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         mStatusView = navHead.findViewById(R.id.tv_dp);
         //mWebViewPlus.enableHtml5();
 
+        tv_back_mc.setOnClickListener(view->{
+            mWebViewPlus.loadUrl(mMyCard.getHomeUrl());
+        });
+
         WebSettings settings = mWebViewPlus.getSettings();
         settings.setUserAgentString(settings.getUserAgentString() + MessageFormat.format(
                 " YGOMobile/{0} ({1} {2,number,#})",
@@ -109,6 +116,10 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
             public void onProgressChanged(WebView view, int newProgress) {
                 if (newProgress == 100) {
                     mProgressBar.setVisibility(View.GONE);
+                    if (view.getUrl().contains(mMyCard.getMcHost()))
+                        tv_back_mc.setVisibility(View.GONE);
+                    else
+                        tv_back_mc.setVisibility(View.VISIBLE);
                 } else {
                     if (View.GONE == mProgressBar.getVisibility()) {
                         mProgressBar.setVisibility(View.VISIBLE);
@@ -195,6 +206,10 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
             closeDrawer();
             return;
         }
+        if (mWebViewPlus.getUrl().equals(mMyCard.getMcMainUrl())) {
+            finish();
+            return;
+        }
         if (mWebViewPlus.canGoBack()) {
             mWebViewPlus.goBack();
         } else {

mobile/src/main/res/layout/activity_online_mycard.xml

@@ -11,10 +11,25 @@
     tools:openDrawer="left">
 
 
-    <RelativeLayout
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:visibility="gone"
+            android:id="@+id/tv_back_mc"
+            android:background="@drawable/click_background"
+            android:textColor="@color/black"
+            android:layout_width="match_parent"
+            android:text="返回萌卡大厅"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:layout_height="wrap_content"/>
+
         <cn.garymb.ygomobile.ui.mycard.MyCardWebView
             android:id="@+id/webbrowser"
             android:layout_width="match_parent"
@@ -28,9 +43,10 @@
 
         </cn.garymb.ygomobile.ui.mycard.MyCardWebView>
 
-    </RelativeLayout>
+    </LinearLayout>
 
     <com.google.android.material.navigation.NavigationView
+        android:visibility="gone"
         android:id="@+id/nav_main"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"