From 0a18a9847a359327b38855d451ff46ca365ae372 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 27 Dec 2024 23:21:12 +0800
Subject: [PATCH] Clean code

---
 .../com/fongmi/android/tv/bean/Device.java    | 24 ++++++++++++-------
 .../com/fongmi/android/tv/utils/Util.java     |  6 -----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Device.java b/app/src/main/java/com/fongmi/android/tv/bean/Device.java
index 9155bd057..253ae7a97 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Device.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Device.java
@@ -35,17 +35,21 @@ public class Device {
     @SerializedName("type")
     private int type;
 
-    @Ignore
-    @SerializedName("mac")
-    private String mac;
     @Ignore
     @SerializedName("serial")
     private String serial;
+    @Ignore
+    @SerializedName("eth")
+    private String eth;
+    @Ignore
+    @SerializedName("wlan")
+    private String wlan;
 
     public static Device get() {
         Device device = new Device();
-        device.setMac(Util.getMac());
         device.setSerial(Util.getSerial());
+        device.setEth(Util.getMac("eth0"));
+        device.setWlan(Util.getMac("wlan0"));
         device.setUuid(Util.getAndroidId());
         device.setName(Util.getDeviceName());
         device.setIp(Server.get().getAddress());
@@ -105,14 +109,18 @@ public class Device {
         this.type = type;
     }
 
-    public void setMac(String mac) {
-        this.mac = mac;
-    }
-
     public void setSerial(String serial) {
         this.serial = serial;
     }
 
+    public void setEth(String eth) {
+        this.eth = eth;
+    }
+
+    public void setWlan(String wlan) {
+        this.wlan = wlan;
+    }
+
     public boolean isLeanback() {
         return getType() == 0;
     }
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java
index 0cf135cda..d36f3985a 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java
@@ -107,12 +107,6 @@ public class Util {
         return Shell.exec("getprop ro.serialno");
     }
 
-    public static String getMac() {
-        String eth = getMac("eth0");
-        String wlan = getMac("wlan0");
-        return !wlan.isEmpty() ? wlan : eth;
-    }
-
     public static String getMac(String name) {
         try {
             StringBuilder sb = new StringBuilder();