From b390c8245f990bd5bc06a48d378252e315f32379 Mon Sep 17 00:00:00 2001 From: YJJ <15950590667@163.com> Date: Mon, 8 Jul 2024 09:58:35 +0800 Subject: [PATCH] =?UTF-8?q?[author]=20yjj=20[desc]=201=E3=80=81=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BB=A3=E7=A0=81=202?= =?UTF-8?q?=E3=80=81=E9=9C=80=E6=94=B9=E8=81=94=E5=8A=A8=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=BB=A7=E7=94=B5=E5=99=A8gpio=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../watcher/base/BaseActivity.kt | 19 ----------- .../watcher/log/LogPrintListener.kt | 5 --- .../safetywatcher/watcher/net/DevicesApi.kt | 5 +-- .../safetywatcher/watcher/ui/HomeActivity.kt | 2 -- .../watcher/ui/NetSettingActivity.kt | 4 +-- .../watcher/ui/view/CommonTopBar.kt | 16 +++------- .../safetywatcher/watcher/utils/GPIOUtils.kt | 2 ++ .../safetywatcher/watcher/utils/LztekUtil.kt | 4 +-- .../watcher/utils/NetworkHelper.kt | 16 ++-------- .../safetywatcher/watcher/utils/SimHelper.kt | 13 +++----- .../safetywatcher/watcher/utils/WifiHelper.kt | 6 ++-- app/src/main/res/layout/activity_base.xml | 32 +------------------ app/src/main/res/layout/layout_topbar.xml | 1 + 13 files changed, 24 insertions(+), 101 deletions(-) delete mode 100644 app/src/main/java/com/yinuo/safetywatcher/watcher/log/LogPrintListener.kt diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt index 2cf28ce..ae92f99 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt +++ b/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) - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/log/LogPrintListener.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/log/LogPrintListener.kt deleted file mode 100644 index 08eaa7e..0000000 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/log/LogPrintListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.yinuo.safetywatcher.watcher.log - -interface LogPrintListener { - fun log(msg: String?) -} diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt index 941fc85..0110151 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt +++ b/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(Api::class.java) { observe(api.heartBeat(sosReq), object : RequestNoResultCallBack() { 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() { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt index de28c5a..e3e64bc 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt +++ b/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) } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt index 11aaeb9..cd14235 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/NetSettingActivity.kt +++ b/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" } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt index fcd4553..9f9d852 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt +++ b/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") - logListener?.log("wifiCallback onEnable = $enable") + LogUtils.w("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") - logListener?.log("wifiCallback onLevel = $level") + LogUtils.w("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") - logListener?.log("sim enable callback : $enable") + LogUtils.w("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") - logListener?.log("simCallback onLevel = $level") + LogUtils.w("simCallback onLevel = $level") mBinding?.root?.post { var showLevel = if (AppData.hasCameraData()) (level / 15 + 1) * 20 else (level + 1) * 20 diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt index 00fd3b7..8a4268d 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/GPIOUtils.kt +++ b/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" diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt index 3a524be..3a48d68 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/LztekUtil.kt +++ b/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) } } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkHelper.kt index f418381..a5d68d2 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkHelper.kt +++ b/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) - } - } \ No newline at end of file diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt index fe93fd0..99b6853 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt +++ b/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") - - logListener?.log("onReceive action = ${intent?.action}, mSimState = $mSimState") + LogUtils.w("onReceive action = ${intent?.action}, mSimState = $mSimState") } } @@ -61,8 +57,7 @@ object SimHelper { } // 通知网络发生变化，可能需要提示用户 NetworkHelper.notifyNetworkChange() - Log.i(TAG, "onSignalStrengthsChanged mRssi = $mRssi") - logListener?.log("onSignalStrengthsChanged mRssi = $mRssi") + LogUtils.w( "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 } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt index 23ae037..d0422b8 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt +++ b/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 } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index f1e4d37..5841eb6 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -91,35 +91,6 @@ - - - - - - - - diff --git a/app/src/main/res/layout/layout_topbar.xml b/app/src/main/res/layout/layout_topbar.xml index 642d393..bfc3797 100644 --- a/app/src/main/res/layout/layout_topbar.xml +++ b/app/src/main/res/layout/layout_topbar.xml @@ -87,6 +87,7 @@