Merge branch 'feature/yk_release' into 'release'

feat: 修复tab栏更新数量不及时问题，修复倾诉半屏弹窗问题

See merge request app_android_lib/YDL-Component!290

build.gradle

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

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

@@ -569,8 +569,8 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
         return false
     }
 
-    override fun onStop() {
-        super.onStop()
+    override fun onPause() {
+        super.onPause()
         hasOnResume = false
     }
 

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) {
@@ -235,7 +237,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                     getLocal().setConsult(false)
                     getLocal().setConsultNum(0)
                 }
-
+                EventBus.getDefault().post(UpdateTabMeNumBean())
             },{
                 getLocal().setConfide(false)
                 getLocal().setConsult(false)

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 {
+
+}