登录失败时不自动登录改为点击登录

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

@@ -32,6 +32,7 @@ import cn.garymb.ygomobile.App;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.bean.events.DeckFile;
+import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.ui.plus.DefWebViewClient;
 import cn.garymb.ygomobile.utils.DeckUtil;
 import cn.garymb.ygomobile.utils.JsonUtil;
@@ -95,7 +96,7 @@ public class MyCard {
     public static final String PACKAGE_NAME_EZ = "com.ourygo.ez";
     private static final Charset UTF_8 = Charset.forName("UTF-8");
     private final DefWebViewClient mDefWebViewClient;
-    private final User mUser = new User();
+    public final User mUser = new User();
     private final SharedPreferences lastModified;
     private MyCardListener mMyCardListener;
     private Activity mContext;
@@ -119,6 +120,8 @@ public class MyCard {
                     mUser.moderator = info.getBooleanQueryParameter("moderator", false);
                     lastModified.edit().putString("user_external_id", mUser.external_id + "").apply();
                     lastModified.edit().putString("user_name", mUser.username).apply();
+                    Log.i(BuildConfig.VERSION_NAME + "看看MyCard类",
+                            lastModified.getString("user_name", null) + "和" + lastModified.getString("user_external_id", null));
                     //UserManagement.setUserName(mUser.username);
                     //UserManagement.setUserPassword(mUser.external_id+"");
                     mUser.login = true;

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

@@ -14,9 +14,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -37,6 +35,7 @@ import com.tencent.smtt.sdk.WebView;
 import java.text.MessageFormat;
 import java.util.List;
 
+import cn.garymb.ygomobile.App;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.base.BaseFragemnt;
 import cn.garymb.ygomobile.lite.BuildConfig;
@@ -45,7 +44,6 @@ import cn.garymb.ygomobile.ui.home.HomeActivity;
 import cn.garymb.ygomobile.ui.mycard.base.OnJoinChatListener;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage;
-import cn.garymb.ygomobile.ui.mycard.mcchat.MycardChatFragment;
 import cn.garymb.ygomobile.ui.mycard.mcchat.management.ServiceManagement;
 import cn.garymb.ygomobile.ui.mycard.mcchat.management.UserManagement;
 import cn.garymb.ygomobile.utils.HandlerUtil;
@@ -80,16 +78,14 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
             if (msg.what == TYPE_MC_LOGIN) {
                 String[] ss = (String[]) msg.obj;
                 if (!TextUtils.isEmpty(ss[1])) {
-                    GlideCompat.with(getActivity()).load(Uri.parse(ss[1])).into(mHeadView);
+                    GlideCompat.with(getActivity()).load(Uri.parse(ss[1])).into(mHeadView);//刷新头像图片
                 }
-                mNameView.setText(ss[0]);
-                mStatusView.setText(ss[2]);
-
-                initData();
-
+                mNameView.setText(ss[0]);//刷新用户名
+                mStatusView.setText(ss[2]);//刷新账号信息
+                serviceManagement.start();
             }
             if (msg.what == TYPE_MC_LOGIN_FAILED) {
-                initData();
+
             }
         }
     };
@@ -105,7 +101,6 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
         View view;
         view = inflater.inflate(R.layout.fragment_mycard, container, false);
         initView(view);
-        initData();
         return view;
     }
 
@@ -131,8 +126,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
         serviceManagement = ServiceManagement.getDx();
         serviceManagement.addJoinRoomListener(this);
         serviceManagement.addListener(this);
-
-        initData();
+        serviceManagement.start();
 
         WebSettings settings = mWebViewPlus.getSettings();
         settings.setUserAgentString(settings.getUserAgentString() + MessageFormat.format(
@@ -187,15 +181,6 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
         mWebViewPlus.loadUrl(mMyCard.getHomeUrl());
     }
 
-    private void initData() {
-        SharedPreferences lastModified = getActivity().getSharedPreferences("lastModified", Context.MODE_PRIVATE);
-        UserManagement.setUserName(lastModified.getString("user_name", null));
-        UserManagement.setUserPassword(lastModified.getString("user_external_id", null));
-        if (UserManagement.getUserName() != null) {
-            serviceManagement.start();
-        }
-    }
-
     @Override
     public void onResume() {
         YGOStarter.onResumed(getActivity());
@@ -339,6 +324,9 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
                         }
 
                     }
+                } else {
+                    //点击重新登录
+                    serviceManagement.start();
                 }
                 break;
         }

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/management/ServiceManagement.java

@@ -3,6 +3,7 @@ package cn.garymb.ygomobile.ui.mycard.mcchat.management;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
@@ -26,6 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.garymb.ygomobile.App;
+import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.ui.mycard.base.OnJoinChatListener;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage;
@@ -313,7 +315,7 @@ public class ServiceManagement {
 
         name = UserManagement.getUserName();
         password = UserManagement.getUserPassword();
-
+        Log.i(BuildConfig.VERSION_NAME +"看看",name+"+"+password);
         if (TextUtils.isEmpty(name) || TextUtils.isEmpty(password)) {
             isStartLoading=false;
             han.sendEmptyMessage(CHAT_USER_NULL);

mobile/src/main/res/values-zh/strings.xml

@@ -115,7 +115,7 @@
     <string name="label_category">效果分类</string>
     <string name="linkmarker">◀连接标记▶</string>>
     <string name="searching">读取中</string>
-    <string name="card_faq">在线裁定</string>
+    <string name="card_faq">在线裁定查询</string>
     <string name="no_webbrowser">没有安装浏览器</string>
     <string name="load_game">启动游戏中</string>