From 8d2563c069b70976af7b9fa7926049e2c24b4d9f Mon Sep 17 00:00:00 2001
From: sifacaii <sifacai@outlook.com>
Date: Thu, 25 Aug 2022 14:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=BA=A6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/sifacai/vlcjellyfin/MainActivity.java | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/MainActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/MainActivity.java
index 169a406..1ea0e1d 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/MainActivity.java
+++ b/app/src/main/java/org/sifacai/vlcjellyfin/MainActivity.java
@@ -41,7 +41,12 @@ public class MainActivity extends BaseActivity {
         tvLoginOut = findViewById(R.id.tvLoginOut);
         tvContiner = findViewById(R.id.tvItems);
         getConfigFromSP();
+    }
+
+    @Override
+    protected void onResume() {
         initView();
+        super.onResume();
     }
 
     private void initView() {
@@ -61,8 +66,8 @@ public class MainActivity extends BaseActivity {
         mActivity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                //showLoading("正在加载首页，请稍候…………");
                 showLoadingDialog("正在加载首页，请稍候…………");
+                showLogoutBtn();
                 tvContiner.removeAllViews();
             }
         });
@@ -299,7 +304,6 @@ public class MainActivity extends BaseActivity {
      * @return
      */
     private boolean ValidUrl(String url) {
-        //showLoadingDialog("正在验证服务器地址!");
         boolean valid = false;
         if (url.length() > 0) {
             if (url.startsWith("http://") || url.startsWith("https://")) {
@@ -321,7 +325,6 @@ public class MainActivity extends BaseActivity {
                 }
             }
         }
-        //dismissLoadingDialog();
         return false;
     }
 
@@ -335,7 +338,6 @@ public class MainActivity extends BaseActivity {
     private boolean authenticateByName(String username, String password) {
         String url = "/Users/authenticatebyname";
         String reqjson = "{\"Username\":\"" + username + "\",\"Pw\":\"" + password + "\"}";
-        //showLoadingDialog("正在验证用户名和密码！");
         String userinfo = Utils.okhttpSend(url, reqjson);
         if (userinfo.length() > 0) {
             JsonObject userObj = new Gson().fromJson(userinfo, JsonObject.class);
@@ -347,18 +349,9 @@ public class MainActivity extends BaseActivity {
                 return true;
             }
         }
-        //dismissLoadingDialog();
         return false;
     }
 
-    @Override
-    protected void onResume() {
-        if(!Utils.AccessToken.equals("")){
-            showLogoutBtn();
-        }
-        super.onResume();
-    }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {