获取重新登录信息

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

@@ -205,7 +205,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
 
     //轮播图
     public void initBanner(View view, Bundle saveBundle) {
-        Log.i("3.10.0看看", saveBundle + "");
+        Log.i("3.10.0看看saveBundle", saveBundle + "");
         xb_banner = view.findViewById(R.id.xb_banner);
         cv_banner = view.findViewById(R.id.cv_banner);
         cv_banner.post(() -> {

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

@@ -47,9 +47,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/?";
-    public static final String return_sso_url_ygopro_lobby = " https://mycard.moe/mobile/ygopro/lobby?";
     private static final String HOST_MC = "mycard.moe";
-    private static final String MC_MAIN_URL = "https://mycard.moe/mobile/ygopro/lobby";
+    public static final String MC_MAIN_URL = "https://mycard.moe/mobile/ygopro/lobby";
     public static final String DOWNLOAD_URL_EZ = "http://t.cn/EchWyLi";
 
     public static final String MYCARD_NEWS_URL = "https://api.mycard.moe/apps.json";
@@ -108,7 +107,6 @@ public class MyCard {
         mDefWebViewClient = new DefWebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                Log.i(BuildConfig.VERSION_NAME + "看看MyCard类url", url);
                 if (url.startsWith(return_sso_url)) {
                     String sso = Uri.parse(url).getQueryParameter("sso");
                     String data = new String(Base64.decode(Uri.parse(url).getQueryParameter("sso"), Base64.NO_WRAP), UTF_8);

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

@@ -132,7 +132,6 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
         serviceManagement = ServiceManagement.getDx();
         serviceManagement.addJoinRoomListener(this);
         serviceManagement.addListener(this);
-        serviceManagement.start();
 
         WebSettings settings = mWebViewPlus.getSettings();
         settings.setUserAgentString(settings.getUserAgentString() + MessageFormat.format(
@@ -340,22 +339,25 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
 
     @Override
     public void onLogin(String name, String icon, String statu) {
-        Message message = new Message();
-        message.obj = new String[]{name, icon, statu};
-        message.what = TYPE_MC_LOGIN;
-        handler.sendMessage(message);
-        Log.i(BuildConfig.VERSION_NAME + "看看URL", mWebViewPlus.getUrl() + "");
+        //重登、切换用户即时更新用户和id信息
         if (mWebViewPlus.getUrl() != null) {
             String url = mWebViewPlus.getUrl();
-            if (url.startsWith(mMyCard.return_sso_url_ygopro_lobby)) {
+            if (url.startsWith(mMyCard.MC_MAIN_URL)) {
+
                 String data = new String(Base64.decode(Uri.parse(url).getQueryParameter("sso"), Base64.NO_WRAP), UTF_8);
                 Uri info = new Uri.Builder().encodedQuery(data).build();
-                mMyCard.mUser.external_id = Integer.parseInt(info.getQueryParameter("external_id"));
-                Log.i(BuildConfig.VERSION_NAME + "看看mUser", mMyCard.mUser.username+"/"+mMyCard.mUser.external_id);
-                lastModified.edit().putString("user_external_id", mMyCard.mUser.external_id + "").apply();
+                mMyCard.mUser.username =info.getQueryParameter("username");
+                mMyCard.mUser.external_id = Integer.parseInt(info.getQueryParameter("id"));
 
+                lastModified.edit().putString("user_name", mMyCard.mUser.username).apply();
+                lastModified.edit().putString("user_external_id", String.valueOf(mMyCard.mUser.external_id)).apply();
             }
         }
+        //登录成功发送message
+        Message message = new Message();
+        message.obj = new String[]{name, icon, statu};
+        message.what = TYPE_MC_LOGIN;
+        handler.sendMessage(message);
     }
 
     @Override
@@ -442,7 +444,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
         if (state) {
             tv_message.setText(R.string.login_succeed);
         } else {
-            tv_message.setText(R.string.miss_connection);
+            tv_message.setText(R.string.reChatJoining);
         }
     }
 

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

@@ -73,7 +73,7 @@ public class MycardChatFragment extends BaseFragemnt implements ChatListener {
         if (state) {
             main_title.setText(R.string.logining_in);
         } else {
-            main_title.setText(R.string.miss_connection);
+            main_title.setText(R.string.reChatJoining);
         }
     }
 

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

@@ -3,16 +3,13 @@ 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;
 
 import org.jivesoftware.smack.ConnectionConfiguration;
-import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
 import org.jivesoftware.smackx.muc.MultiUserChat;
@@ -312,10 +309,9 @@ public class ServiceManagement {
         SharedPreferences lastModified = App.get().getSharedPreferences("lastModified", Context.MODE_PRIVATE);
         UserManagement.setUserName(lastModified.getString("user_name", null));
         UserManagement.setUserPassword(lastModified.getString("user_external_id", null));
-
         name = UserManagement.getUserName();
         password = UserManagement.getUserPassword();
-        Log.i(BuildConfig.VERSION_NAME +"kk",name+"+"+password);
+        Log.i(BuildConfig.VERSION_NAME +"看看用户和ID",name+"+"+password);
         if (TextUtils.isEmpty(name) || TextUtils.isEmpty(password)) {
             isStartLoading=false;
             han.sendEmptyMessage(CHAT_USER_NULL);
@@ -358,7 +354,7 @@ public class ServiceManagement {
                     han.sendMessage(me);
                 } catch (Exception e) {
                     isStartLoading=false;
-                    me.obj = "其他错误：" + e;
+                    me.obj = "otherException：" + e;
                     e.printStackTrace();
                     han.sendMessage(me);
                 }

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

@@ -51,7 +51,8 @@
                     android:lines="1"
                     android:text=""
                     android:textColor="@color/holo_orange_bright"
-                    android:textSize="10sp" />
+                    android:textSize="10sp"
+                    android:visibility="invisible"/>
             </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.appcompat.widget.LinearLayoutCompat>
 

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

@@ -9,7 +9,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent">
+        android:background="#aa0b2241">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="wrap_content"

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

@@ -332,6 +332,5 @@
     <string name="back_to_mycard_home">MyCard 첫 페이지로 돌아가기</string>
     <string name="edit_your_message">메시지를 입력하십시오</string>
     <string name="login_succeed">채팅 방에 로그인되었습니다</string>
-    <string name="miss_connection">연결이 끊어졌습니다. 다시 로그인중입니다.</string>
     <string name="reChatJoining">다시 로그인 중\.\.\.</string>
 </resources>

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

@@ -332,6 +332,5 @@
     <string name="back_to_mycard_home">返回萌卡首页</string>
     <string name="edit_your_message">输入聊天内容</string>
     <string name="login_succeed">登录成功</string>
-    <string name="miss_connection">连接断开,重新登陆中……</string>
     <string name="reChatJoining">连接断开,重新登陆中……</string>
 </resources>

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

@@ -339,9 +339,8 @@
     <string name="personal">My</string>
     <string name="login_mycard">login</string>
     <string name="logout_mycard">Logout mycard\?</string>
-    <string name="back_to_mycard_home">return to MyCard homepage</string>
+    <string name="back_to_mycard_home">back to homepage</string>
     <string name="edit_your_message">Input your message</string>
     <string name="login_succeed">Chatroom logined</string>
-    <string name="miss_connection">miss connection, relogining</string>
     <string name="reChatJoining">relogining\.\.\.</string>
 </resources>