Merge remote-tracking branch 'origin/最新Dev' into MDT群聊搭建

config.gradle

@@ -6,10 +6,10 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.49.53",
-            "m-consultant"    : "0.0.60.10",
+            "m-consultant"    : "0.0.60.11",
             "m-fm"            : "0.0.30.04",
-            "m-user"          : "0.0.61.96",
-            "m-home"          : "0.0.22.87",
+            "m-user"          : "0.0.62.00",
+            "m-home"          : "0.0.22.93",
             "m-im"            : "0.0.21.18",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.10",
@@ -90,10 +90,10 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.49.52",
-            "m-consultant"    : "0.0.60.10",
+            "m-consultant"    : "0.0.60.11",
             "m-fm"            : "0.0.30.07",
-            "m-user"          : "0.0.61.96",
-            "m-home"          : "0.0.22.87",
+            "m-user"          : "0.0.62.00",
+            "m-home"          : "0.0.22.93",
             "m-im"            : "0.0.21.18",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.8",

m-consultant/src/main/res/layout/consultant_expert_consult_assistant_popup_window.xml

@@ -39,7 +39,7 @@
                 android:layout_width="0.5dp"
                 android:layout_height="26dp"
                 android:layout_marginRight="8dp"
-                android:background="#80ffffff" />
+                android:background="#59ffffff" />
 
             <LinearLayout
                 android:id="@+id/ll_desc_assistant"
@@ -64,7 +64,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="为你精准匹配咨询师  "
+                        android:text="为你精准匹配咨询师"
                         android:textColor="#ffffff"
                         android:textStyle="bold"
                         android:textSize="12dp" />
@@ -72,6 +72,7 @@
                     <ImageView
                         android:layout_width="10dp"
                         android:layout_height="10dp"
+                        android:layout_marginStart="3dp"
                         android:src="@drawable/consultant_assistant_dialog_go_icon" />
                 </LinearLayout>
             </LinearLayout>

m-consultant/src/xlzx/res/drawable/consultant_assistant_dialog_text_bg.xml

@@ -2,11 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:topLeftRadius="8dp"
-        android:bottomLeftRadius="8dp"/>
+    <corners android:topLeftRadius="22dp"
+        android:bottomLeftRadius="22dp"/>
 
     <gradient
         android:angle="0"
-        android:startColor="#CC1DA1F2"
-        android:endColor="#CC1DA1F2"/>
+        android:startColor="#DDFF7A5C"
+        android:endColor="#DDFF406C"/>
 </shape>
\ No newline at end of file

m-user/src/main/java/com/yidianling/user/LoginUtils.kt

@@ -102,6 +102,7 @@ object LoginUtils {
 
     @JvmStatic
     fun logoutClearLocal() {
+        logingCallBackListener=null
        AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "退出登录")
         UserIn.imLogout()
         UserIn.closePlayer()
@@ -111,7 +112,9 @@ object LoginUtils {
 
     @JvmStatic
     fun loginSuccessOperate(activity: Activity) {
+        if (logingCallBackListener!=null){
             logingCallBackListener?.loginSuccess()
+        }
         // 登录成功后，如果一键登录界面没有关闭，则关闭掉
         OneKeyLoginHelp.quitLoginPage()
         val size = ActivityManager.getActivitySize()

m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt

@@ -437,7 +437,7 @@ object OneKeyLoginHelp {
                             .subscribe({
                                 if (it.code == 200) {
                                     AliYunRichLogsHelper.getInstance()
-                                        .sendRichLog(AliYunLogConfig.LOGIN, "一键登录成功")
+                                        .sendRichLog(AliYunLogConfig.LOGIN, "一键登录成功uid:"+it.data.uid+"firstLogin:"+it.data.firstLogin)
                                     ToastUtil.toastShort("登录成功")
                                     saveUserData(it.data)
                                     if (it.data.firstLogin == 1) {//第一次登录：是注册
@@ -599,8 +599,8 @@ object OneKeyLoginHelp {
      *                     @return true:登录。false:未登录
      * */
     fun startLoginByStatusLoginCallBack(context: Context, isOpenDialog: Boolean,listener: LoginCallBackListener) {
-        LoginUtils.setLoginCallBack(listener)
         if (!UserHelper.isLogin()) {
+            LoginUtils.setLoginCallBack(listener)
             if (this::mActivity.isInitialized) {
                 //如果mActivity有初始化，代表项目使用了一键登录
                 startLogin(context as Activity, isOpenDialog)