DM修改

diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_lwm2msdk.c b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_lwm2msdk.c
index 9f4d888..8650a52 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_lwm2msdk.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_lwm2msdk.c
@@ -842,16 +842,17 @@ int LWM2M_SDK_RUN_PARAM(int argc, char *argv[])
     LOG_M("LWM2M_SDK_RUN_PARAMg_opt.szCMEI_IMEI:%s!\n",g_opt.szCMEI_IMEI);
     char *szStars="***";
     char epnametmp[256];
+    char imsi[16] = {0};
+    watch_modem_get_imsi_req(imsi);
+    memcpy(g_opt.szIMSI,imsi,16);
     memset(epnametmp,0,sizeof(epnametmp));
     memset(g_szEPI,0,sizeof(g_szEPI));
-    sprintf(epnametmp,"%s||%s||%s||%s||%s||I||%s||%s||%s||***||***||***",
+    sprintf(epnametmp,"%s||%s||%s||%s||%s||I||%s||%s||***||***||***||***",
             g_opt.brand, g_opt.model, g_opt.appKey, g_opt.sdkVersion, g_opt.apiVersion,g_opt.templatID,
-            strlen(g_opt.szCMEI_IMEI) > 0 ? g_opt.szCMEI_IMEI : szStars,
-            strlen(g_opt.szCMEI_IMEI2) > 0 ? g_opt.szCMEI_IMEI2 : szStars);
-    sprintf(g_szEPI, "%s||%s||%s||%s||%s||I||%s||%s||%s||***||***||***",
+            strlen(g_opt.szCMEI_IMEI) > 0 ? g_opt.szCMEI_IMEI : szStars);
+    sprintf(g_szEPI, "%s||%s||%s||%s||%s||I||%s||%s||***||***||***||***",
             g_opt.brand, g_opt.model, g_opt.appKey, g_opt.sdkVersion, g_opt.apiVersion,g_opt.templatID,
-            strlen(g_opt.szCMEI_IMEI) > 0 ? g_opt.szCMEI_IMEI : szStars,
-            strlen(g_opt.szCMEI_IMEI2) > 0 ? g_opt.szCMEI_IMEI2 : szStars);
+            strlen(g_opt.szCMEI_IMEI) > 0 ? g_opt.szCMEI_IMEI : szStars);
 
     //strcpy(epnametmp,"L@#@M+D2vyO9kk/IPVyzehd6Biypy8R69yTlHdaIQiTp6klbXqJmESZJ6QXoDlQkqOC8@#@M100000006");
     LOG_M("epname=%s~\n", epnametmp);

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 6c8c323..649fe3c 100644 (file)
--- 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
@@ -51,7 +51,7 @@ static void ccmc__package_data(void)
     cJSON_AddItemToObject(json, "FIRMWARE VERSION", cJSON_CreateString(REG_FIRMWARE_VERSION));
     cJSON_AddItemToObject(json, "Model", cJSON_CreateString(REG_FIRMWARE_NAME));
     cJSON_AddItemToObject(json, "CMEI_IMEI", cJSON_CreateString(g_opt.szCMEI_IMEI));
-#if 0
+#if 1
 //CMCC DMP V2.0
     app_adp_get_imsi_req(&g_opt.szIMSI);
     cJSON_AddItemToObject(json, "IMSI", cJSON_CreateString(g_opt.szIMSI));