【修改内容】1，去掉一些调试打印；2，修改子设备离线后主机重启无法上报online的bug。

【提交人】陈伟灿

midware/midware/dm/kk_dm_mng.c

@@ -202,7 +202,7 @@ int dm_mgr_properities_db_create(kk_tsl_t* dev_shadow,char *deviceCode,int devTy
 	}
 }
 int dm_mgr_device_create(_IN_ int dev_type,_IN_ char productCode[PRODUCT_CODE_MAXLEN], _IN_ char deviceCode[DEVICE_CODE_MAXLEN],
-			_IN_ char mac[DEVICE_MAC_MAXLEN],_IN_ char fatherDeviceCode[DEVICE_CODE_MAXLEN], _OU_ int *devid)
+			_IN_ char mac[DEVICE_MAC_MAXLEN],_IN_ char fatherDeviceCode[DEVICE_CODE_MAXLEN],_IN_ int isOffline, _OU_ int *devid)
 {
     int res = 0;
     dm_mgr_ctx *ctx = _dm_mgr_get_ctx();
@@ -235,6 +235,7 @@ int dm_mgr_device_create(_IN_ int dev_type,_IN_ char productCode[PRODUCT_CODE_MA
 		node->devid = _dm_mgr_next_devid();
     node->dev_type = dev_type;
     node->dev_shadow = NULL;
+	node->isOffline = isOffline;
 	if (productCode != NULL) {
     	memcpy(node->productCode, productCode, strlen(productCode));
 	}
@@ -247,7 +248,7 @@ int dm_mgr_device_create(_IN_ int dev_type,_IN_ char productCode[PRODUCT_CODE_MA
     if (dev_type != KK_DM_DEVICE_CCU && fatherDeviceCode != NULL) {
         memcpy(node->fatherDeviceCode, fatherDeviceCode, strlen(fatherDeviceCode));
     }
-	node->timestamp = HAL_UptimeMs();
+	node->timestamp = 0;
     //node->dev_status = IOTX_DM_DEV_STATUS_AUTHORIZED;
 	tsl_str = kk_load_json(productCode, dev_type);
 	if(tsl_str != NULL)
@@ -402,7 +403,7 @@ int dm_mgr_check_heartbeat_timeout(uint64_t timestamp)
 			//return DEVICE_HEARTBEAT_TIMEOUT;
 		}
 		else{
-			if(search_node->isOffline == 1){//need send online 
+			if(search_node->isOffline == 1 && search_node->timestamp != 0) {//need send online 
 				INFO_PRINT("---------->dev online again,send online\n");
 				search_node->isOffline = 0;
 				iotx_dm_dev_online(search_node->devid);
@@ -473,7 +474,7 @@ int dm_mgr_init(void)
 
 	HAL_Get_mac(mac);
 	
-	res = dm_mgr_device_create(KK_DM_DEVICE_CCU,KK_DM_CCU_DEVICE_PRODUCT_CODE,"CCU_66666",mac,"",&devId);
+	res = dm_mgr_device_create(KK_DM_DEVICE_CCU,KK_DM_CCU_DEVICE_PRODUCT_CODE,"CCU_66666",mac,"",0,&devId);
 	if (res != SUCCESS_RETURN) {
 		goto ERROR;
 	}
@@ -1340,10 +1341,10 @@ int dm_mgr_ota_report_version(_IN_ int devid, char *version)
 
 
 int dm_mgr_subdev_create(int devtype,_IN_ char productCode[PRODUCT_CODE_MAXLEN], _IN_ char deviceCode[DEVICE_CODE_MAXLEN],
-		_IN_ char mac[DEVICE_MAC_MAXLEN],_IN_ char fatherDeviceCode[DEVICE_CODE_MAXLEN], _OU_ int *devid){
+		_IN_ char mac[DEVICE_MAC_MAXLEN],_IN_ char fatherDeviceCode[DEVICE_CODE_MAXLEN],_IN_ int isOffline, _OU_ int *devid){
     int res = 0;
     
-    res = dm_mgr_device_create(devtype,productCode,deviceCode,mac,fatherDeviceCode, devid);
+    res = dm_mgr_device_create(devtype,productCode,deviceCode,mac,fatherDeviceCode,isOffline,devid);
 	if(TSL_ALREADY_EXIST == res)
 	{
     	ERROR_PRINT("SUBDEV ALREADY EXIST!!!\n");

midware/midware/dm/kk_linkkit.c

@@ -1732,7 +1732,7 @@ int kk_mid_subdev_add(int devType, char productCode[PRODUCT_CODE_MAXLEN], char d
     int res = 0;
     int devid = 0;
 	
-    res = dm_mgr_subdev_create(devType,productCode,deviceCode,mac,fatherDeviceCode,&devid);
+    res = dm_mgr_subdev_create(devType,productCode,deviceCode,mac,fatherDeviceCode,0,&devid);
 	if (res != SUCCESS_RETURN && TSL_ALREADY_EXIST != res) {
         ERROR_PRINT("subdev create Failed\n");
         return FAIL_RETURN;

midware/midware/dm/kk_property_db.c

@@ -113,7 +113,7 @@ static int _kk_check_property_exist(const char* deviceCode,const char* identifie
 	const char *searchCmd = "select * from PropertiesInfo;";	
 	_kk_property_db_lock();
 	sqlite3_prepare_v2(ctx->pDb, searchCmd, strlen(searchCmd), &stmt, NULL);
-	INFO_PRINT("total_column = %d\n", sqlite3_column_count(stmt));
+	//INFO_PRINT("total_column = %d\n", sqlite3_column_count(stmt));
 	while(sqlite3_step(stmt) == SQLITE_ROW){
 	   pDeviceCode = sqlite3_column_text(stmt, DB_DEVICECODE);
 	   pIdentifier = sqlite3_column_text(stmt, DB_IDENTIFITER);
@@ -123,7 +123,7 @@ static int _kk_check_property_exist(const char* deviceCode,const char* identifie
 		 break;
 	   }
     }
-    INFO_PRINT("\n");
+    //INFO_PRINT("\n");
 	sqlite3_finalize(stmt);
 	_kk_property_db_unlock();
 	return isExist;
@@ -155,7 +155,7 @@ int kk_property_db_insert(const char *deviceCode,const char *identifier,kk_tsl_d
 	   ERROR_PRINT("SQL error: %s\n", zErrMsg);
 	   sqlite3_free(zErrMsg);
 	}else{
-	   INFO_PRINT("sub device insert data successfully\n");
+	   //INFO_PRINT("sub device insert data successfully\n");
 	}
 	sqlite3_free(sqlCmd);
 	_kk_property_db_unlock();
@@ -179,7 +179,7 @@ int kk_property_db_update_value(const char *deviceCode,const char *identifier,co
 	   ERROR_PRINT("SQL error: %s\n", zErrMsg);
 	   sqlite3_free(zErrMsg);
 	}else{
-	   DEBUG_PRINT("kk_property_db_update_value successfully\n");
+	   //DEBUG_PRINT("kk_property_db_update_value successfully\n");
 	}
 	sqlite3_free(sqlCmd);
 	_kk_property_db_unlock();

midware/midware/dm/kk_sub_db.c

@@ -103,10 +103,12 @@ static int _kk_load_subDevice(void)
 	_kk_subDb_lock();
 	sqlite3_prepare_v2(ctx->pDb, searchCmd, strlen(searchCmd), &stmt, NULL);
 	while(sqlite3_step(stmt) == SQLITE_ROW){
-		
-	   res = dm_mgr_subdev_create(sqlite3_column_int(stmt, DB_DEVTYPE),sqlite3_column_text(stmt, DB_PRODUCTCODE),
+	   res = dm_mgr_subdev_create(sqlite3_column_int(stmt, DB_DEVTYPE),
+	   					sqlite3_column_text(stmt, DB_PRODUCTCODE),
 	   					sqlite3_column_text(stmt, DB_DEVICECODE),
-	   					sqlite3_column_text(stmt, DB_MAC),sqlite3_column_text(stmt, DB_FATHERDEVICECODE),&devId);
+	   					sqlite3_column_text(stmt, DB_MAC),
+	   					sqlite3_column_text(stmt, DB_FATHERDEVICECODE),
+	   					sqlite3_column_int(stmt, DB_ONLINE),&devId);
 	
 	   if(res != SUCCESS_RETURN){
 		   ERROR_PRINT("[%s][%d]dm_mgr_subdev_create FAIL!!!\n",__FUNCTION__,__LINE__);
@@ -120,8 +122,8 @@ static int _kk_load_subDevice(void)
 	   
 	   //sync the data from property db
 	   kk_property_sync_values(sqlite3_column_text(stmt, DB_DEVICECODE));
-
 	   usleep(100000);
+	   
 	   //post the property to cloud
 	   dm_msg_thing_property_post_all(sqlite3_column_text(stmt, DB_DEVICECODE));
 	    //kk_dm_ota_report_version(devId,sqlite3_column_text(stmt, DB_VERSION));//post version
@@ -160,7 +162,7 @@ static int _kk_check_subDev_exist(const char* deviceCode)
 	const char *searchCmd = "select * from SubDeviceInfo;";	
 	_kk_subDb_lock();
 	sqlite3_prepare_v2(ctx->pDb, searchCmd, strlen(searchCmd), &stmt, NULL);
-	INFO_PRINT("total_column = %d\n", sqlite3_column_count(stmt));
+	//INFO_PRINT("total_column = %d\n", sqlite3_column_count(stmt));
 	while(sqlite3_step(stmt) == SQLITE_ROW){
 	   pmac = sqlite3_column_text(stmt, DB_DEVICECODE);
 	   if(!strcmp(deviceCode,pmac))
@@ -202,7 +204,7 @@ int kk_subDev_insert_db(int devType,char productCode[PRODUCT_CODE_MAXLEN], \
 	   ERROR_PRINT("SQL error: %s\n", zErrMsg);
 	   sqlite3_free(zErrMsg);
 	}else{
-	   INFO_PRINT("sub device insert data successfully\n");
+	   //INFO_PRINT("sub device insert data successfully\n");
 	}
 	sqlite3_free(sqlCmd);
 	ctx->subDevNum++;
@@ -226,7 +228,7 @@ int kk_subDev_delete_by_dcode(char deviceCode[DEVICE_CODE_MAXLEN])
 	   ERROR_PRINT("SQL error: %s\n", zErrMsg);
 	   sqlite3_free(zErrMsg);
 	}else{
-	   INFO_PRINT("Table delete data successfully\n");
+	   //INFO_PRINT("Table delete data successfully\n");
 	}
 	sqlite3_free(sqlCmd);
 	_kk_subDb_unlock();
@@ -241,7 +243,7 @@ int kk_subDev_update_offline(int isOffline,const char *deviceCode)
 	char *zErrMsg = 0;
 	kk_subDb_ctx_t *ctx = _kk_subDb_get_ctx();
 
-	_kk_subDb_lock();
+	//_kk_subDb_lock();
 	sqlCmd = sqlite3_mprintf("UPDATE SubDeviceInfo SET isOffline=%d  WHERE deviceCode= '%s'",isOffline,deviceCode);	
 	INFO_PRINT("kk_subDev_update_offline sqlCmd:%s\n",sqlCmd);
 	rc = sqlite3_exec(ctx->pDb, sqlCmd, NULL, NULL, &zErrMsg);
@@ -249,10 +251,10 @@ int kk_subDev_update_offline(int isOffline,const char *deviceCode)
 	   ERROR_PRINT("SQL error: %s\n", zErrMsg);
 	   sqlite3_free(zErrMsg);
 	}else{
-	   INFO_PRINT("Table updata data successfully\n");
+	   //INFO_PRINT("Table updata data successfully\n");
 	}
     sqlite3_free(sqlCmd);
-	_kk_subDb_unlock();
+	//_kk_subDb_unlock();
 	return SUCCESS_RETURN;
 }
 int kk_subDev_update_auth(int isAuth,const char *deviceCode)