From: p15692025051 <846603105@qq.com>
Date: Mon, 18 Mar 2024 06:17:54 +0000 (+0800)
Subject: dm入库
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=495c77edf8f357545986f877dc10d9dd7dca19c6;p=mirrors%2FASR3603_Z5.git

dm入库
---

diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c
index 6c36ab53..3ca08059 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c
@@ -38,9 +38,10 @@
 #define RES_DM_GPU                       6621
 #define RES_DM_ROUTER_MAC                6622
 #define RES_DM_NETWORK_STATUS            6623
-#define RES_DM_SN                6624
-#define RES_DM_BLUETOOTHMAC            6625
-#define RES_DM_MAX                       (25)
+#define RES_DM_SN                        6624
+#define RES_DM_BLUETOOTHMAC              6625
+#define RES_DM_IMSI2                     6626
+#define RES_DM_MAX                       (26)
 
 #define RES_DM_DEV_INFO_STR                  "devinfo"
 #define RES_DM_APP_INFO_STR                  "appinfo"
@@ -66,7 +67,8 @@
 #define RES_DM_ROUTER_MAC_STR                "routerMac"
 #define RES_DM_NETWORK_STATUS_STR            "networkStatus"
 #define RES_DM_SN_STR                        "sn"
-#define RES_DM_BLUETOOTHMAC_STR              "bluetoothMac" 
+#define RES_DM_BLUETOOTHMAC_STR              "bluetoothMac"
+ #define RES_DM_IMSI2_STR                    "imsi2"
 #define RES_VALUE_BUFF_LEN  512
 
 typedef struct
@@ -151,6 +153,8 @@ int lwm2m_data_encode_json_buffer(int id, char *jsonOutBuff)
         len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_SN_STR);
     else if (id == RES_DM_BLUETOOTHMAC)
         len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_BLUETOOTHMAC_STR);
+    else if (id == RES_DM_IMSI2)
+        len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_IMSI2_STR);
     else 
         return -1;
 
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c
index 649fe3cb..d03fe712 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c
@@ -55,6 +55,8 @@ static void ccmc__package_data(void)
 //CMCC DMP V2.0
     app_adp_get_imsi_req(&g_opt.szIMSI);
     cJSON_AddItemToObject(json, "IMSI", cJSON_CreateString(g_opt.szIMSI));
+    
+    cJSON_AddItemToObject(json, "IMSI2", cJSON_CreateString("***"));
 #else
 //CMCC DMP V4.0
     char imsi[32] = {0};
@@ -240,6 +242,9 @@ int myDMReadInfo(int resId,char **outbuff)
         case 6625://bluetoothMac
             snprintf(buff,buflen,REG_BLUETOOTHMAC);
             break;
+        case 6626://imsi2
+            snprintf(buff,buflen,"***");
+            break;
 #endif //simware add end
 
     default: