From ab3cafdb25f78ea442bf0106a97f657bb8f272d0 Mon Sep 17 00:00:00 2001
From: miaoyongjun <1604165677@qq.com>
Date: Tue, 24 May 2022 18:38:23 +0800
Subject: [PATCH] fix null bug

---
 app/build.gradle.kts                               | 11 -----------
 app/src/main/java/net/mikaelzero/app/App.kt        |  2 --
 build.gradle.kts                                   |  1 -
 gradle.properties                                  | 14 +-------------
 .../mikaelzero/mojito/ui/ImageMojitoFragment.kt    |  2 +-
 5 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a6f95dd..cefe5c8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("kotlin-parcelize")
-    id("com.didi.dokit")
 }
 setupAppModule {
     defaultConfig {
@@ -23,16 +22,6 @@ setupAppModule {
             proguardFiles("proguard-rules.pro")
         }
     }
-    dokitExt {
-        //通用设置
-        comm {
-            networkSwitch = true
-        }
-
-        slowMethod {
-
-        }
-    }
 }
 
 dependencies {
diff --git a/app/src/main/java/net/mikaelzero/app/App.kt b/app/src/main/java/net/mikaelzero/app/App.kt
index a8e119a..53d1d94 100644
--- a/app/src/main/java/net/mikaelzero/app/App.kt
+++ b/app/src/main/java/net/mikaelzero/app/App.kt
@@ -3,7 +3,6 @@ package net.mikaelzero.app
 import android.app.Application
 import android.content.Context
 import androidx.multidex.MultiDex
-import com.didichuxing.doraemonkit.DoKit
 
 
 class App : Application() {
@@ -15,6 +14,5 @@ class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        DoKit.Builder(this).build()
     }
 }
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index db7134b..a1196ac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,6 @@ buildscript {
         classpath(rootProject.extra["androidPlugin"].toString())
         classpath(rootProject.extra["kotlinPlugin"].toString())
         classpath(rootProject.extra["mavenPublishPlugin"].toString())
-        classpath("io.github.didi.dokit:dokitx-plugin:3.5.0.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 4381ec9..6624c51 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,16 +22,4 @@ targetSdk=30
 compileSdk=30
 # Maven
 GROUP=com.github.mikaelzero
-VERSION_NAME=1.8.3
-DOKIT_PLUGIN_SWITCH=true
-#// DOKIT读取三方库会和booster冲突 如果你的项目中也集成了booster 建议将开关改成false
-DOKIT_THIRD_LIB_SWITCH=true
-#// 插件日志
-DOKIT_LOG_SWITCH=true
-#// dokit 慢函数开关
-DOKIT_METHOD_SWITCH=true
-#// dokit 函数调用栈层级
-DOKIT_METHOD_STACK_LEVEL=4
-#// 0:默认模式 打印函数调用栈 需添加指定入口  默认为application onCreate 和attachBaseContext
-#// 1:普通模式 运行时打印某个函数的耗时 全局业务代码函数插入
-DOKIT_METHOD_STRATEGY=0
\ No newline at end of file
+VERSION_NAME=1.8.3
\ No newline at end of file
diff --git a/mojito/src/main/java/net/mikaelzero/mojito/ui/ImageMojitoFragment.kt b/mojito/src/main/java/net/mikaelzero/mojito/ui/ImageMojitoFragment.kt
index 1b05a6e..9c1420c 100644
--- a/mojito/src/main/java/net/mikaelzero/mojito/ui/ImageMojitoFragment.kt
+++ b/mojito/src/main/java/net/mikaelzero/mojito/ui/ImageMojitoFragment.kt
@@ -97,7 +97,7 @@ class ImageMojitoFragment : Fragment(), IMojitoFragment, OnMojitoViewCallback {
             }
         })
         binding.loadingLayout.setOnClickListener {
-            binding.mojitoView.backToMin()
+            backToMin()
             ImageMojitoActivity.onMojitoListener?.onClick(view, 0f, 0f, fragmentConfig.position)
         }
         contentLoader?.onLongTapCallback(object : OnLongTapCallback {