修改扫码登录流程

BaseLibrary/src/main/java/com/cooleshow/base/data/net/BaseResponse.java

@@ -1,5 +1,7 @@
 package com.cooleshow.base.data.net;
 
+import android.text.TextUtils;
+
 /**
  * 网络请求返回的数据，按格式统一包装成 BaseResponse 类
  * Created by Administrator on 2018/9/15.
@@ -9,6 +11,7 @@ public class BaseResponse<T> {
 
     private int code = -1;
     private String msg;
+    private String message;
     private T data;
 
     private boolean status;
@@ -23,7 +26,13 @@ public class BaseResponse<T> {
     }
 
     public String getErrorMsg() {
-        return msg;
+        if (!TextUtils.isEmpty(msg)) {
+            return msg;
+        }
+        if (!TextUtils.isEmpty(message)) {
+            return message;
+        }
+        return "";
     }
 
     public void setErrorMsg(String msg) {

student/src/main/AndroidManifest.xml

@@ -38,6 +38,7 @@
         <activity
             android:name=".ui.splash.SplashActivity"
             android:exported="true"
+            android:screenOrientation="portrait"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

usercenter/src/main/java/com/cooleshow/usercenter/constants/QrCodeResultType.java

@@ -1,12 +1,18 @@
 package com.cooleshow.usercenter.constants;
 
+import android.text.SpannableString;
+
+import com.cooleshow.base.utils.UiUtils;
+import com.cooleshow.base.utils.Utils;
+
 /**
  * Author by pq, Date on 2022/12/23.
  */
 public enum QrCodeResultType {
     CODE_EXPIRED("code_expired", "二维码已过期", "请在乐教通刷新二维码后重新扫码"),
     CODE_ERROR("code_error", "无法识别", "当前二维码无法识别"),
-    CODE_AUTH_FAILED("code_auth_failed", "授权失败", "授权失败，请重新扫码授权");
+    CODE_AUTH_FAILED("code_auth_failed", "授权失败", "授权失败，请重新扫码授权"),
+    CODE_ERROR_NO_SUPPORT("code_auth_failed", "授权失败", "您的账号暂不支持登录「乐教通」");
 
     private final String tip;
     private final String title;
@@ -17,7 +23,11 @@ public enum QrCodeResultType {
         return id;
     }
 
-    public String getTip() {
+    public CharSequence getTip() {
+        if (this == QrCodeResultType.CODE_ERROR_NO_SUPPORT) {
+            SpannableString string = UiUtils.diffColorString("您的账号暂不支持登录", "「乐教通」", Utils.getApp().getResources().getColor(com.cooleshow.base.R.color.color_777777), Utils.getApp().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+            return string;
+        }
         return tip;
     }
 

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/scan/AuthLoginResultActivity.java

@@ -47,7 +47,7 @@ public class AuthLoginResultActivity extends BaseActivity<AcAuthLoginResultLayou
         }
         viewBinding.tvTip.setText(resultType.getTitle());
         viewBinding.tvTip2.setText(resultType.getTip());
-        if (resultType == QrCodeResultType.CODE_AUTH_FAILED) {
+        if (resultType == QrCodeResultType.CODE_AUTH_FAILED || resultType == QrCodeResultType.CODE_ERROR_NO_SUPPORT) {
             viewBinding.imLogo.setImageResource(R.drawable.icon_qrcode_auth_failed_tip);
         } else {
             viewBinding.imLogo.setImageResource(R.drawable.icon_qrcode_expired_tip);

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/scan/ConfirmScanLoginActivity.java

@@ -108,6 +108,8 @@ public class ConfirmScanLoginActivity extends BaseMVPActivity<AcConfirmScanLogin
             QrCodeResultType resultType;
             if (errcode == 5440) {
                 resultType = QrCodeResultType.CODE_EXPIRED;
+            }else if(errcode == 5445){
+                resultType = QrCodeResultType.CODE_ERROR_NO_SUPPORT;
             } else {
                 resultType = QrCodeResultType.CODE_AUTH_FAILED;
             }

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/scan/ScanActivity.java

@@ -315,6 +315,13 @@ public class ScanActivity extends BaseMVPActivity<ActivityScanLayoutBinding, Sca
                 finish();
                 return;
             }
+            if (errcode == 5445) {
+                ARouter.getInstance().build(RouterPath.UserCenter.SCAN_QR_AUTH_RESULT_CODE)
+                        .withString(Constants.COMMON_EXTRA_KEY, "授权登录")
+                        .withSerializable(Constants.COMMON_EXTRA_KEY, QrCodeResultType.CODE_ERROR_NO_SUPPORT).navigation();
+                finish();
+                return;
+            }
         }
         super.onError(e);
     }