tinker_base 4.0.3

# Conflicts:
#	app/src/main/java/com/gh/common/DefaultUrlHandler.kt
#	dependencies.gradle
#	gradle.properties

app/src/main/java/com/gh/common/DefaultUrlHandler.kt

@@ -4,9 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
-import com.gh.common.util.CheckLoginUtils
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.DirectUtils
+import com.gh.common.util.*
 import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
 import com.gh.common.util.DirectUtils.directToGameVideo
 import com.gh.common.util.DirectUtils.directToVideoDetail
@@ -223,6 +221,23 @@ object DefaultUrlHandler {
             }
             return true
         }
+
+        if (url.startsWith("alipays:") || url.startsWith("alipay")) {
+            try {
+                context.startActivity(Intent("android.intent.action.VIEW", Uri.parse(url)))
+            } catch (e: java.lang.Exception) {
+                ToastUtils.showToast("请安装支付宝客户端")
+            }
+            return true
+        } else if (url.startsWith("weixin")) {
+            try {
+                context.startActivity(Intent("android.intent.action.VIEW", Uri.parse(url)))
+            } catch (e: java.lang.Exception) {
+                ToastUtils.showToast("请安装微信客户端")
+            }
+            return true
+        }
+
         if ("http" != uri.scheme && "https" != uri.scheme) return true
         return false
     }

app/src/main/java/com/gh/common/view/AdBannerView.kt

@@ -190,8 +190,8 @@ class AdBannerView : LinearLayout {
 
         override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
             val ad = mDatas[position % mDatas.size]
-            val view = holder.itemView as ImageView
-            Picasso.with(context).load(ad.image).into(view)
+            val view = holder.itemView as SimpleDraweeView
+            ImageUtils.display(view,ad.image)
             holder.itemView.setOnClickListener {
                 onItemClick?.invoke(position % mDatas.size)
             }

app/src/main/java/com/gh/gamecenter/video/detail/HomeVideoFragment.kt

@@ -44,10 +44,10 @@ class HomeVideoFragment : BaseLazyFragment() {
         //预加载广告图片
         val videoAdvertisement = Config.getSettings()?.videoAdvertisement
         videoAdvertisement?.left?.let { ads ->
-            ads.forEach { Picasso.with(requireContext()).load(it.image).fetch() }
+            ads.forEach { ImageUtils.prefetchToDiskCache(it.image) }
         }
         videoAdvertisement?.right?.let { ads ->
-            ads.forEach { Picasso.with(requireContext()).load(it.image).fetch() }
+            ads.forEach { ImageUtils.prefetchToDiskCache(it.image) }
         }
     }
 

app/src/main/res/layout/item_ad_banner.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.facebook.drawee.view.SimpleDraweeView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/icon_ad"
+    app:roundedCornerRadius="5dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scaleType="fitXY"/>
+    app:placeholderImageScaleType="fitXY"/>

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 26
 
     // application info
-    versionCode = 183
-    versionName = "4.0.2"
+    versionCode = 184
+    versionName = "4.0.3"
     applicationId = "com.gh.gamecenter"
 
     // AndroidX

gradle.properties

@@ -51,8 +51,8 @@ SENSITIVE_API_HOST=https\://and-core-api.ghzs.com/v4d0d2/
 
 # 请不要手动改动下面的值，除非你明确需要以某个apk作为基准包，需要打包请以scripts/tinker*.sh为准
 TINKER_ENABLE=
-TINKER_ID=032a89e
-TINKER_BASE_APK_DIR=app-0715-16-52-39_032a89e
+TINKER_ID=801f0b9
+TINKER_BASE_APK_DIR=app-0721-17-12-02_801f0b9
 android.useAndroidX=true
 android.enableJetifier=true