更新功能修改

app/src/main/AndroidManifest.xml

@@ -53,7 +53,7 @@
     </queries>
     <application
         android:allowBackup="false"
-        android:icon="@mipmap/ic_icon"
+        android:icon="@mipmap/ic_icon2"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:taskAffinity="com.xjjk.healthexpertclient"
@@ -65,7 +65,7 @@
         android:theme="@style/Theme.HearthyClients">
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="7beba04fc2b34330900b0438639aca58" />
+            android:value="aef00006ca2ce5ef5230e1ba30ae2d05" />
         <!--高德定位服务-->
         <service android:name="com.amap.api.location.APSService"></service>
         <activity

app/src/main/java/com/xjjk/healthexpertclient/data/api/MineApi.kt

@@ -118,7 +118,7 @@ interface MineApi {
     @GET("/health-consultation/api/consult/conSicks/selectSickListByDepartmentIdDoctorSearch")
     suspend fun getDoctorGoodAtDisease(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<DiseaseBean>>
     /**
-     * 咨询小助手
+     * 咨询全科医生
      */
     @GET("health-consultation/api/consult/conSession/insertProfessorAndHelperSession")
     suspend fun submitAssistantConsultApply(): ApiResponse<IMAssistantBean>

app/src/main/java/com/xjjk/healthexpertclient/data/api/WorkbenchApi.kt

@@ -122,7 +122,7 @@ interface WorkbenchApi {
     @GET("/health-consultation/api/consult/conSession/selectSessionProfessorIngNew")
     suspend fun getWorkBenchConsultNum(): ApiResponse<WorkBenchConsultNumBean>
     /**
-     * 获取当前咨询中的小助手信息
+     * 获取当前咨询中的全科医生信息
      */
     @GET("/health-consultation/api/consult/conSession/insertProfessorAndHelperSessionShow")
     suspend fun getConsultAssistantInfo(): ApiResponse<String>

app/src/main/java/com/xjjk/healthexpertclient/ui/im/utils/IMInputActionSettingUtils.kt

@@ -16,7 +16,7 @@ object IMInputActionSettingUtils {
         inputActionSetting.isDisableSendMessage = disableSendMessage
     }
     /**
-     * 小助手IM功能配置
+     * 全科医生IM功能配置
      */
     fun createAssistantSetting(){
         var inputActionSetting = InputActionSetting.createInstance()

app/src/main/java/com/xjjk/healthexpertclient/ui/mine/SettingActivity.kt

@@ -4,6 +4,9 @@ import android.app.ProgressDialog
 import android.os.Bundle
 import android.view.View
 import android.view.Window
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.btpj.lib_base.data.local.DataStoreManager
 import com.btpj.lib_base.data.local.IpManager
 import com.btpj.lib_base.ext.jsonToBean
@@ -16,6 +19,8 @@ import com.xjjk.healthexpertclient.databinding.ActivitySettingBinding
 import com.xjjk.healthexpertclient.ext.startWebActivity
 import com.xjjk.healthexpertclient.ui.mine.viewmodel.SettingViewModel
 import com.xjjk.healthexpertclient.view.LoadingProgressDialog
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
 import org.lzh.framework.updatepluginlib.UpdateBuilder
 import org.lzh.framework.updatepluginlib.base.UpdateParser
 import org.lzh.framework.updatepluginlib.model.Update
@@ -27,6 +32,8 @@ import org.lzh.framework.updatepluginlib.model.Update
  */
 class SettingActivity: BaseActivity<SettingViewModel, ActivitySettingBinding>(R.layout.activity_setting) {
     var dialog: LoadingProgressDialog? = null
+    var hasNewVersion=false
+
     override fun initView(savedInstanceState: Bundle?) {
 
     }
@@ -37,7 +44,8 @@ class SettingActivity: BaseActivity<SettingViewModel, ActivitySettingBinding>(R.
         var str=AppUtil.getAppVersionName(this)+"(${AppUtil.getAppVersionCode(this)})"
         mBinding.tvVersion.text = getString(R.string.app_version, str)
 //        mBinding.tvAbout.text = getString(R.string.setting_about, getString(R.string.app_name))
-        initUpdateApp(false)
+//        initUpdateApp(false)
+        mViewModel.getAppUpdateInfo()
     }
 
     override fun bindEvent() {
@@ -65,10 +73,32 @@ class SettingActivity: BaseActivity<SettingViewModel, ActivitySettingBinding>(R.
 
             }
             R.id.rl_version_update -> {
-                initUpdateApp(true)
+                if (hasNewVersion) {
+                    UpdateBuilder.create().check()
+                } else {
+                    showToast("已是最新版本")
                 }
             }
         }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.appUpdateInfoData.collectLatest { bean ->
+                    bean?:return@collectLatest
+                    if (bean.versionNo> BuildConfig.VERSION_CODE){
+                        hasNewVersion=true
+                        mBinding?.tvVersionUpdate?.text="有新版本待更新"
+                    }else{
+                        mBinding?.tvVersionUpdate?.text="已是最新版本"
+                    }
+                }
+            }
+        }
+    }
+
 
     private fun initUpdateApp(isClick:Boolean){
         dialog?.show()

app/src/main/java/com/xjjk/healthexpertclient/ui/mine/viewmodel/SettingViewModel.kt

@@ -1,14 +1,32 @@
 package com.xjjk.healthexpertclient.ui.mine.viewmodel
 
 import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.xjjk.healthexpertclient.bean.AppUpdateBean
+import com.xjjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableSharedFlow
 
 /**
  * @author nanfeifei
  * @time 2023/5/23 16:05
  * @description
  */
-class SettingViewModel: BaseViewModel() {
+class SettingViewModel : BaseViewModel() {
+
+    var appUpdateInfoData = MutableSharedFlow<AppUpdateBean?>()
+
     override fun init() {
 
     }
+
+
+    fun getAppUpdateInfo() {
+        launch({
+            handleRequest(WorkbenchRepository.getAppUpdateInfo(""), successBlock = {
+                appUpdateInfoData.emit(it.result)
+            })
+        })
+
+    }
 }

app/src/main/res-mine/values/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingTranslation">
     <!--专家主页-->
-    <string name="mine_assistant" >小助手</string>
+    <string name="mine_assistant" >全科医生</string>
     <string name="mine_statistics">咨询统计</string>
     <string name="mine_scheduling">排班设置</string>
     <string name="mine_suspension_service">暂停服务</string>

app/src/main/res-workbench/values/strings.xml

@@ -12,8 +12,8 @@
     <string name="doctor_homepage_audio_video_consult_wait_affirm" >待确认</string>
     <string name="doctor_homepage_audio_video_consult_in_progress" >进行中</string>
     <string name="doctor_homepage_audio_video_consult_finish" >已完成</string>
-    <string name="doctor_homepage_assistant_consult">小助手</string>
+    <string name="doctor_homepage_assistant_consult">全科医生</string>
-    <string name="doctor_homepage_assistant_consult_explain">联系小助手获取相关帮助和支持</string>
+    <string name="doctor_homepage_assistant_consult_explain">联系全科医生获取相关帮助和支持</string>
     <string name="doctor_homepage_message">消息</string>
     <!--咨询记录-->
     <string name="consult_record_group_wait_reply">待回复</string>

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

@@ -27,7 +27,7 @@
     <string name="title_login">登录</string>
     <string name="title_good_at_disease">擅长病种</string>
     <string name="title_check_up_detail">体检详情</string>
-    <string name="title_assistant_consult">小助手</string>
+    <string name="title_assistant_consult">全科医生</string>
     <string name="title_view_location">位置</string>
     <string name="title_message_list">消息</string>
     <string name="title_select_location">选择位置</string>

config.gradle

@@ -2,8 +2,8 @@ ext {
     minSdkVersion = 21
     targetSdkVersion = 32
     compileSdkVersion = 32
-    versionCode = 102
+    versionCode = 10006
-    versionName = "1.0.2"
+    versionName = "1.00.06"
     //Dependencies
     junitVersion = "4.12"
     lifecycleVersion = "2.6.0-alpha01"

lib_base/src/main/java/com/btpj/lib_base/data/local/IpManager.kt

@@ -21,14 +21,11 @@ object IpManager {
     /** 常用的IP */
     private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://cqyt.dev.yg.dt.io/"     // 开发环境
     private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xjgateway.mcrm.vip:8888/"     // 测试环境
-//    private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://quarry-api.yg.icdat.cn/"     // 测试环境
-//    private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://xjapi.icdat.cn/"     // 线上环境
 //    private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api.xjygjk.com/"     // 线上环境
     private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api-jkglpt.iosp.ydpt.tech/"     // 线上环境
 
     private const val DEBUG_H5_ADDRESS_REMOTE = "http://cms.dev.yg.dt.io"     // 开发环境
     private const val TEST_H5_ADDRESS_REMOTE = "https://xjconsole.mcrm.vip:8888"     // 测试环境
-//    private const val PRODUCT_H5_ADDRESS_REMOTE = "https://xjconsole.icdat.cn"     // 线上环境
 //    private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console.xjygjk.com"     // 线上环境
     private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console-jkglpt.iosp.ydpt.tech"     // 线上环境