詹子聪 vor 5 Jahren
Ursprung
Commit
03ee4e087d

+ 2 - 0
app/src/main/java/com/miekir/ym/ui/home/coupon/CouponAdapter.java

@@ -48,6 +48,7 @@ public class CouponAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder>
     @Override
     protected void convert(@NonNull BaseViewHolder holder, CouponBean couponBean) {
         ImageView iv_coupon = holder.getView(R.id.iv_coupon);
+        iv_coupon.setImageResource(R.mipmap.logo_gray);
         // 解决图片错乱
         iv_coupon.setTag(R.id.iv_coupon, couponBean.coverUrl);
 
@@ -79,6 +80,7 @@ public class CouponAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder>
             });
 
         holder.setText(R.id.tv_coupon_title, couponBean.couponName);
+        holder.setText(R.id.tv_coupon_content, couponBean.couponContent);
 
         View view = holder.getView(R.id.ll_coupon);
         view.setOnClickListener(v -> {

+ 31 - 1
app/src/main/java/com/miekir/ym/ui/home/coupon/detail/CouponDetailActivity.kt

@@ -1,10 +1,13 @@
 package com.miekir.ym.ui.home.coupon.detail
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.webkit.WebChromeClient
 import android.webkit.WebSettings
+import android.webkit.WebView
 import android.webkit.WebViewClient
 import com.miekir.common.utils.ToastTool
 import com.miekir.mvp.presenter.InjectPresenter
@@ -63,7 +66,26 @@ class CouponDetailActivity : YangActivity(), IFavView {
         settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
 
         wv_coupon_detail.webChromeClient = WebChromeClient()
-        wv_coupon_detail.webViewClient = WebViewClient()
+        //wv_coupon_detail.webViewClient = WebViewClient()
+        wv_coupon_detail.webViewClient = object: WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
+                return if(url!!.startsWith("http:")||url.startsWith("https:")){
+                    //对http或者https协议的链接进行加载
+                    view!!.loadUrl(url)
+                    true
+                }else{
+                    //这里需要捕捉异常,因为如果没有安装相关的APP会有类找不到的异常
+                    try {
+                        //启动对应协议的APP
+                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                        startActivity(intent)
+                    }catch (e:Exception){
+                        e.printStackTrace()
+                    }
+                    true
+                }
+            }
+        }
         // 解决中文乱码
         wv_coupon_detail.loadUrl(mCouponBean!!.jumpUrl)
     }
@@ -120,4 +142,12 @@ class CouponDetailActivity : YangActivity(), IFavView {
             ToastTool.showShort("操作失败")
         }
     }
+
+    override fun onBackPressed() {
+        if (wv_coupon_detail.canGoBack()) {
+            wv_coupon_detail.goBack()
+        } else {
+            super.onBackPressed()
+        }
+    }
 }

+ 2 - 2
app/src/main/res/layout/item_coupon.xml

@@ -23,7 +23,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:src="@mipmap/logo_gray"
-            android:scaleType="centerCrop"/>
+            android:scaleType="centerInside"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -48,9 +48,9 @@
                 android:minHeight="@dimen/margin_s"/>
 
             <TextView
+                android:id="@+id/tv_coupon_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_sss"
                 android:textColor="@color/gray_text_s"
                 android:textSize="@dimen/text_normal_s"
                 android:text="为表情包配字幕并下载制作的表情包"/>