Merge branch 'yjq' into 'master'

Yjq

See merge request chenweican/k-sdk!6

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json

@@ -181,32 +181,37 @@
 		"productCode": "3057",
 		"productName": "邦德系列.白色声光传感器(KONKE)"
 	},{
-		"modleId": "",
-		"productCode": "",
-		"productName": ""
+		"modleId": "02020000",
+		"productCode": "3067",
+		"productName": "智能窗帘电机Z3S(KONKE)(说明：杜亚款)"
 	},{
-		"modleId": "",
-		"productCode": "",
-		"productName": ""
+		"modleId": "02020001",
+		"productCode": "3068",
+		"productName": "威刚系列.智能窗帘电机Z3S(KONKE)(说明：威士达款)"
 	},{
-		"modleId": "",
-		"productCode": "",
-		"productName": ""
+		"modleId": "01000002",
+		"productCode": "3069",
+		"productName": "双路智能灯控模块Z3S(KONKE)"
 	},{
-		"modleId": "",
-		"productCode": "",
-		"productName": ""
+		"modleId": "04028301",
+		"productCode": "3070",
+		"productName": "传感器模块Z3S(KONKE)"
+	},{
+		"modleId": "03300001",
+		"productCode": "3071",
+		"productName": "智能水阀控制器Z3S(KONKE)"
+	},{
+		"modleId": "03310001",
+		"productCode": "3072",
+		"productName": "智能燃气机械臂控制器Z3S(KONKE)"
+	},{
+		"modleId": "01020001",
+		"productCode": "3073",
+		"productName": "幻彩灯带控制器Z3S(KONKE)"
+	},{
+		"modleId": "00648631",
+		"productCode": "3077",
+		"productName": "多功能面板(亚运村临时项目)"
 	}
 	]
 }
-
-智能窗帘电机Z3S(KONKE)  （说明：杜亚款）	0x02020000	3067
-威刚系列.智能窗帘电机Z3S(KONKE)   （说明：威士达款）	0x02020001	3068
-双路智能灯控模块Z3S(KONKE)	0x01000002	3069
-传感器模块Z3S(KONKE)	0x04028301	3070
-智能水阀控制器Z3S(KONKE)	0x03300001	3071
-智能燃气机械臂控制器Z3S(KONKE)	0x03310001	3072
-幻彩灯带控制器Z3S(KONKE)	0x01020001	3073
-485转ZigBee模块Z3S(KONKE)		3074
-红外遥控器Z3S（亚运村临时项目)	0x00800000(透传)	1043
-多功能面板（亚运村临时项目）	0x00648631	3077

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_device_table_db.c

@@ -521,7 +521,7 @@ void kk_device_config_load_from_db(void)
 	kk_device_table_s *ptr = kk_zb_device_table;
 
 	while(ptr!=NULL){
-		if(ptr->productCode!=NULL){
+		if(ptr->productCode!=NULL&&strlen(ptr->productCode)!=0){
 			kk_device_config_map_add(ptr->productCode);
 		}
 		ptr = ptr->next;
@@ -538,9 +538,3 @@ void emberAfPluginDeviceTableInitialized(void)
 	kk_device_config_load_from_db();
 }
 
-
-
-
-
-
-