注册证版

baselib/build.gradle

@@ -32,7 +32,7 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            buildConfigField "String", "TENCENT_IM_APPID", "\"1400823270\""
+            buildConfigField "String", "TENCENT_IM_APPID", "\"1600012587\""
             buildConfigField "String", "TENCENT_LICENCEURL", "\"https://license.vod2.myqcloud.com/license/v2/1300835310_1/v_cube.license\""
             buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"

baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseViewModel.kt

@@ -8,6 +8,7 @@ import com.yingyangfly.baselib.bean.StatusViewType
 import com.yingyangfly.baselib.ext.loge
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.net.BaseResp
+import com.yingyangfly.baselib.webview.utils.log
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import org.json.JSONException
@@ -96,6 +97,7 @@ abstract class BaseViewModel : ViewModel() {
         e.printStackTrace()
         var errorMsg = ""
         when (e) {
+
             is UnknownHostException -> errorMsg = "网络异常，请检查您的网络设置"
             is SocketTimeoutException, //okhttp全局设置超时
             is TimeoutCancellationException -> errorMsg = "网络超时,请稍后再试" // 协程超时
@@ -125,6 +127,7 @@ abstract class BaseViewModel : ViewModel() {
             is Exception -> errorMsg = "程序异常" + e.javaClass.name
             else -> errorMsg = e.message ?: "请求失败，请稍后再试"
         }
+        errorMsg.loge()
         return errorMsg
     }
 }

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -169,7 +169,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
             binding.tvUserName.text = User.getName() + "，欢迎使用未来蓝豚。"
             // 获取40H音频 url
             if (TextUtils.isEmpty(hertzAudioUrl)){
-                getHertzAudioUrl()
+//                getHertzAudioUrl()
             }
             //获取app升级信息
             selectNewVersion()
@@ -307,7 +307,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                             binding.btnTask.text = "继续专属任务"
                         } else {
                             binding.btnTask.text = if (it.currentTaskNum == 1) {
-                                "开始专属任务"
+                                "专属任务"
                             } else {
                                 "继续专属任务"
                             }
@@ -320,7 +320,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
                         }
                     } else {
                         binding.btnTask.text = if (it.currentTaskNum == 1) {
-                            "开始专属任务"
+                            "专属任务"
                         } else {
                             "继续专属任务"
                         }

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

@@ -20,7 +20,7 @@
     <string name="professional_evaluation" tools:ignore="ResourceName">量表测评</string>
     <string name="health_counseling" tools:ignore="ResourceName">健康咨询</string>
     <string name="fun_time" tools:ignore="ResourceName">轻松一刻</string>
-    <string name="start_exclusive_training" tools:ignore="ResourceName">开始专属任务</string>
+    <string name="start_exclusive_training" tools:ignore="ResourceName">专属任务</string>
     <string name="next_page" tools:ignore="ResourceName">下一页</string>
     <string name="previous_page" tools:ignore="ResourceName">上一页</string>
     <string name="rehabilitation_classroom" tools:ignore="ResourceName">康复课堂</string>
@@ -86,5 +86,5 @@
     <string name="exclusive_training" tools:ignore="ResourceName">理疗任务</string>
     <string name="training_report_score" tools:ignore="ResourceName">训练报告</string>
     <string name="professional_evaluation_new" tools:ignore="ResourceName">量表测评</string>
-    <string name="start_exclusive_training_2" tools:ignore="ResourceName">开始专属任务</string>
+    <string name="start_exclusive_training_2" tools:ignore="ResourceName">专属任务</string>
 </resources>

login/src/main/res/layout/activity_login.xml

@@ -52,11 +52,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_20px"
-                android:text="@string/app_model"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
+                android:layout_marginStart="@dimen/divider_120px"
+                android:text="@string/app_version"
+                android:textColor="@color/color_FFB8B3B3"
+                android:textSize="@dimen/divider_25px"
                 android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/qiangnao" />
 
@@ -64,13 +64,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_20px"
-                android:text="@string/app_version"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_26px"
+                android:layout_marginEnd="@dimen/divider_80px"
+                android:text="@string/app_model"
+                android:textColor="@color/color_FFB8B3B3"
+                android:textSize="@dimen/divider_25px"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/xinghao" />
+                app:layout_constraintTop_toBottomOf="@+id/qiangnao" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -6,7 +6,7 @@
     <string name="action_sign_in" tools:ignore="ResourceName">登录</string>
     <string name="account_login" tools:ignore="ResourceName">账号登录</string>
     <string name="account_phone" tools:ignore="ResourceName">手机号登录</string>
-    <string name="future_dolphin_awareness_platform" tools:ignore="ResourceName">未来蓝豚强脑系统</string>
+    <string name="future_dolphin_awareness_platform" tools:ignore="ResourceName">未来蓝豚认知平台</string>
     <string name="get_verification_code" tools:ignore="ResourceName">获取验证码</string>
     <string name="app_model" tools:ignore="ResourceName">型号：YR-DTX-EP-01</string>
     <string name="app_version" tools:ignore="ResourceName">版本：V1.0.0</string>