Merge remote-tracking branch 'origin/release' into feat/diamond_category_zl

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.12-SNAPSHOT"
+        componentVersion = "0.3.0.16"
     }
     repositories {
         mavenCentral()

m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt

@@ -54,7 +54,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
-import java.util.*
 import kotlin.math.roundToInt
 
 class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
@@ -97,6 +96,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
     var shouldShow: Boolean? = false
     var uid: String? = null
     var listen_free: Boolean = false
+    private var hasOnResume = false
     fun showBottomSheetDialog(
         activity: FragmentActivity,
         jumpUrl: String,
@@ -367,6 +367,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
     }
 
     fun onEventMainThread(event: ConfideDialogEvent) {
+        if(!hasOnResume) return
 //        第一位表示拨打按钮，第二位代表再换一位按钮
         val show = event.show
 //        if (show == 0) {
@@ -568,8 +569,14 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
         return false
     }
 
+    override fun onPause() {
+        super.onPause()
+        hasOnResume = false
+    }
+
     override fun onResume() {
         super.onResume()
+        hasOnResume = true
         if (doctorId.isNotBlank() && layoutCall.visibility == View.VISIBLE) {
             onLoadDialStatus(doctorId)
         }

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultWebview.kt

@@ -14,6 +14,7 @@ import com.ydl.webview.ProgressWebView
 import com.ydl.webview.TellData
 import com.ydl.webview.WebModularServiceUtils
 import com.ydl.ydlcommon.base.config.HttpConfig
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.R
@@ -54,6 +55,7 @@ class ExpertConsultWebview : RelativeLayout {
         val jtoJHandle = WebModularServiceUtils.getWebService()
             .getJavascripHandler(mContext as Activity, wv_content, tellData = TellData())
         val url = WebUrlParamsUtils.getSuffix(jumpUrl, jtoJHandle.getUriAppendSuffix())
+        LogUtil.e(url)
         wv_content.loadUrl(url)
     }
 

m-im/src/main/res/layout/im_expert_consult_service_item_view.xml

@@ -117,6 +117,7 @@
                 <RelativeLayout
                     android:layout_width="74dp"
                     android:layout_height="@dimen/platform_dp_32">
+
                     <TextView
                         android:id="@+id/im_expert_service_list_btn"
                         android:layout_width="74dp"
@@ -172,32 +173,32 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="bottom"
 
+                        android:layout_marginBottom="1dp"
                         android:text="￥"
-                        android:textFontWeight="800"
                         android:textColor="#EB892C"
-                        android:textSize="12sp"
-                        android:layout_marginBottom="1dp"/>
+                        android:textFontWeight="800"
+                        android:textSize="12sp" />
 
                     <TextView
                         android:id="@+id/service_item_price"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="bottom"
-                        android:textStyle="normal"
-                        android:textFontWeight="1500"
                         android:text="0"
                         android:textColor="#EB892C"
-                        android:textSize="@dimen/im_text_size_18" />
+                        android:textFontWeight="1500"
+                        android:textSize="@dimen/im_text_size_18"
+                        android:textStyle="normal" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
                         android:layout_marginLeft="@dimen/platform_dp_3"
+                        android:layout_marginBottom="@dimen/platform_dp_1"
                         android:gravity="bottom"
-                        android:layout_gravity="bottom"
                         android:text="起"
                         android:textColor="#9D9EA7"
-                        android:layout_marginBottom="@dimen/platform_dp_1"
                         android:textSize="12sp" />
 
 
@@ -205,12 +206,12 @@
                         android:id="@+id/service_item_low_buy_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#9D9EA7"
-                        android:textSize="@dimen/sp_12"
-                        android:visibility="gone"
                         android:layout_gravity="bottom"
                         android:layout_marginBottom="@dimen/platform_dp_1"
-                        android:text="(8次起售)" />
+                        android:text="(8次起售)"
+                        android:textColor="#9D9EA7"
+                        android:textSize="@dimen/sp_12"
+                        android:visibility="gone" />
                 </LinearLayout>
 
             </LinearLayout>

m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt

@@ -43,6 +43,7 @@ import com.yidianling.user.api.event.RefreshRecentContactListEvent
 import com.yidianling.user.api.service.IAppService
 import com.yidianling.user.constants.UserBIConstants.UserMyPageEvent
 import com.yidianling.user.mine.bean.CouponNumBean
+import com.yidianling.user.mine.bean.UpdateTabMeNumBean
 import com.yidianling.user.mine.data.AppDataManager.getHttp
 import com.yidianling.user.mine.data.AppDataManager.getLocal
 import com.yidianling.user.mine.http.MineHttpImpl
@@ -146,6 +147,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
     override fun onResume() {
         super.onResume()
         updateUI()
+        refreshCouponData()
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
@@ -218,23 +220,28 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                                 "$orderNum"
                             }
                             iv_order_tip.text = numberStr
-                            getLocal().setConsult(orderNum)
+                            getLocal().setConsult(true)
+                            getLocal().setConsultNum(orderNum)
                         } else {
                             iv_order_tip.visibility = View.GONE
-                            getLocal().setConsult(0)
+                            getLocal().setConsult(false)
+                            getLocal().setConsultNum(0)
                         }
-                    }else{
+                    }else {
                         getLocal().setConfide(false)
-                        getLocal().setConsult(0)
+                        getLocal().setConsult(false)
+                        getLocal().setConsultNum(0)
                     }
-                }else{
+                }else {
                     getLocal().setConfide(false)
-                    getLocal().setConsult(0)
+                    getLocal().setConsult(false)
+                    getLocal().setConsultNum(0)
                 }
-
+                EventBus.getDefault().post(UpdateTabMeNumBean())
             },{
                 getLocal().setConfide(false)
-                getLocal().setConsult(0)
+                getLocal().setConsult(false)
+                getLocal().setConsultNum(0)
             })
     }
 
@@ -246,7 +253,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
     private fun refreshCouponData() {
         getLocal().setCoupon(false)
         getLocal().setConfide(false)
-        getLocal().setConsult(0)
+        getLocal().setConsult(false)
+        getLocal().setConsultNum(0)
 
         val userInfo = getUserInfo()
 

m-user/src/main/java/com/yidianling/user/mine/bean/UpdateTabMeNumBean.java

+package com.yidianling.user.mine.bean;
+
+/**
+ * @author jiucheng
+ * @描述:
+ * @Copyright Copyright (c) 2018
+ * @Company 壹点灵
+ * @date 2019/5/7
+ */
+public class UpdateTabMeNumBean {
+
+}

m-user/src/main/java/com/yidianling/user/mine/data/AppLocal.kt

@@ -18,15 +18,19 @@ interface AppLocal {
 
     fun putUpdate(update: Boolean)
 
-    fun getCoupon():Boolean
+    fun getCoupon(): Boolean
 
-    fun setCoupon(have:Boolean)
+    fun setCoupon(have: Boolean)
 
-    fun getConsult(): Int
+    fun getConsult(): Boolean
 
-    fun setConsult(have: Int)
+    fun setConsult(have: Boolean)
 
-    fun getConfide():Boolean
+    fun getConsultNum(): Int
+
+    fun setConsultNum(num: Int)
+
+    fun getConfide(): Boolean
 
     fun setConfide(have: Boolean)
 

m-user/src/main/java/com/yidianling/user/mine/data/AppLocalImpl.kt

@@ -22,6 +22,7 @@ internal class AppLocalImpl private constructor(): AppLocal {
 
         private const val CONFIDE = "confide"
         private const val CONSULT = "consult"
+        private const val CONSULT_NUM = "consult_num"
         private const val COUPON = "coupon"
     }
 
@@ -50,12 +51,20 @@ internal class AppLocalImpl private constructor(): AppLocal {
         getAppSP().edit().putBoolean(COUPON, have).apply()
     }
 
-    override fun getConsult(): Int {
-        return getAppSP().getInt(CONSULT, 0)
+    override fun getConsult(): Boolean {
+        return getAppSP().getBoolean(CONSULT, false)
     }
 
-    override fun setConsult(have: Int) {
-        getAppSP().edit().putInt(CONSULT, have).apply()
+    override fun setConsult(have: Boolean) {
+        getAppSP().edit().putBoolean(CONSULT, have).apply()
+    }
+
+    override fun getConsultNum(): Int {
+        return getAppSP().getInt(CONSULT_NUM, 0)
+    }
+
+    override fun setConsultNum(num: Int) {
+        getAppSP().edit().putInt(CONSULT_NUM, num).apply()
     }
 
     override fun getConfide(): Boolean {