优化网页登录获取tk方式

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareMyDeckFragment.java

@@ -58,6 +58,8 @@ public class DeckSquareMyDeckFragment extends Fragment {
         } else {
             binding.llMainUi.setVisibility(View.VISIBLE);
             binding.llDialogLogin.setVisibility(View.GONE);
+            McUser mcUser = new McUser();
+            GlideCompat.with(getActivity()).load(ChatMessage.getAvatarUrl(SharedPreferenceUtil.getUserName())).into(binding.myDeckAvatar);//刷新头像图片
         }
         binding.btnLogin.setOnClickListener(v -> attemptLogin());
         binding.btnRegister.setOnClickListener(v -> WebActivity.open(getContext(), getString(R.string.register), MyCard.URL_MC_SIGN_UP));
@@ -134,7 +136,6 @@ public class DeckSquareMyDeckFragment extends Fragment {
 
         VUiKit.defer().when(() -> {
             LoginResponse result = DeckSquareApiUtil.login(username, password);//执行登录
-            Log.w("seesee result", result.user.username+"//"+result.user.id+"//"+result.token);
             SharedPreferenceUtil.setServerToken(result.token);
             SharedPreferenceUtil.setServerUserId(result.user.id);
             return result;

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

@@ -14,6 +14,8 @@ import android.util.Log;
 import android.webkit.JavascriptInterface;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.tencent.smtt.sdk.WebView;
 
 import org.json.JSONArray;
@@ -339,9 +341,20 @@ public class MyCard {
             if (TextUtils.isEmpty(exception)) {
                 mcUser = new Gson().fromJson(userInfo, McUser.class);
                 UserManagement.getDx().setMcUser(mcUser);
-                Log.i("seesee", userInfo.substring(userInfo.lastIndexOf(":")+2,userInfo.lastIndexOf("\"")));
-                SharedPreferenceUtil.setServerToken(userInfo.substring(userInfo.lastIndexOf(":")+2,userInfo.lastIndexOf("\"")));
-                SharedPreferenceUtil.setServerUserId(mcUser.getExternal_id());
+                try {
+                    // 使用Gson解析整个JSON对象
+                    JsonObject jsonObject = new Gson().fromJson(userInfo, JsonObject.class);
+                    // 安全地获取token字段
+                    if (jsonObject.has("token")) {
+                        String token = jsonObject.get("token").getAsString();
+                        SharedPreferenceUtil.setServerToken(token);
+                    } else {
+                    }
+                    // 存储用户ID
+                    SharedPreferenceUtil.setServerUserId(mcUser.getExternal_id());
+                } catch (Exception e) {
+                    Log.e("Mycard loginUser", "解析JSON失败: " + e.getMessage());
+                }
             }
             if (mListener!=null)
                 mListener.onLogin(mcUser,exception);

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

@@ -148,20 +148,22 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:orientation="horizontal"
-            android:padding="16dp">
+            android:background="@drawable/ic_radius_bg"
+            android:padding="10dp">
 
             <cn.garymb.ygomobile.ui.mycard.mcchat.view.YuanImage
                 android:id="@+id/my_deck_avatar"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
+                android:layout_marginStart="5dp"
                 android:src="@drawable/avatar"/>
 
             <Button
                 android:id="@+id/mc_logout_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginEnd="4dp"
-                android:background="@drawable/button_radius_black_transparents"
+                android:layout_marginEnd="5dp"
+                android:background="@color/transparent"
                 android:text="注销" />
 
         </LinearLayout>