review_2.0 feat done

app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java

@@ -296,7 +296,11 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
 
     @Override
     public void shareAction(H5JsBean.H5JsCmd.Params params) {
-
+        if (mContext != null) {
+            if (mContext instanceof NewH5Activity) {
+                ((NewH5Activity) mContext).showShareMenu(params);
+            }
+        }
     }
 
     @Override

config.gradle

@@ -8,9 +8,9 @@ ext {
             "m-confide"       : "0.0.50.41",
             "m-consultant"    : "0.0.60.68",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.55",
+            "m-user"          : "0.0.62.58",
             "m-home"          : "0.0.23.95",
-            "m-im"            : "0.0.21.61",
+            "m-im"            : "0.0.21.64",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
             "m-muse"          : "0.0.28.81",
@@ -26,7 +26,7 @@ ext {
             "ydl-platform"    : "0.0.41.44",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.94",
+            "ydl-webview"     : "0.0.38.96",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",
@@ -94,9 +94,9 @@ ext {
             "m-confide"       : "0.0.50.41",
             "m-consultant"    : "0.0.60.68",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.55",
+            "m-user"          : "0.0.62.58",
             "m-home"          : "0.0.23.95",
-            "m-im"            : "0.0.21.61",
+            "m-im"            : "0.0.21.64",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
 
@@ -113,7 +113,7 @@ ext {
             "ydl-platform"    : "0.0.41.44",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.94",
+            "ydl-webview"     : "0.0.38.96",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",

m-user/src/main/java/com/yidianling/user/bean/EvaluateOrderBean.kt

+package com.yidianling.user.bean
+
+data class EvaluateOrderBean(
+    val consultOrder: Boolean? = null,
+    val listenOrder: Boolean? = null
+)

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

@@ -124,6 +124,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
             .into(iv_mine_logo)
 
         refreshCouponData()
+
+
     }
 
     override fun initDataAndEventLazy() {}
@@ -199,12 +201,44 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
         refreshCouponData()
     }
 
+
+    private fun getConfideOrder(uid: String) {
+        MineHttpImpl.getInstance().getHasConfideOrder(uid)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { response ->
+                if ("200" == response.code) {
+                    if (response.data != null) {
+                        if (response.data.listenOrder == true) {
+                            iv_confide_tip.visibility = View.VISIBLE
+                        } else {
+                            iv_confide_tip.visibility = View.GONE
+                        }
+
+                        if (response.data.consultOrder == true) {
+                            iv_order_tip.visibility = View.VISIBLE
+                        } else {
+                            iv_order_tip.visibility = View.GONE
+                        }
+
+                    }
+                }
+
+            }
+    }
+
+
     /**
      * 更新优惠券信息
      */
     @SuppressLint("CheckResult")
     private fun refreshCouponData() {
         val userInfo = getUserInfo() ?: return
+
+        if (userInfo.uid != null) {
+            getConfideOrder(userInfo.uid!!)
+        }
+
         //获取用户信息
         MineHttpImpl.getInstance().getNewCoupon(BaseCommand())
             .compose(netCheck())
@@ -265,7 +299,6 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
         } else {
             jtv_about_us?.setLeftRedDotVisibility(View.GONE)
         }
-
         //切换环境按钮逻辑
         debugChangeEnvironment()
     }

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

@@ -6,6 +6,7 @@ import com.ydl.ydlcommon.bean.MustUP
 import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.yidianling.user.api.bean.UserResponseBean
+import com.yidianling.user.bean.EvaluateOrderBean
 import com.yidianling.user.bean.FundData
 import com.yidianling.user.bean.Recharge
 import com.yidianling.user.mine.bean.AccountBean
@@ -95,4 +96,12 @@ interface MineApi {
     @POST("sms/list")
     fun getSysMsgList(@FieldMap params: Map<String, String>): Observable<BaseResponse<String>>
 
+
+    /**
+     * 倾诉订单是否有待评价
+     */
+    @POST("consult/user/order/isEvaluateOrder")
+    @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
+    fun hasConfideOrder(@Body body: RequestBody):Observable<BaseAPIResponse<EvaluateOrderBean>>
+
 }
\ No newline at end of file

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

@@ -8,6 +8,7 @@ import com.yidianling.im.message.param.MsgListParam
 import com.yidianling.user.bean.FundData
 import com.yidianling.user.bean.Recharge
 import com.yidianling.user.api.bean.UserResponseBean
+import com.yidianling.user.bean.EvaluateOrderBean
 import com.yidianling.user.mine.*
 import com.yidianling.user.mine.bean.AccountBean
 import com.yidianling.user.mine.bean.BalanceBean
@@ -47,4 +48,6 @@ interface MineHttp  {
 
     fun getSysMsgList(param: MsgListParam): Observable<BaseResponse<String>>
 
+    fun getHasConfideOrder(uid: String): Observable<BaseAPIResponse<EvaluateOrderBean>>
+
 }
\ No newline at end of file

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

@@ -6,10 +6,14 @@ import com.ydl.ydlcommon.data.http.*
 import com.ydl.ydlcommon.utils.NetworkParamsUtils
 import com.ydl.ydlnet.YDLHttpUtils
 import com.yidianling.im.message.param.MsgListParam
+import com.yidianling.user.api.bean.UserResponseBean
+import com.yidianling.user.bean.EvaluateOrderBean
 import com.yidianling.user.bean.FundData
 import com.yidianling.user.bean.Recharge
-import com.yidianling.user.api.bean.UserResponseBean
-import com.yidianling.user.mine.*
+import com.yidianling.user.mine.APPWillUpParam
+import com.yidianling.user.mine.FeedBackParam
+import com.yidianling.user.mine.FundListParam
+import com.yidianling.user.mine.RechargeParam
 import com.yidianling.user.mine.bean.AccountBean
 import com.yidianling.user.mine.bean.BalanceBean
 import com.yidianling.user.mine.bean.FeedBackDetailBean
@@ -18,6 +22,7 @@ import io.reactivex.Observable
 import okhttp3.MediaType
 import okhttp3.RequestBody
 import java.io.File
+import java.util.*
 
 class MineHttpImpl private constructor() : MineHttp {
 
@@ -127,6 +132,14 @@ class MineHttpImpl private constructor() : MineHttp {
             .flatMap { getAppApi().getSysMsgList(it) }
     }
 
+    override fun getHasConfideOrder(uid: String): Observable<BaseAPIResponse<EvaluateOrderBean>> {
+        var param = WeakHashMap<String, String>().toMutableMap()
+        param["uid"] = uid
+        val body =
+            RequestBody.create(MediaType.parse("application/json; charset=utf-8"), param.toString())
+        return getAppApi().hasConfideOrder(body)
+    }
+
     object Holder {
         val INSTANCE = MineHttpImpl()
     }