解决冲突

app/src/main/java/com/mints/flowbox/ui/activitys/keepalive/ApkActivity.kt

@@ -25,6 +25,8 @@ import kotlinx.android.synthetic.main.activity_apk.fl_ad
 import kotlinx.android.synthetic.main.activity_apk.ivImg
 import kotlinx.android.synthetic.main.activity_apk.iv_close
 import kotlinx.android.synthetic.main.activity_apk.tvInfo
+import kotlinx.android.synthetic.main.activity_apk.tvInfo2
+import kotlinx.android.synthetic.main.activity_timing.*
 import kotlin.random.Random
 
 /**
@@ -80,7 +82,7 @@ class ApkActivity : BaseActivity() {
 
             WifiDataManager.increaseCount(WifiDataManager.INSTALL_APK)
 
-            if (BuildConfig.DEBUG) {
+            if (BuildConfig.DEBUG&&tvInfo2!=null) {
                 tvInfo2.text = "测试 -> 当前应用安装剩余次数:" + sp.getInt(
                     WifiDataManager.INSTALL_APK,
                     0
@@ -104,7 +106,7 @@ class ApkActivity : BaseActivity() {
 
             WifiDataManager.increaseCount(WifiDataManager.UPDATE_APK)
 
-            if (BuildConfig.DEBUG) {
+            if (BuildConfig.DEBUG&&tvInfo2!=null) {
                 tvInfo2.text = "测试 -> 当前应用更新剩余次数:" + sp.getInt(
                     WifiDataManager.UPDATE_APK,
                     0
@@ -127,7 +129,7 @@ class ApkActivity : BaseActivity() {
 
             WifiDataManager.increaseCount(WifiDataManager.UNINSTALL_APK)
 
-            if (BuildConfig.DEBUG) {
+            if (BuildConfig.DEBUG&&tvInfo2!=null) {
                 tvInfo2.visibility = View.VISIBLE
                 tvInfo2.text = "测试 -> 当前应用卸载剩余次数:" + sp.getInt(
                     WifiDataManager.UNINSTALL_APK,

app/src/main/java/com/mints/flowbox/ui/activitys/keepalive/BoostFastActivity.kt

@@ -135,7 +135,7 @@ class BoostFastActivity : Activity() {
             overridePendingTransition(0, 0)
         }
 
-        if (BuildConfig.DEBUG) {
+        if (BuildConfig.DEBUG&&tvInfo2!=null) {
             tvInfo2.visibility = View.VISIBLE
             tvInfo2.text = "测试 -> 当前 定时 弹出次数:" + sp.getInt(
                 WifiDataManager.TIMING,

app/src/main/java/com/mints/flowbox/ui/activitys/keepalive/ScreenActivity.kt

@@ -20,6 +20,7 @@ import com.mints.flowbox.utils.ToolUtil
 import com.mints.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.activity_screen.*
 import kotlinx.android.synthetic.main.activity_screen.fl_ad
+import kotlinx.android.synthetic.main.activity_timing.*
 import java.util.*
 
 class ScreenActivity : OutAppActivity(), View.OnClickListener {
@@ -62,7 +63,7 @@ class ScreenActivity : OutAppActivity(), View.OnClickListener {
         tvDate.text = TimeRender.getWeek() + " " + monthDay
         tvTime.text = time
 
-        if (BuildConfig.DEBUG) {
+        if (BuildConfig.DEBUG&&tvInfo2!=null) {
             tvDate.text = "测试 -> 当前锁屏已弹出次数:" + sp.getInt(
                 WifiDataManager.LOCK_ON,
                 0

app/src/main/java/com/mints/flowbox/ui/activitys/keepalive/TriggerActivity.kt

@@ -108,7 +108,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.WIFI_ON)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 连接WIFI 弹出次数:" + sp.getInt(
                         WifiDataManager.WIFI_ON,
@@ -128,7 +128,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.WIFI_ON)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 连接WIFI 弹出次数:" + sp.getInt(
                         WifiDataManager.WIFI_ON,
@@ -148,7 +148,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.WIFI_ON)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 连接WIFI 弹出次数:" + sp.getInt(
                         WifiDataManager.WIFI_ON,
@@ -165,7 +165,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.WIFI_OFF)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 断开WIFI 弹出次数:" + sp.getInt(
                         WifiDataManager.WIFI_OFF,
@@ -182,7 +182,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.WIFI_OFF)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 断开WIFI 弹出次数:" + sp.getInt(
                         WifiDataManager.WIFI_OFF,
@@ -219,7 +219,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.BATTERY_OFF)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 拔电 弹出次数:" + sp.getInt(
                         WifiDataManager.BATTERY_OFF,
@@ -239,7 +239,7 @@ class TriggerActivity : BaseActivity() {
 
                 WifiDataManager.increaseCount(WifiDataManager.TELEPHONE_OFF)
 
-                if (BuildConfig.DEBUG) {
+                if (BuildConfig.DEBUG&&tvInfo2!=null) {
                     tvInfo2.visibility = View.VISIBLE
                     tvInfo2.text = "测试 -> 当前 电话挂断 弹出次数:" + sp.getInt(
                         WifiDataManager.TELEPHONE_OFF,