From ccf7a1f19b5c6276178c72609c88d057214c8239 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期一, 01 十二月 2025 09:51:50 +0800
Subject: [PATCH] 1.添加timber日志库

---
 app/src/main/java/com/anyun/h264/H264FileTransmitter.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/anyun/h264/H264FileTransmitter.java b/app/src/main/java/com/anyun/h264/H264FileTransmitter.java
index 51299d0..af9919f 100644
--- a/app/src/main/java/com/anyun/h264/H264FileTransmitter.java
+++ b/app/src/main/java/com/anyun/h264/H264FileTransmitter.java
@@ -1,6 +1,6 @@
 package com.anyun.h264;
 
-import android.util.Log;
+import timber.log.Timber;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -119,7 +119,7 @@
     public void setFrameRate(int frameRate) {
         this.frameRate = frameRate > 0 ? frameRate : 25;
         this.frameInterval = 1000 / this.frameRate;
-        Log.d(TAG, "Frame rate set to: " + this.frameRate + " fps, interval: " + this.frameInterval + " ms");
+        Timber.d("Frame rate set to: %d fps, interval: %d ms", this.frameRate, this.frameInterval);
     }
     
     /**
@@ -135,12 +135,12 @@
      */
     public boolean initialize() {
         if (isRunning.get()) {
-            Log.w(TAG, "Transmitter is already running");
+            Timber.w("Transmitter is already running");
             return false;
         }
         
         if (!protocolHelper.initializeSocket()) {
-            Log.e(TAG, "Failed to initialize socket");
+            Timber.e("Failed to initialize socket");
             return false;
         }
         
@@ -152,7 +152,7 @@
         lastIFrameTime = 0;
         lastFrameTime = 0;
         
-        Log.d(TAG, "Socket initialized successfully");
+        Timber.d("Socket initialized successfully");
         return true;
     }
     
@@ -162,13 +162,13 @@
      */
     public void transmitFile(String filePath) {
         if (isRunning.get()) {
-            Log.w(TAG, "Transmitter is already running");
+            Timber.w("Transmitter is already running");
             return;
         }
         
         File file = new File(filePath);
         if (!file.exists() || !file.isFile()) {
-            Log.e(TAG, "File does not exist: " + filePath);
+            Timber.e("File does not exist: %s", filePath);
             if (progressCallback != null) {
                 progressCallback.onError("File does not exist: " + filePath);
             }
@@ -186,7 +186,7 @@
         });
         transmitThread.start();
         
-        Log.d(TAG, "Started transmitting file: " + filePath);
+        Timber.d("Started transmitting file: %s", filePath);
     }
     
     /**
@@ -214,10 +214,10 @@
             }
             
             if (totalRead != fileData.length) {
-                Log.w(TAG, "File read incomplete, expected: " + fileData.length + ", actual: " + totalRead);
+                Timber.w("File read incomplete, expected: %d, actual: %d", fileData.length, totalRead);
             }
             
-            Log.d(TAG, "File read complete, size: " + fileData.length + " bytes");
+            Timber.d("File read complete, size: %d bytes", fileData.length);
             
             // 鎸夊抚瑙ｆ瀽骞朵紶杈擄紙涓�涓抚鍖呭惈浠庝竴涓捣濮嬬爜鍒颁笅涓�涓捣濮嬬爜涔嬮棿鐨勬墍鏈夋暟鎹紝鍖呮嫭璧峰鐮侊級
             int offset = 0;
@@ -255,19 +255,19 @@
                 offset = nextFrameStart;
             }
             
-            Log.d(TAG, "Transmission complete, total frames: " + frameCount);
+            Timber.d("Transmission complete, total frames: %d", frameCount);
             
             if (progressCallback != null) {
                 progressCallback.onComplete();
             }
             
         } catch (IOException e) {
-            Log.e(TAG, "Error transmitting file", e);
+            Timber.e(e, "Error transmitting file");
             if (progressCallback != null) {
                 progressCallback.onError("IO Error: " + e.getMessage());
             }
         } catch (Exception e) {
-            Log.e(TAG, "Unexpected error during transmission", e);
+            Timber.e(e, "Unexpected error during transmission");
             if (progressCallback != null) {
                 progressCallback.onError("Error: " + e.getMessage());
             }
@@ -276,7 +276,7 @@
                 try {
                     fis.close();
                 } catch (IOException e) {
-                    Log.e(TAG, "Error closing file", e);
+                    Timber.e(e, "Error closing file");
                 }
             }
             isRunning.set(false);
@@ -464,13 +464,13 @@
                     Thread.sleep(frameInterval);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
-                    Log.d(TAG, "Transmission interrupted");
+                    Timber.d("Transmission interrupted");
                     return;
                 }
             }
             
         } catch (Exception e) {
-            Log.e(TAG, "Error transmitting frame", e);
+            Timber.e(e, "Error transmitting frame");
         }
     }
     
@@ -489,7 +489,7 @@
             try {
                 transmitThread.join(2000);
             } catch (InterruptedException e) {
-                Log.e(TAG, "Wait transmit thread error", e);
+                Timber.e(e, "Wait transmit thread error");
             }
         }
         
@@ -498,7 +498,7 @@
             protocolHelper.closeSocket();
         }
         
-        Log.d(TAG, "H264 file transmitter stopped");
+        Timber.d("H264 file transmitter stopped");
     }
     
     /**

--
Gitblit v1.8.0