From 8a799998a20c8e7bbda6f800678bcaf72d95586f Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 21 Jan 2025 16:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E7=BB=B4cmdid?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mpmaster/src/main/cpp/mpmaster.cpp | 9 +++++++++ .../main/java/com/xypower/mpmaster/MpMasterService.java | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/mpmaster/src/main/cpp/mpmaster.cpp b/mpmaster/src/main/cpp/mpmaster.cpp index 54d16081..a7da0674 100644 --- a/mpmaster/src/main/cpp/mpmaster.cpp +++ b/mpmaster/src/main/cpp/mpmaster.cpp @@ -79,6 +79,15 @@ int setGpioInt(int cmd, int val) } return -1; } +extern "C" JNIEXPORT jstring JNICALL +Java_com_xypower_mpmaster_MpMasterService_getSerialNumber( + JNIEnv* env, + jclass cls) { + + char value[PROP_VALUE_MAX] = { 0 }; + __system_property_get("ro.serialno", value); + return env->NewStringUTF(value); +} extern "C" JNIEXPORT jint JNICALL Java_com_xypower_mpmaster_MpMasterService_setInt(JNIEnv* env, jclass cls, jint cmd, jint val) { diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index c6c69c03..c8582795 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -567,6 +567,10 @@ public class MpMasterService extends Service { if (appConfig.heartbeat > 0) { mMpHeartbeatDuration = appConfig.heartbeat * 60000; } + if(TextUtils.isEmpty(appConfig.cmdid)) + { + appConfig.cmdid = MpMasterService.getSerialNumber(); + } logger.warning("Start Mntn report: " + masterUrl + " MntnMode=" + (mMntnMode ? "1" : "0") + " QuickHB=" + (mQuickHbMode ? "1" : "0")); @@ -1347,6 +1351,7 @@ public class MpMasterService extends Service { public native static int getInt(int cmd); public native static int setInt(int cmd, int val); + public static native String getSerialNumber(); public native static int[] getStats(long ts); public native static String getSystemProperty(String key); public native static void rebootDevice();