代运营判断逻辑修改

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -232,7 +232,8 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         MobclickAgent.onResume(this)
 
 //        ModularServiceManager.provide(IConsultantService::class.java)
-//            .showConsultAssistantDialog(this)
+//            .
+//            (this)
     }
 
     override fun onPause() {

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
 
     ydl_app = [
             appName      : "心理咨询壹点灵",

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -366,8 +366,8 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                     }
                 }, throwable -> {
                 });
-        if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 3) {
-            ServiceImpl.Companion.getInstance().getSourceDoctor(ModularServiceManager.INSTANCE.provide(IUserService.class).getUserInfo().getUid(), ActionHandlerStorage.getL(sessionId).getInfo().toUid)
+        if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getUserType() == 1 && ModularServiceManager.INSTANCE.provide(IUserService.class).getUserInfo().getUser_type() == 3) {
+            ServiceImpl.Companion.getInstance().getSourceDoctor(ActionHandlerStorage.getL(sessionId).getInfo().toUid, ModularServiceManager.INSTANCE.provide(IUserService.class).getUserInfo().getUid())
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(res -> {

m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt

@@ -73,6 +73,6 @@ interface ServiceApi {
     @GET("chat/get-source-doctor")
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
     //注意：这个接口返回的还有很多字段，但是暂时不需要，就先取这两个字段
-    fun getSourceDoctor(@Query("scene") scene: Int,@Query("uid") uid: String,@Query("assistantUid") assistantUid: String): Observable<BaseAPIResponse<SourceDoctorInfoBean>>
+    fun getSourceDoctor(@Query("scene") scene: Int,@Query("userUid") userUid: String,@Query("assistantUid") assistantUid: String): Observable<BaseAPIResponse<SourceDoctorInfoBean>>
 
 }
\ No newline at end of file

m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceImpl.kt

@@ -99,8 +99,8 @@ class ServiceImpl private constructor() {
     /**
      * 获取代运营关联的专家的信息
      */
-    fun getSourceDoctor(uid: String, assistantUid: String): Observable<BaseAPIResponse<SourceDoctorInfoBean>> {
-        return YDLHttpUtils.obtainApi(ServiceApi::class.java).getSourceDoctor(1, uid, assistantUid)
+    fun getSourceDoctor(userUid: String, assistantUid: String): Observable<BaseAPIResponse<SourceDoctorInfoBean>> {
+        return YDLHttpUtils.obtainApi(ServiceApi::class.java).getSourceDoctor(1, userUid, assistantUid)
     }
 
 }
\ No newline at end of file

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/ApkUpdateDialog.kt

 package com.ydl.ydlcommon.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.os.Bundle
@@ -36,22 +37,24 @@ class ApkUpdateDialog : Dialog{
         this.activity = activity
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.platform_dialog_update_layout)
 
         tv_update_content.text = updateData?.title
-        tv_update_content.setMovementMethod(ScrollingMovementMethod.getInstance());
+        tv_update_content.movementMethod = ScrollingMovementMethod.getInstance();
 
         text_version.text = "v${updateData?.ver}"
         text_desc.text = updateData?.content
-        text_desc.setMovementMethod(ScrollingMovementMethod.getInstance());
+        text_desc.movementMethod = ScrollingMovementMethod.getInstance();
 
         v_downpress.setSize(28,14,6,9,4)
         v_downpress.setTextSize(10)
 //        v_downpress.setProgress(0)
 
         listener = object : ApkInstallTool.UpdateProgressListener {
+            @SuppressLint("CheckResult")
             override fun startLoad() {
                 Observable.just(1)
                         .observeOn(AndroidSchedulers.mainThread())
@@ -66,6 +69,7 @@ class ApkUpdateDialog : Dialog{
                         },{})
             }
 
+            @SuppressLint("CheckResult")
             override fun progress(progress: Int) {
                 Observable.just(1)
                         .observeOn(AndroidSchedulers.mainThread())