重新修改oldimei的命名，改为register_network_imei

diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c
index 361f5ad..4573c09 100644 (file)
--- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c
+++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c
@@ -33,7 +33,7 @@ typedef struct
     char pyVer[32] ;
     char iccid[32] ;
     char modemVer[64] ;
-    char old_imei[32] ;
+    char register_network_imei[32] ;
 }cat1_runtime_status_t;
 
 
@@ -211,14 +211,14 @@ char* cat1_api_runtime_get_cat1_modemver(void)
      return (char*)g_runtime.modemVer;
 }
 
-void cat1_api_runtime_set_cat1_old_imei(char* old_imei)
+void cat1_api_runtime_set_cat1_register_network_imei(char* register_network_imei)
 {
-    if (old_imei == NULL) return;
-    int len=strlen(old_imei);
-    memset_s(g_runtime.old_imei,sizeof(g_runtime.old_imei),0,sizeof(g_runtime.old_imei));
-    memcpy_s(g_runtime.old_imei,sizeof(g_runtime.old_imei),old_imei,len);
+    if (register_network_imei == NULL) return;
+    int len=strlen(register_network_imei);
+    memset_s(g_runtime.register_network_imei,sizeof(g_runtime.register_network_imei),0,sizeof(g_runtime.register_network_imei));
+    memcpy_s(g_runtime.register_network_imei,sizeof(g_runtime.register_network_imei),register_network_imei,len);
 }
-char* cat1_api_runtime_get_cat1_old_imei(void)
+char* cat1_api_runtime_get_cat1_register_network_imei(void)
 {
-    return (char*)g_runtime.old_imei;
+    return (char*)g_runtime.register_network_imei;
 }

diff --git a/code/sdk/zhihui/4g/cat1Service/include/cat1_runtime.h b/code/sdk/zhihui/4g/cat1Service/include/cat1_runtime.h
index 512ad92..358dfaa 100644 (file)
--- a/code/sdk/zhihui/4g/cat1Service/include/cat1_runtime.h
+++ b/code/sdk/zhihui/4g/cat1Service/include/cat1_runtime.h
@@ -69,8 +69,8 @@ char* cat1_api_runtime_get_cat1_pyver(void);
 void cat1_api_runtime_set_cat1_modemver(char* cat1_operator);
 char* cat1_api_runtime_get_cat1_modemver(void);    
 
-void cat1_api_runtime_set_cat1_old_imei(char* old_imei);
-char* cat1_api_runtime_get_cat1_old_imei(void);    
+void cat1_api_runtime_set_cat1_register_network_imei(char* register_network_imei);
+char* cat1_api_runtime_get_cat1_register_network_imei(void);    
 
 
 #ifdef __cplusplus

diff --git a/code/sdk/zhihui/4gTest/cat1_porting.c b/code/sdk/zhihui/4gTest/cat1_porting.c
index b6d9792..3ebf6a3 100644 (file)
--- a/code/sdk/zhihui/4gTest/cat1_porting.c
+++ b/code/sdk/zhihui/4gTest/cat1_porting.c
@@ -328,13 +328,13 @@ errcode_t cat1_msg_callback(MESSAGE_4G_T msg, void *msg_buf, uint16_t msglen)
             // MESSAGE_4G_AT_RECEIVED "867998086764203"
             else if(strstr(msg_buf, "867") != NULL)
             {
-                char old_imei_buffer[16] = {0};
+                char register_network_imei_buffer[16] = {0};
                 // strncpy(old_imei_buffer, msg_buf + 3, 12);
                 // strstr(msg_buf, "867");
                 char *pos = strstr(msg_buf, "867");
-                strncpy(old_imei_buffer, pos, 15);
-                cat1_api_runtime_set_cat1_old_imei(old_imei_buffer);
-                cat1_print_warning("OLD_IMEI extracted and set: %s", old_imei_buffer);
+                strncpy(register_network_imei_buffer, pos, 15);
+                cat1_api_runtime_set_cat1_register_network_imei(register_network_imei_buffer);
+                cat1_print_warning("OLD_IMEI extracted and set: %s", register_network_imei_buffer);
             }
             break;
         case MESSAGE_4G_TIME_SYNCED: //无参数

diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_token.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_token.c
index bcfd569..bd61267 100644 (file)
--- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_token.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_token.c
@@ -256,11 +256,14 @@ uint32_t ln_get_device_token_http(const char *device_id,
         free(sign_data);
         return ERRCODE_FAIL;
     }
-    char old_device_id[32] = {0};
+    char imei0[32] = {0};
+    char imei1[32] = {0};
 
     // uapi_ln_get_device_id(old_device_id, sizeof(old_device_id));
-    strcpy(old_device_id, cat1_api_runtime_get_cat1_old_imei());
-    printf("old_device_id: %s\n", old_device_id);
+    strcpy(imei0, device_id);
+    strcpy(imei1, cat1_api_runtime_get_cat1_register_network_imei());
+    printf("imei0: %s\n", imei0);
+    printf("imei1: %s\n", imei1);
     /* 3. 组织自定义请求头 */
     char *header_buf = (char *)malloc(1024);
     if (!header_buf)
@@ -276,12 +279,13 @@ uint32_t ln_get_device_token_http(const char *device_id,
                            "signature: %s\r\n"
                            "deviceModel: %s\r\n"
                            "deviceVersion: %s\r\n"
-                           "oldDeviceId: %s\r\n"
+                           "imei0:%s\r\n"
+                           "imei1:%s\r\n"
                            "Content-Type: application/json\r\n",
                            device_id, device_iccid, timestamp, nonce, signature,
                            (device_model && device_model[0]) ? device_model : "AB101",
                            (device_version && device_version[0]) ? device_version : "1.0.0",
-                           old_device_id);
+                           imei0,imei1);
     if (hdr_len <= 0)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ln_get_device_token_http: header build failed");