DM提交

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 2792c5f..83a7be6 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
@@ -37,7 +37,7 @@ extern char * app_adaptor_get_model_id(void);
 extern char * app_adaptor_get_version(void);
 static void ccmc__package_data(void)
 {
-    printf("<dm>[%s,%d]\n", __func__, __LINE__);
+    lwm2m_printf("<dm>[%s,%d]\n", __func__, __LINE__);
 
     cJSON *json = NULL;
     char *cache_buf = NULL;
@@ -45,7 +45,7 @@ static void ccmc__package_data(void)
 
     json = cJSON_CreateObject();
     if(json == NULL) {
-        printf("[%s\n]%s",__func__,"create cjson object error!!!!");
+        lwm2m_printf("[%s\n]%s",__func__,"create cjson object error!!!!");
         return;
     }
     cJSON_AddItemToObject(json, "FIRMWARE VERSION", cJSON_CreateString(REG_FIRMWARE_VERSION));
@@ -132,7 +132,7 @@ void  myNotifyMsg(OptNotifyParam *optNotifyParam)
     g_DmRegisterflag = s_state;
 
 }
-
+char is_wearingstatus = 1;
 int myDMReadInfo(int resId,char **outbuff)
 {
     int iret = 0;
@@ -153,20 +153,21 @@ int myDMReadInfo(int resId,char **outbuff)
             break;
         case 6603://mac
             {
-                extern UINT64 Read_Crane_CPU_UID();
-                UINT64 cpuId = Read_Crane_CPU_UID();
-                char mac[6];
-                memset(mac,0,6);
-                mac[0] = cpuId & 0x00000000000000FF;
-                mac[1] = (cpuId>>8) & 0x00000000000000FF;
-                mac[2] = (cpuId>>16) & 0x00000000000000FF;
-                mac[3] = (cpuId>>24) & 0x00000000000000FF;
-                mac[4] = (cpuId>>32) & 0x00000000000000FF;
-                mac[5] = (cpuId>>40) & 0x00000000000000FF;
-                char mac_str[20];
-                memset(mac_str,0,20);
-                sprintf(mac_str,"%02x:%02x:%02x:%02x:%02x:%02x",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
-                snprintf(buff,strlen(mac_str),"%s",mac_str);
+                // extern UINT64 Read_Crane_CPU_UID();
+                // UINT64 cpuId = Read_Crane_CPU_UID();
+                // char mac[6];
+                // memset(mac,0,6);
+                // mac[0] = cpuId & 0x00000000000000FF;
+                // mac[1] = (cpuId>>8) & 0x00000000000000FF;
+                // mac[2] = (cpuId>>16) & 0x00000000000000FF;
+                // mac[3] = (cpuId>>24) & 0x00000000000000FF;
+                // mac[4] = (cpuId>>32) & 0x00000000000000FF;
+                // mac[5] = (cpuId>>40) & 0x00000000000000FF;
+                // char mac_str[20];
+                // memset(mac_str,0,20);
+                // sprintf(mac_str,"%02x:%02x:%02x:%02x:%02x:%02x",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
+                // snprintf(buff,strlen(mac_str),"%s",mac_str);
+                snprintf(buff,buflen,"%s","***");
             }
             break;
         case 6604://rom
@@ -182,7 +183,7 @@ int myDMReadInfo(int resId,char **outbuff)
             snprintf(buff,buflen,"%s",REG_SYS_VERSION);
             break;
         case 6608://FIRMWARE VERSION
-            snprintf(buff,buflen,"%s",cmcc_dm_get_version());
+            snprintf(buff,buflen,"%s",REG_SOFTWAREVER);
             break;
         case 6609://FIRMWARE NAME
             snprintf(buff,buflen,"%s",REG_FIRMWARE_NAME);
@@ -216,7 +217,9 @@ int myDMReadInfo(int resId,char **outbuff)
             snprintf(buff,buflen,REG_BATTERY);
             break;
         case 6619://wear state
-            snprintf(buff,buflen,"%s",app_adaptor_get_wear_state()==0?"unwear":"wear");
+            // is_wearingstatus = 0;
+            // snprintf(buff,buflen,"%s",is_wearingstatus==0?"unwear":"wear");
+            snprintf(buff,buflen,"%s","δÅå´÷");
             break;
         case 6620://board version
             snprintf(buff,buflen,REG_BOARD);
@@ -240,7 +243,7 @@ int myDMReadInfo(int resId,char **outbuff)
 ///////////////////////////////
     if(iret==0)
     {
-        //申请的空间,sdk会释放
+        //ÉêÇëµÄ¿Õ¼ä,sdk»áÊÍ·Å
         *outbuff = (char*)malloc(strlen(buff)+1);
         strcpy(*outbuff,buff);
     }
@@ -256,20 +259,24 @@ enum DM_MSGID
 
 };
 
-
+char dm_send_msg_active_flag = 0;
 void dm_send_msg_active(void)
 {
+    lwm2m_printf("[%s:%d]1\n",__func__,__LINE__);
+    if(dm_send_msg_active_flag != 0)
+        return;
+    
     struct dmMsg apiMsg = { 0 };
     apiMsg.msgID = DM_ACTIVE_M2M_REQ;
     OSA_STATUS osaStatus;
-    lwm2m_printf("[%s:%d]\n",__func__,__LINE__);
+    lwm2m_printf("[%s:%d]2\n",__func__,__LINE__);
 
 #if 1
     s_quit = 0;
 #endif
     osaStatus = OSAMsgQSend(DMMsgQ, sizeof(apiMsg), (UINT8*)&apiMsg, OSA_NO_SUSPEND);
     DIAG_ASSERT(osaStatus == OS_SUCCESS);
-
+    dm_send_msg_active_flag = 1;
 }
 
 void dm_send_msg_deactive(void)
@@ -287,40 +294,45 @@ static void dm_main(void * argv)
     struct dmMsg apiMsg = { 0 };
     /*
        Options opt =
-       {"352099001761482", //CMEI/IMEI  ;和IMEI2选一个填，参考规范文档
-       "",                 //CMEI/IMEI2 ;和IMEI选一个填，参考规范文档
+       {"352099001761482", //CMEI/IMEI  ;ºÍIMEI2Ñ¡Ò»¸öÌ²Î¿¼¹æ·¶Îĵµ
+       "",                 //CMEI/IMEI2 ;ºÍIMEIÑ¡Ò»¸öÌ²Î¿¼¹æ·¶Îĵµ
        "460075551608160",  //IMSI;
-       "v2.0",             //DM版本号;固定v2.0
-       "M100000126",       //appkey;  需申请
-       "Ta79z58G4850k7B10Yu9o2gr037Dcg4c",                 //pwd秘钥; 需申请
-       4,                  //4或6； 表示ipv4，ipv6; 固定设为4;
-       "shipei.fxltsbl.com",        //服务器host or ip : shipei.fxltsbl.com
-       5683,               //服务器端口：一般为5683
-       300,                //更新间隔，心跳，生命周期：单位s,大于60s
-       56831,              //本地端口绑定
-       0                   //是否booststrap 0,not use; other n,use; 当前固定设为0；
+       "v2.0",             //DM°æ±¾ºÅ;¹Ì¶¨v2.0
+       "M100000126",       //appkey;  ÐèÉêÇë
+       "Ta79z58G4850k7B10Yu9o2gr037Dcg4c",                 //pwdÃØÔ¿; ÐèÉêÇë
+       4,                  //4»ò6£» ±íʾipv4£¬ipv6; ¹Ì¶¨ÉèΪ4;
+       "shipei.fxltsbl.com",        //·þÎñÆ÷host or ip : shipei.fxltsbl.com
+       5683,               //·þÎñÆ÷¶Ë¿Ú£ºÒ»°ãΪ5683
+       300,                //¸üмä¸ô£¬ÐÄÌø£¬ÉúÃüÖÜÆÚ£ºµ¥Î»s,´óÓÚ60s
+       56831,              //±¾µØ¶Ë¿Ú°ó¶¨
+       0                   //ÊÇ·ñbooststrap 0,not use; other n,use; µ±Ç°¹Ì¶¨ÉèΪ0£»
        };
     */
 
        //OptFuncs optfuncs={NULL,NULL};
-    //optfuncs.NotifyMsg  = myNotifyMsg;//sdk消息通知函数--no block
-    //optfuncs.DMReadInfo = myDMReadInfo;//采集设备信息的读函数--函数不能长时阻塞
+    //optfuncs.NotifyMsg  = myNotifyMsg;//sdkÏûϢ֪ͨº¯Êý--no block
+    //optfuncs.DMReadInfo = myDMReadInfo;//²É¼¯É豸ÐÅÏ¢µÄ¶Áº¯Êý--º¯Êý²»Äܳ¤Ê±×èÈû
        g_sdk_opt_funcs.NotifyMsg = myNotifyMsg;
        g_sdk_opt_funcs.DMReadInfo = myDMReadInfo;
 
        int nrunmode = 0; //no thread
-
+    cplog_printf("dm_main0!!\n");
+    //dm_send_msg_active();
     while(1){
         memset(&apiMsg,0,sizeof(struct dmMsg));
+        cplog_printf("dm_main0.1!!\n");
         OSAMsgQRecv(DMMsgQ, (UINT8 *)&apiMsg, DM_MESSAGE_Q_SIZE, OSA_SUSPEND);
         //signal(SIGINT, handle_sig);
         //init config
+        cplog_printf("dm_main0.2!!\n");
         int ret = LWM2M_SDK_INIT();
-
+        cplog_printf("dm_main0.3!!\n");
+        lwm2m_printf("dm_main0.3!!\n");
         if(nrunmode==0)
         {
             while(s_quit==0)
             {
+                cplog_printf("dm_main1!!\n");
                 lwm2m_printf("[%s:%d]to run in main thread\n",__func__,__LINE__);
                 ret = LWM2M_SDK_STOP();
                 ret = LWM2M_SDK_RUN(0);
@@ -336,10 +348,11 @@ static void dm_main(void * argv)
         }
         else
         {
+            cplog_printf("dm_main2.0!!\n");
             lwm2m_printf("to run in created thread\n");
             ret = LWM2M_SDK_RUN(1);
 
-
+            cplog_printf("dm_main2.1!!\n");
             int ntimes = 600;
             while(s_quit==0 && ntimes-- > 0)
             {
@@ -358,7 +371,7 @@ static void dm_main(void * argv)
 
         LWM2M_SDK_FINI();
         lwm2m_printf("main quit \n");
-
+        cplog_printf("dm_main3!!\n");
     }
        //return 0;
 }

diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h
index e5f8307..69593e5 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h
@@ -5,24 +5,25 @@
 #define REG_DEVINFO                        "ASR3603"
 #define REG_APPINFO                        "ASR 3603\r\n"
 #define REG_MAC                            "***"
-#define REG_ROM                            "16MB"
-#define REG_RAM                            "16MB"
-#define REG_CPU                            "ASR3603"
-#define REG_SYS_VERSION                    "RTOS 5.0"
+#define REG_ROM                            "***"
+#define REG_RAM                            "***"
+#define REG_CPU                            "***"
+#define REG_SYS_VERSION                    "***"
+#define REG_SOFTWAREVER                     "C55_DS_D11G_DT_HZCH"
 #define REG_FIRMWARE_VERSION               "***"
 #define REG_FIRMWARE_NAME                  "***"
-#define REG_VOLTE                          "1"
-#define REG_NET_TYPE                       "4G"
-#define REG_NET_ACCOUNT                    "Account"
+#define REG_VOLTE                          "***"
+#define REG_NET_TYPE                       "***"
+#define REG_NET_ACCOUNT                    "***"
 #define REG_PHONENUMBER                    "***"
-#define REG_LOCATION                       "LBS+WIFI"
+#define REG_LOCATION                       "***"
 #define REG_BRAND                          "***"
-#define REG_GPU                            "None"
+#define REG_GPU                            "***"
 #define REG_BOARD                          "***"
-#define REG_RESOLUTION                     "240x284"
-#define REG_SCREENSIZE                     "1.83"
-#define REG_BATTERY                        "800mAh"
-#define REG_ROUTER_MAC                     "None"
+#define REG_RESOLUTION                     "240x240"
+#define REG_SCREENSIZE                     "1.69"
+#define REG_BATTERY                        "***"
+#define REG_ROUTER_MAC                     "***"
 #define REG_NETWORK_STATUS                 "LTE"
 
 #endif