From 8c8f93580d4518fd9413d662210ea1381ad05d79 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 17 Mar 2023 21:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nnbc123/app/home/HomeViewModel.kt     | 11 ++++++++---
 .../ui/user/viewmodel/UserInfoViewModel.kt    |  4 ++--
 .../app/quick_pass/QuickPassLoginAct.java     | 12 ++++++++----
 channel.txt                                   | 19 -------------------
 gradle.properties                             |  6 +++---
 5 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/nnbc123/app/home/HomeViewModel.kt b/app/src/main/java/com/nnbc123/app/home/HomeViewModel.kt
index 2fe34958c..5efe53d93 100644
--- a/app/src/main/java/com/nnbc123/app/home/HomeViewModel.kt
+++ b/app/src/main/java/com/nnbc123/app/home/HomeViewModel.kt
@@ -96,9 +96,14 @@ class HomeViewModel : BaseViewModel() {
     }
 
     fun getHomeResource() {
-        safeLaunch {
-            _resourceLiveData.value = HomeModel.getHomeResource()
-        }
+        safeLaunch(
+            block = {
+                _resourceLiveData.value = HomeModel.getHomeResource()
+            },
+            onError = {
+            }
+        )
+
     }
 
     fun getResourceJumpInfo(id: Int) {
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/viewmodel/UserInfoViewModel.kt b/app/src/main/java/com/nnbc123/app/ui/user/viewmodel/UserInfoViewModel.kt
index 60c30f4d0..a88c3ceed 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/viewmodel/UserInfoViewModel.kt
+++ b/app/src/main/java/com/nnbc123/app/ui/user/viewmodel/UserInfoViewModel.kt
@@ -59,7 +59,7 @@ class UserInfoViewModel : ViewModel() {
                 { data -> data?.let { _hallData.value = data } },
                 { th ->
                     th.printStackTrace()
-                    th.message?.toast()
+                    //th.message?.toast()
                 }
             )
         disposable.add(subscribe)
@@ -71,7 +71,7 @@ class UserInfoViewModel : ViewModel() {
             .toFlowable()
             .subscribe({ _userInfoSkillData.value = it }, { th ->
                 th.printStackTrace()
-                th.message?.toast()
+                //th.message?.toast()
             })
         disposable.add(subscribe)
     }
diff --git a/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
index 06fe13a76..453b72345 100644
--- a/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
+++ b/app/src/module_quick_pass/java/com/nnbc123/app/quick_pass/QuickPassLoginAct.java
@@ -167,7 +167,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
                 toast("一键登录失败，请使用其他方式登录");
                 getDialogManager().dismissDialog();
                 //跳转到手机登录页
-                LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+                LoginPasswordActivity.start(QuickPassLoginAct.this);
+                //LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
             }
         });
     }
@@ -213,7 +214,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
             @Override
             public void onGetTokenError(String s, String s1) {
                 toast("一键登录失败，请使用其他登录方式");
-                LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+                LoginPasswordActivity.start(QuickPassLoginAct.this);
+               // LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
                 setClickEnable(true);
             }
 
@@ -262,10 +264,12 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
                     spannableString, "我知道了", true, null);
         } else if (e instanceof IOException) {
             toast("网络异常,请检查您的网络再试~");
-            LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+            LoginPasswordActivity.start(QuickPassLoginAct.this);
+            //LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
         } else {
             toast(e.getMessage());
-            LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
+            LoginPasswordActivity.start(QuickPassLoginAct.this);
+            //LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
         }
     }
 
diff --git a/channel.txt b/channel.txt
index bc7a5ef15..4ca0531d5 100644
--- a/channel.txt
+++ b/channel.txt
@@ -4,22 +4,3 @@ vivo
 oppo
 xiaomi
 huawei
-yinyou0
-yinyou1
-yinyou2
-yinyou3
-yinyou4
-yinyou5
-yinyou6
-yinyou7
-yinyou8
-yinyou9
-yinyou10
-yinyou11
-yinyou12
-gongzhonghao
-kuaishou-xxl-01
-zhaohui
-big_goose_toutiaoxfc01
-big_goose_toutiao
-kuaishou_xinxiliu
diff --git a/gradle.properties b/gradle.properties
index c85a903f7..b3a47c38e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,9 +21,9 @@ MobSDK.spEdition=FP
 
 with_flutter_aar=true
 with_jenkins=false
-only_arm64=false
+only_arm64=true
 
 channel_file=channel.txt
 
-version_name=5.6.0.3
-version_code=560
\ No newline at end of file
+version_name=1.0.0
+version_code=100
\ No newline at end of file