From f3cb398deb16acf95750dfa4847e178b5e6f393e Mon Sep 17 00:00:00 2001
From: BlueMatthew <wakinchau@msn.com>
Date: Mon, 5 Feb 2024 15:34:24 +0800
Subject: [PATCH] Add oid

---
 .../main/java/com/xypower/mpmaster/AppMaster.java    |  2 +-
 .../java/com/xypower/mpmaster/MpMasterService.java   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
index c29841ca..e4c398c0 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
@@ -131,7 +131,7 @@ public class AppMaster {
                     postParams.add(new Pair<String, String>("id", mCmdid));
                     postParams.add(new Pair<String, String>("XyDev", "1"));
                     postParams.add(new Pair<String, String>("bootTime", Long.toString(getBootTime())));
-                    postParams.add(new Pair<String, String>("i1Version", mService.getMpAppVersion()));
+                    postParams.add(new Pair<String, String>("oid", mService.getSerialNo()));
                     postParams.add(new Pair<String, String>("maintainVersion", mService.getMasterAppVersion()));
 
                     // postParams(httpURLConnection.getOutputStream(), postParams);
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
index 5c7dbbb4..2a343b62 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
@@ -117,6 +117,8 @@ public class MpMasterService extends Service {
 
     private static String mMpMasterVersion = null;
 
+    private String mSerialNo = null;
+
     public MpMasterService() {
     }
     @Override
@@ -128,6 +130,12 @@ public class MpMasterService extends Service {
     public void onCreate() {
         super.onCreate();
 
+        try {
+            mSerialNo = android.os.Build.getSerial();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
         mMpMasterVersion = MicroPhotoContext.getVersionName(getApplicationContext());
         PackageManager packageManager = getPackageManager();
         PackageInfo packageInfo = null;
@@ -221,6 +229,10 @@ public class MpMasterService extends Service {
         return mMpMasterVersion;
     }
 
+    public String getSerialNo() {
+        return mSerialNo;
+    }
+
     public void setMntnMode(boolean mntnMode, boolean quickHbMode) {
         boolean oldMntnMode = mMntnMode;
         boolean oldQuickHbMode = mQuickHbMode;