[提交人]：王雪伟

[提交简述] ：小象省钱
[实现方案] ：添加跳转拦截

cms/src/main/java/com/zxhl/cms/common/WebActivity.kt

@@ -14,6 +14,7 @@ import com.zxhl.cms.R
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.utils.FileUtils
 import kotlinx.android.synthetic.main.activity_h5.*
+import kotlinx.android.synthetic.main.activity_member.*
 import kotlinx.android.synthetic.main.activity_web.*
 import kotlinx.android.synthetic.main.activity_web.id_activity_web_title
 import kotlinx.android.synthetic.main.activity_web.id_activity_web_toolbar
@@ -49,9 +50,9 @@ class WebActivity : BaseActivity() {
             settings?.mediaPlaybackRequiresUserGesture = true//设置视频不自动播放
         }
         chromeClient = PaxWebChromeClient(this) {
-            if(it==100){
+            if (it == 100) {
                 id_web_view_progress_view.visibility = View.GONE
-            }else{
+            } else {
                 id_web_view_progress_view.visibility = View.VISIBLE
                 id_web_view_progress_view.progress = it
             }
@@ -118,14 +119,19 @@ class WebActivity : BaseActivity() {
 
         id_activity_web_view?.webChromeClient = chromeClient
 
-
+        id_pay_web_view?.setDownloadListener { url, userAgent, contentDisposition, mimetype, contentLength ->
+            var intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            startActivity(intent);
+        }
         id_activity_web_view?.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(wv: WebView, url: String?): Boolean {
-                Log.e("MXL","AURL"+url)
+                Log.e("MXL", "AURL" + url)
                 if (url == null) return false
                 try {
                     if (url.startsWith("weixin://") //微信
                         || url.startsWith("alipays://") //支付宝
+                        || url.startsWith("mqq://") //QQ
+                        || url.startsWith("youku://") //QQ
                         || url.startsWith("mailto://") //邮件
                         || url.startsWith("tel://") //电话
                         || url.startsWith("dianping://") //大众点评
@@ -140,13 +146,14 @@ class WebActivity : BaseActivity() {
                         startActivity(intent)
                         return true
                     }
-                } catch (e: java.lang.Exception) { //防止crash (如果手机上没有安装处理某个scheme开头的url的APP, 会导致crash)
+
+                } catch (e: Exception) { //防止crash (如果手机上没有安装处理某个scheme开头的url的APP, 会导致crash)
                     return true //没有安装该app时，返回true，表示拦截自定义链接，但不跳转，避免弹出上面的错误页面
                 }
 
                 //处理http和https开头的url
-                wv.loadUrl(url)
-                return true
+//                wv.loadUrl(url)
+                return false
             }
 
             override fun onReceivedSslError(

cms/src/main/java/com/zxhl/cms/net/model/qy/JgqQyEntity.kt

@@ -11,4 +11,5 @@ class JgqQyEntity {
     var icon: String? = ""
     var maxDiscount: String? = ""
     var rechargeType: String? = ""
+    var remark: String? = ""
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxbw/modulemain/adapter/HomeQyBannerAdapter.kt

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.PagerAdapter
 import com.bumptech.glide.Glide
 import com.zxbw.modulemain.R
+import com.zxhl.cms.common.Constant
 import com.zxhl.cms.net.model.qy.JgqQyEntity
 import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.OnRecycleItemClickListener
@@ -48,9 +49,15 @@ class HomeQyBannerAdapter : PagerAdapter {
 
         var mJgqQyAdapter = JgqQyAdapter(mActivity,
             OnRecycleItemClickListener<JgqQyEntity> { view, position, data ->
-                if(TextUtils.equals(data.rechargeType,"51")){
+                if (TextUtils.equals(data.rechargeType, "51")) {
                     JumpUtils.CardVoucherJump(data.brand)
-                }else{
+                } else if (TextUtils.equals(data.rechargeType, "1")) {
+                    if (!Constant.Switch.isOpenVip) {
+                        JumpUtils.MemberOrderJump()
+                    } else {
+                        JumpUtils.webJump(data.brand, data.remark)
+                    }
+                } else {
                     JumpUtils.RightsDetailJump(data.brand, data.icon)
                 }
             })

moduleMain/src/main/res/layout/item_layout_box_goods_view.xml

@@ -72,7 +72,7 @@
             android:gravity="center_vertical"
             android:paddingLeft="2dp"
             android:paddingRight="5dp"
-            android:text="已减10元"
+            android:text="已减0元"
             android:textColor="@color/color_333333"
             android:textSize="12sp" />
 
@@ -118,7 +118,7 @@
             android:id="@+id/id_tv_box_old_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="¥ 299"
+            android:text="¥ 0"
             android:textColor="@color/color_999999"
             android:textSize="10sp" />