11111

platform/zigbee/app/builder/Z3GatewayHost/Makefile

@@ -88,6 +88,7 @@ INCLUDES= \
   -I../../../platform/base/hal/micro/unix/host/board \
   -I./rpc_api/inc \
   -I../../../../../common/sqlite/ \
+  -I../../../../../common/curl/include \
   -I./ZB
  \
 
@@ -287,6 +288,7 @@ APPLICATION_FILES= \
   ./ZB/kk_tsl_property_set.c\
   ./ZB/kk_device_table_db.c\
   ./ZB/kk_msg_report.c\
+  ./ZB/kk_plat_ota.c\
   ./kk_test.c\
   ./kk_sub_tsl.c\
   ./kk_tsl_zigbee_map.c\
@@ -376,10 +378,10 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
 else
 $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
 ifeq ($(CONFIG_VENDOR),ubuntu)
-	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -lsqlite_ubuntu -ldl -o  $(TARGET_FILE)
+	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -lsqlite_ubuntu -lcurl_ubuntu -ldl -o  $(TARGET_FILE)
 	@echo -e '\n$@ build success'
 else
-	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite -o  $(TARGET_FILE)
+	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite -lcurl -o  $(TARGET_FILE)
 	@echo -e '\n$@ build success'
 endif	
 endif

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

@@ -13,14 +13,6 @@
 		"productCode": "3003",
 		"productName": "星辰系列.白色零火线三路灯控面板Z3S(KONKE)"
 	},{
-<<<<<<<<< Temporary merge branch 1
-		"modleId": "01020001",
-		"productCode": "3073",
-		"productName": "幻彩灯带控制器Z3S(KONKE)"
-	}
-	]
-}	
-=========
 		"modleId": "00048611",
 		"productCode": "3004",
 		"productName": "星辰系列.白色零火线情景面板Z3S(KONKE)"
@@ -222,7 +214,4 @@
 		"productName": "多功能面板(亚运村临时项目)"
 	}
 	]
-}	
-	
-		
->>>>>>>>> Temporary merge branch 2
+}

platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c

@@ -238,7 +238,7 @@ void _cb(void* data, int len, char* chlmark){
                 
 			    if (info!=NULL&&strstr(rpc_cJSON_GetObjectItem(info, "msgType")->valuestring,KK_THING_OTA_DEVICE_UPGRADE) != NULL){
 			         
-                    //kk_ota_process(root);
+                    kk_ota_process(root);
 			    }else{
 				    eval_request(&my_server, root);
 				}