[author] yjj

[desc] 1、去除测试用代码
2、需改联动开关对应继电器gpio号

app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt

@@ -19,14 +19,12 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatRadioButton
 import androidx.lifecycle.lifecycleScope
-import com.common.commonlib.utils.DateUtils
 import com.common.commonlib.utils.LogUtils
 import com.common.commonlib.utils.MMKVUtils
 import com.loper7.date_time_picker.number_picker.NumberPicker
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityBaseBinding
 import com.yinuo.safetywatcher.watcher.constant.NAMESPACE_ANDROID
-import com.yinuo.safetywatcher.watcher.log.LogPrintListener
 import com.yinuo.safetywatcher.watcher.net.DevicesApi
 import com.yinuo.safetywatcher.watcher.ui.view.CommonDialog
 import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
@@ -64,11 +62,6 @@ abstract class BaseActivity : AppCompatActivity() {
         setContentView(baseBinding.root)
 
         // 测试按钮
-        baseBinding.tvShowLog.setOnClickListener{
-            showLog = !showLog
-            baseBinding.scrollview.visibility = if (showLog) View.VISIBLE else View.GONE
-        }
-
         baseBinding.tvExit.setOnClickListener{
             val intent = Intent(Intent.ACTION_MAIN)
             intent.addCategory(Intent.CATEGORY_HOME)
@@ -136,14 +129,7 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
-    public val baseLogListener = object : LogPrintListener {
-        override fun log(msg: String?) {
-            printLog(msg)
-        }
-    }
-
     private fun setTopBar() {
-        baseBinding.topBar.logListener = baseLogListener
         val title = getTopBarTitle()
         title?.let {
             baseBinding.topBar.setTitle(it)
@@ -362,9 +348,4 @@ abstract class BaseActivity : AppCompatActivity() {
         baseBinding.root.postDelayed(hideVoiceAreaRunnable, delayTime)
     }
 
-    public fun printLog(msg : String?){
-        runOnUiThread {
-            baseBinding.tvLog.text = StringBuilder().append(DateUtils.getNowTimeFormat(DateUtils.DATE_TO_STRING_DETAIL_PATTERN)).append("   ").append(msg).append("\n").append(baseBinding.tvLog.text)
-        }
-    }
 }

app/src/main/java/com/yinuo/safetywatcher/watcher/log/LogPrintListener.kt

@@ -1,5 +0,0 @@
-package com.yinuo.safetywatcher.watcher.log
-
-interface LogPrintListener {
-    fun log(msg: String?)
-}

app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt

@@ -4,6 +4,7 @@ import com.common.commonlib.net.BaseObserve
 import com.common.commonlib.net.bean.BaseResponse
 import com.common.commonlib.net.callback.RequestNoResultCallBack
 import com.common.commonlib.net.callback.RequestResultCallBack
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.watcher.bean.GasReqBean
 import com.yinuo.safetywatcher.watcher.bean.GasRequest
 import com.yinuo.safetywatcher.watcher.bean.GetRtspUrlResponse
@@ -31,11 +32,11 @@ class DevicesApi : BaseObserve<DevicesApi.Api>(Api::class.java) {
         observe(api.heartBeat(sosReq), object : RequestNoResultCallBack<BaseResponse>() {
             override fun onResult(result: BaseResponse) {
                 super.onResult(result)
-                NetworkHelper.printLog("heartbeat success")
+                LogUtils.w("heartbeat success")
             }
 
             override fun onError(error: String?) {
-                NetworkHelper.printLog("heartbeat fail : $error")
+                LogUtils.w("heartbeat fail : $error")
             }
 
             override fun onComplete() {

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt

@@ -297,8 +297,6 @@ class HomeActivity : NoOptionsActivity() {
 
     private fun initTopbarHelper() {
         BatteryHelper.init(this@HomeActivity)
-        // 测试用log打印
-        com.yinuo.safetywatcher.watcher.utils.NetworkHelper.setLogPrinter(baseLogListener)
         // 注意两个NetworkHelper的区别
         com.yinuo.safetywatcher.watcher.utils.NetworkHelper.init(this)
     }

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt

@@ -3,8 +3,8 @@ package com.yinuo.safetywatcher.watcher.ui
 import android.annotation.SuppressLint
 import android.app.usage.NetworkStatsManager
 import android.content.Intent
-import android.provider.Settings
 import android.view.View
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivityNetSettingBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
@@ -42,7 +42,7 @@ class NetSettingActivity : NoOptionsActivity() {
         val systemService = getSystemService(NETWORK_STATS_SERVICE) as NetworkStatsManager
         val statsHelper = NetworkStatsHelper(systemService)
         val info = statsHelper.getAllDay_MonthMobileInfo(this, false)
-        printLog("流量使用情况：${info.totalData} ==== 下载字节： ${info.rxBytes} ===== 上传字节：${info.txBytes}")
+        LogUtils.w("流量使用情况：${info.totalData} ==== 下载字节： ${info.rxBytes} ===== 上传字节：${info.txBytes}")
         val showStr = if (info != null) TrafficFormat.formatByte(info.totalData) else "0B"
         mBinding.tvUsed.text = "流量使用情况：$showStr"
     }

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt

@@ -14,11 +14,11 @@ import android.widget.LinearLayout
 import android.widget.Space
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.LayoutTopbarBinding
 import com.yinuo.safetywatcher.watcher.AppData
 import com.yinuo.safetywatcher.watcher.interfaces.NetworkStateCallback
-import com.yinuo.safetywatcher.watcher.log.LogPrintListener
 import com.yinuo.safetywatcher.watcher.utils.BatteryHelper
 import com.yinuo.safetywatcher.watcher.utils.NetworkHelper
 import com.yinuo.safetywatcher.watcher.utils.trySetCommonBg
@@ -32,8 +32,6 @@ class CommonTopBar : LinearLayout {
         defStyleAttr
     )
 
-    var logListener : LogPrintListener? = null
-
     var mBinding: LayoutTopbarBinding? = null
 
     init {
@@ -79,16 +77,14 @@ class CommonTopBar : LinearLayout {
      * **/
     private val wifiCallback = object : NetworkStateCallback {
         override fun onEnable(enable: Boolean) {
-            Log.i(this@CommonTopBar.javaClass.name, "wifiCallback onEnable = $enable")
+            LogUtils.w("wifiCallback onEnable = $enable")
-            logListener?.log("wifiCallback onEnable = $enable")
             mBinding?.root?.post {
                 mBinding?.wifi?.visibility = if (enable) View.VISIBLE else View.GONE
             }
         }
 
         override fun onLevel(level: Int) {
-            Log.i(this@CommonTopBar.javaClass.name, "wifiCallback onLevel = $level")
+            LogUtils.w("wifiCallback onLevel = $level")
-            logListener?.log("wifiCallback onLevel = $level")
             mBinding?.root?.post {
                 mBinding?.wifi?.visibility = if (level > 0) VISIBLE else GONE
                 val showLevel = (level + 1) * 20
@@ -102,16 +98,14 @@ class CommonTopBar : LinearLayout {
      * **/
     private val simCallback = object : NetworkStateCallback {
         override fun onEnable(enable: Boolean) {
-            Log.i(this@CommonTopBar.javaClass.name, "simCallback onEnable = $enable")
+            LogUtils.w("sim enable callback : $enable")
-            logListener?.log("sim enable callback : $enable")
             mBinding?.root?.post {
                 mBinding?.fourG?.visibility = if (enable) View.VISIBLE else View.GONE
             }
         }
 
         override fun onLevel(level: Int) {
-            Log.i(this@CommonTopBar.javaClass.name, "simCallback onLevel = $level")
+            LogUtils.w("simCallback onLevel = $level")
-            logListener?.log("simCallback onLevel = $level")
             mBinding?.root?.post {
                 var showLevel =
                     if (AppData.hasCameraData()) (level / 15 + 1) * 20 else (level + 1) * 20

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt

@@ -9,6 +9,8 @@ import java.io.IOException
 
 
 object GPIOUtils {
+
+
     private const val TAG: String = "GPIOUtils"
     fun setGpioDirection(gpio: Int, direction: String) {
         val path = "/sys/class/gpio/gpio$gpio/direction"

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt

@@ -120,7 +120,7 @@ object LztekUtil {
             GlobalScope.launch(Dispatchers.IO) {
                 delay(mLinkDelay * 1000L)
                 if (isLinkSwitchOpen() && hasWarning) {
-                    GPIOUtils.setGpioValue(11, 1)
+                    GPIOUtils.setGpioValue(14, 1)
                 }
             }
         }
@@ -129,7 +129,7 @@ object LztekUtil {
     fun closeLinkIO() {
         hasWarning = false
         if (isLinkSwitchOpen()) {
-            GPIOUtils.setGpioValue(11, 0)
+            GPIOUtils.setGpioValue(14, 0)
         }
     }
 

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkHelper.kt

@@ -2,8 +2,8 @@ package com.yinuo.safetywatcher.watcher.utils
 
 import android.content.Context
 import com.common.commonlib.CommonApplication
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.watcher.interfaces.NetworkStateCallback
-import com.yinuo.safetywatcher.watcher.log.LogPrintListener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -12,19 +12,11 @@ object NetworkHelper {
 
     private var lastNetworkState : Boolean = false
 
-    private var logPrinter : LogPrintListener? = null
-
     fun init(context: Context){
         WifiHelper.init(context)
         SimHelper.init(context)
     }
 
-    fun setLogPrinter(logPrinter: LogPrintListener?){
-        this.logPrinter = logPrinter
-        SimHelper.logListener = logPrinter
-        WifiHelper.logListener = logPrinter
-    }
-
     fun release(context: Context){
         WifiHelper.release(context)
         SimHelper.release(context)
@@ -54,7 +46,7 @@ object NetworkHelper {
     fun notifyNetworkChange(){
         // 当前网络状态
         val currentNetworkState = isNetworkAvailable()
-        logPrinter?.log("网络发生变化 curr = $currentNetworkState   last = $lastNetworkState")
+        LogUtils.w("网络发生变化 curr = $currentNetworkState   last = $lastNetworkState")
         if (currentNetworkState == lastNetworkState) {
             // 网络状态无变化
             return
@@ -67,8 +59,4 @@ object NetworkHelper {
         }
     }
 
-    fun printLog(msg : String){
-        logPrinter?.log(msg)
-    }
-
 }

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt

@@ -13,8 +13,8 @@ import android.telephony.SubscriptionInfo
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
 import android.util.Log
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.watcher.interfaces.NetworkStateCallback
-import com.yinuo.safetywatcher.watcher.log.LogPrintListener
 
 
 object SimHelper {
@@ -23,8 +23,6 @@ object SimHelper {
     private var mRssi = -1
     private val TAG = javaClass.simpleName
 
-    var logListener : LogPrintListener? = null
-
     private val receiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
             if (intent?.action.equals("android.intent.action.SIM_STATE_CHANGED")) {
@@ -36,9 +34,7 @@ object SimHelper {
                 // 通知网络发生变化，可能需要提示用户
                 NetworkHelper.notifyNetworkChange()
             }
-            Log.i(TAG, "onReceive action = ${intent?.action}, mSimState = $mSimState")
+            LogUtils.w("onReceive action = ${intent?.action}, mSimState = $mSimState")
-
-            logListener?.log("onReceive action = ${intent?.action}, mSimState = $mSimState")
         }
     }
 
@@ -61,8 +57,7 @@ object SimHelper {
                 }
                 // 通知网络发生变化，可能需要提示用户
                 NetworkHelper.notifyNetworkChange()
-                Log.i(TAG, "onSignalStrengthsChanged mRssi = $mRssi")
+                LogUtils.w( "onSignalStrengthsChanged mRssi = $mRssi")
-                logListener?.log("onSignalStrengthsChanged mRssi = $mRssi")
             }
         }, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS)
     }
@@ -172,7 +167,7 @@ object SimHelper {
 //    }
 
     fun is4GAvailable() : Boolean{
-        logListener?.log("4G state = $mSimState , enable = ${mSimState == TelephonyManager.SIM_STATE_READY} , mRssi = $mRssi")
+        LogUtils.w("4G state = $mSimState , enable = ${mSimState == TelephonyManager.SIM_STATE_READY} , mRssi = $mRssi")
         return mSimState == TelephonyManager.SIM_STATE_READY && mRssi > 0
     }
 

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt

@@ -10,8 +10,8 @@ import android.net.NetworkInfo
 import android.net.wifi.WifiManager
 import android.util.Log
 import com.common.commonlib.CommonApplication
+import com.common.commonlib.utils.LogUtils
 import com.yinuo.safetywatcher.watcher.interfaces.NetworkStateCallback
-import com.yinuo.safetywatcher.watcher.log.LogPrintListener
 
 
 object WifiHelper {
@@ -20,8 +20,6 @@ object WifiHelper {
     private var mRssi = -1;
     private val TAG = javaClass.simpleName
 
-    var logListener : LogPrintListener? = null
-
     private val receiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
             if (intent?.action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
@@ -109,7 +107,7 @@ object WifiHelper {
      * wifi是否可用
      * **/
     fun isWifiAvailable() : Boolean{
-        logListener?.log("wifi state = $mWifiState , enable = ${mWifiState == WifiManager.WIFI_STATE_ENABLED} , mRssi = $mRssi")
+        LogUtils.w("wifi state = $mWifiState , enable = ${mWifiState == WifiManager.WIFI_STATE_ENABLED} , mRssi = $mRssi")
         return mWifiState == WifiManager.WIFI_STATE_ENABLED && mRssi > 0
     }
 }

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

@@ -91,35 +91,6 @@
     </RelativeLayout>
 
 
-    <!--测试用-->
-    <ScrollView
-        android:layout_width="@dimen/_1080dp"
-        android:layout_height="match_parent"
-        android:id="@+id/scrollview"
-        android:visibility="gone"
-        android:layout_marginTop="@dimen/_120dp"
-        android:background="#80000000">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/tv_log"
-            android:textColor="@color/white"
-            android:background="#00000000"/>
-
-    </ScrollView>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:text="showLog"
-        android:id="@+id/tv_showLog"
-        android:padding="@dimen/_20dp"
-        android:background="@color/red"
-        android:visibility="gone"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -129,8 +100,7 @@
         android:id="@+id/tv_exit"
         android:layout_marginBottom="@dimen/_20dp"
         android:padding="@dimen/_20dp"
-        android:visibility="gone"
+        android:layout_alignParentBottom="true"
-        android:layout_above="@id/tv_showLog"
         android:background="@color/red"
         android:layout_alignParentEnd="true"/>
 

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

@@ -87,6 +87,7 @@
     <ImageView
         android:id="@+id/four_g"
         android:layout_width="@dimen/_33dp"
+        android:visibility="gone"
         android:layout_height="@dimen/_33dp"
         android:layout_marginStart="@dimen/_40dp"
         android:src="@drawable/net"/>