From 7643244a5a63acea4b95214f6940f98943cf2d50 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Wed, 15 Nov 2023 10:37:24 +0800
Subject: [PATCH] =?UTF-8?q?desc:wifi=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt   | 4 ++--
 .../yinuo/safetywatcher/watcher/utils/NetworkStatsHelper.java | 4 ++--
 .../com/yinuo/safetywatcher/watcher/utils/RecordHelper.kt     | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

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 b0a393b..922d5c4 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
@@ -75,13 +75,13 @@ class CommonTopBar : LinearLayout {
             if (!enable) {
                 mBinding?.wifi?.visibility = GONE
             } else {
-                mBinding?.wifi?.visibility = VISIBLE
+//                mBinding?.wifi?.visibility = VISIBLE
             }
         }
 
         override fun onLevel(level: Int) {
             Log.i(this@CommonTopBar.javaClass.name, "wifiCallback onLevel = $level")
-//            mBinding?.wifi?.visibility = if (level > 0) VISIBLE else GONE
+            mBinding?.wifi?.visibility = if (level > 0) VISIBLE else GONE
             val showLevel = (level + 1) * 20
             mBinding?.wifi?.setImageLevel(showLevel)
         }
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkStatsHelper.java b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkStatsHelper.java
index 1f11740..bd79db7 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkStatsHelper.java
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/NetworkStatsHelper.java
@@ -55,8 +55,8 @@ public class NetworkStatsHelper {
         TrafficBean trafficBean = new TrafficBean();
         NetworkStats.Bucket bucket;
         try {
-            bucket = networkStatsManager.querySummaryForDevice(ConnectivityManager.TYPE_MOBILE,
-                    getSubscriberId(context, ConnectivityManager.TYPE_MOBILE),
+            bucket = networkStatsManager.querySummaryForDevice(ConnectivityManager.TYPE_WIFI,
+                    getSubscriberId(context, ConnectivityManager.TYPE_WIFI),
                     isDayAndMonth ? TrafficFormat.getTimesmorning() : TrafficFormat.getTimesMonthmorning(),
                     System.currentTimeMillis());
         } catch (RemoteException e) {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/RecordHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/RecordHelper.kt
index 7b53de5..4f41285 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/RecordHelper.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/RecordHelper.kt
@@ -2,7 +2,6 @@ package com.yinuo.safetywatcher.watcher.utils
 
 import android.graphics.Bitmap
 import android.view.TextureView
-import com.common.commonlib.utils.LogUtils
 import com.yinuo.library.vlc.encoder.MediaCodecManager
 import org.easydarwin.TxtOverlay
 
@@ -21,7 +20,6 @@ object RecordHelper {
         if (!recording) {
             return
         }
-        LogUtils.w("onI420Data 11111")
         val overLayBitmap: Bitmap? = TxtOverlay.getOverlayBitmap()
         overLayBitmap?.let {
             val yuv = TxtOverlay.getOverlayYuv()
@@ -46,7 +44,6 @@ object RecordHelper {
             }
         }
         codecManager.addFrameData(nv12Data)
-        LogUtils.w("onI420Data 44444")
     }
 
     fun startRecording() {