Merge branch 'cwc' into 'master'

【修改内容】更新物模型

See merge request chenweican/k-sdk!64

tsl/ccu-12.json

-{
-	"schema": "https://iot-ap.ikonke.com/model/ccu_12.json",
-	"productType": "ccu",
-	"profile": {
-		"productCode": "12",
-		"productName": "主机"
-	},
-	"properties": [{
-		"identifier": "SN",
-		"dataType": {
-			"specs": {
-				"length": "50"
-			},
-			"type": "text"
-		},
-		"name": "设备SN",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "MACAddress",
-		"dataType": {
-			"specs": {
-				"length": "128"
-			},
-			"type": "text"
-		},
-		"name": "MAC地址",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "LanIPAddress",
-		"dataType": {
-			"specs": {
-				"length": "255"
-			},
-			"type": "text"
-		},
-		"name": "内网IP地址",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "WanIPAddress",
-		"dataType": {
-			"specs": {
-				"length": "255"
-			},
-			"type": "text"
-		},
-		"name": "内网IP地址",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "WanState",
-		"dataType": {
-			"specs": {
-				"0": "无外网",
-				"1": "有外网"
-			},
-			"type": "bool"
-		},
-		"name": "外网链路状态",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "IOTCloudState",
-		"dataType": {
-			"specs": {
-				"0": "无服务",
-				"1": "有服务"
-			},
-			"type": "bool"
-		},
-		"name": "云服务状态",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "Version",
-		"dataType": {
-			"specs": {
-				"length": "255"
-			},
-			"type": "text"
-		},
-		"name": "版本",
-		"accessMode": "r",
-		"required": false
-	}],
-	"services": [{
-		"outputData": [],
-		"identifier": "set",
-		"inputData": [],
-		"method": "thing.service.property.set",
-		"name": "set",
-		"required": true,
-		"callType": "async",
-		"desc": "属性设置"
-	}, {
-		"outputData": [{
-			"identifier": "SN",
-			"dataType": {
-				"specs": {
-					"length": "50"
-				},
-				"type": "text"
-			},
-			"name": "设备SN"
-		}, {
-			"identifier": "MACAddress",
-			"dataType": {
-				"specs": {
-					"length": "128"
-				},
-				"type": "text"
-			},
-			"name": "MAC地址"
-		}, {
-			"identifier": "LanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanState",
-			"dataType": {
-				"specs": {
-					"0": "无外网",
-					"1": "有外网"
-				},
-				"type": "bool"
-			},
-			"name": "外网链路状态"
-		}, {
-			"identifier": "IOTCloudState",
-			"dataType": {
-				"specs": {
-					"0": "无服务",
-					"1": "有服务"
-				},
-				"type": "bool"
-			},
-			"name": "云服务状态"
-		}, {
-			"identifier": "Version",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "版本"
-		}],
-		"identifier": "get",
-		"inputData": ["SN", "MACAddress", "LanIPAddress", "WanIPAddress", "IOTCloudState", "Version"],
-		"method": "thing.service.property.get",
-		"name": "get",
-		"required": true,
-		"callType": "async",
-		"desc": "属性获取"
-	}, {
-		"outputData": [],
-		"identifier": "reboot",
-		"inputData": [],
-		"method": "thing.service.reboot",
-		"name": "reboot",
-		"required": false,
-		"callType": "async",
-		"desc": "重启"
-	}, {
-		"outputData": [],
-		"identifier": "addRoom",
-		"inputData": [{
-			"identifier": "roomName",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间名字"
-		}],
-		"method": "thing.service.addRoom",
-		"name": "addRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "添加房间"
-	}, {
-		"outputData": [],
-		"identifier": "addDeviceToRoom",
-		"inputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}, {
-			"identifier": "deviceCode",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "设备编码"
-		}, {
-			"identifier": "epNum",
-			"dataType": {
-				"specs": {
-					"length": "10"
-				},
-				"type": "text"
-			},
-			"name": "设备路数"
-		}],
-		"method": "thing.service.addDeviceToRoom",
-		"name": "addDeviceToRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "添加设备到房间"
-	}, {
-		"outputData": [],
-		"identifier": "removeDeviceFromRoom",
-		"inputData": [{
-			"identifier": "deviceCode",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "设备编码"
-		}, {
-			"identifier": "epNum",
-			"dataType": {
-				"specs": {
-					"length": "10"
-				},
-				"type": "text"
-			},
-			"name": "设备路数"
-		}],
-		"method": "thing.service.removeDeviceFromRoom",
-		"name": "removeDeviceFromRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "移除设备从房间"
-	}, {
-		"outputData": [],
-		"identifier": "deleteRoom",
-		"inputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}],
-		"method": "thing.service.deleteRoom",
-		"name": "deleteRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "删除房间"
-	}, {
-		"outputData": [],
-		"identifier": "executeRoom",
-		"inputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}, {
-			"identifier": "productType",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "产品类别"
-		}, {
-			"identifier": "action",
-			"dataType": {
-				"type": "struct",
-				"specs": [{
-					"identifier": "PowerSwitch",
-					"dataType": {
-						"specs": {
-							"0": "关闭",
-							"1": "打开"
-						},
-						"type": "bool"
-					},
-					"name": "电源开关"
-				}]
-			},
-			"name": "动作"
-		}],
-		"method": "thing.service.executeRoom",
-		"name": "executeRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "批量执行房间设备"
-	}],
-	"events": [{
-		"outputData": [{
-			"identifier": "SN",
-			"dataType": {
-				"specs": {
-					"length": "50"
-				},
-				"type": "text"
-			},
-			"name": "设备SN"
-		}, {
-			"identifier": "MACAddress",
-			"dataType": {
-				"specs": {
-					"length": "128"
-				},
-				"type": "text"
-			},
-			"name": "MAC地址"
-		}, {
-			"identifier": "LanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanState",
-			"dataType": {
-				"specs": {
-					"0": "无外网",
-					"1": "有外网"
-				},
-				"type": "bool"
-			},
-			"name": "外网链路状态"
-		}, {
-			"identifier": "IOTCloudState",
-			"dataType": {
-				"specs": {
-					"0": "无服务",
-					"1": "有服务"
-				},
-				"type": "bool"
-			},
-			"name": "云服务状态"
-		}, {
-			"identifier": "Version",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "版本"
-		}],
-		"identifier": "property",
-		"method": "thing.event.property.post",
-		"name": "property",
-		"type": "info",
-		"required": true,
-		"desc": "属性上报"
-	}, {
-		"outputData": [],
-		"identifier": "rebootNotification",
-		"method": "thing.event.rebootNotification.post",
-		"name": "重启通知消息",
-		"type": "info",
-		"required": true
-	}, {
-		"outputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}],
-		"identifier": "addRoomNotification",
-		"method": "thing.event.addRoomNotification.post",
-		"name": "房间添加通知消息",
-		"type": "info",
-		"required": true
-	}, {
-		"outputData": [{
-			"identifier": "ErrorCode",
-			"dataType": {
-				"specs": {
-					"0": "正常"
-				},
-				"type": "enum"
-			},
-			"name": "故障代码"
-		}],
-		"identifier": "error",
-		"method": "thing.event.error.post",
-		"name": "故障上报",
-		"type": "error",
-		"required": true
-	}]
-}
\ No newline at end of file

tsl/ccu-15.json

-{
-	"schema": "https://iot-ap.ikonke.com/model/ccu_15.json",
-	"productType": "ccu",
-	"profile": {
-		"productCode": "15",
-		"productName": "主机"
-	},
-	"properties": [{
-		"identifier": "SN",
-		"dataType": {
-			"specs": {
-				"length": "50"
-			},
-			"type": "text"
-		},
-		"name": "设备SN",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "MACAddress",
-		"dataType": {
-			"specs": {
-				"length": "128"
-			},
-			"type": "text"
-		},
-		"name": "MAC地址",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "LanIPAddress",
-		"dataType": {
-			"specs": {
-				"length": "255"
-			},
-			"type": "text"
-		},
-		"name": "内网IP地址",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "WanIPAddress",
-		"dataType": {
-			"specs": {
-				"length": "255"
-			},
-			"type": "text"
-		},
-		"name": "内网IP地址",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "WanState",
-		"dataType": {
-			"specs": {
-				"0": "无外网",
-				"1": "有外网"
-			},
-			"type": "bool"
-		},
-		"name": "外网链路状态",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "IOTCloudState",
-		"dataType": {
-			"specs": {
-				"0": "无服务",
-				"1": "有服务"
-			},
-			"type": "bool"
-		},
-		"name": "云服务状态",
-		"accessMode": "r",
-		"required": false
-	}, {
-		"identifier": "Version",
-		"dataType": {
-			"specs": {
-				"length": "255"
-			},
-			"type": "text"
-		},
-		"name": "版本",
-		"accessMode": "r",
-		"required": false
-	}],
-	"services": [{
-		"outputData": [],
-		"identifier": "set",
-		"inputData": [],
-		"method": "thing.service.property.set",
-		"name": "set",
-		"required": true,
-		"callType": "async",
-		"desc": "属性设置"
-	}, {
-		"outputData": [{
-			"identifier": "SN",
-			"dataType": {
-				"specs": {
-					"length": "50"
-				},
-				"type": "text"
-			},
-			"name": "设备SN"
-		}, {
-			"identifier": "MACAddress",
-			"dataType": {
-				"specs": {
-					"length": "128"
-				},
-				"type": "text"
-			},
-			"name": "MAC地址"
-		}, {
-			"identifier": "LanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanState",
-			"dataType": {
-				"specs": {
-					"0": "无外网",
-					"1": "有外网"
-				},
-				"type": "bool"
-			},
-			"name": "外网链路状态"
-		}, {
-			"identifier": "IOTCloudState",
-			"dataType": {
-				"specs": {
-					"0": "无服务",
-					"1": "有服务"
-				},
-				"type": "bool"
-			},
-			"name": "云服务状态"
-		}, {
-			"identifier": "Version",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "版本"
-		}],
-		"identifier": "get",
-		"inputData": ["SN", "MACAddress", "LanIPAddress", "WanIPAddress", "IOTCloudState", "Version"],
-		"method": "thing.service.property.get",
-		"name": "get",
-		"required": true,
-		"callType": "async",
-		"desc": "属性获取"
-	}, {
-		"outputData": [],
-		"identifier": "reboot",
-		"inputData": [],
-		"method": "thing.service.reboot",
-		"name": "reboot",
-		"required": false,
-		"callType": "async",
-		"desc": "重启"
-	}, {
-		"outputData": [],
-		"identifier": "addRoom",
-		"inputData": [{
-			"identifier": "roomName",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间名字"
-		}],
-		"method": "thing.service.addRoom",
-		"name": "addRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "添加房间"
-	}, {
-		"outputData": [],
-		"identifier": "addDeviceToRoom",
-		"inputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}, {
-			"identifier": "deviceCode",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "设备编码"
-		}, {
-			"identifier": "epNum",
-			"dataType": {
-				"specs": {
-					"length": "10"
-				},
-				"type": "text"
-			},
-			"name": "设备路数"
-		}],
-		"method": "thing.service.addDeviceToRoom",
-		"name": "addDeviceToRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "添加设备到房间"
-	}, {
-		"outputData": [],
-		"identifier": "removeDeviceFromRoom",
-		"inputData": [{
-			"identifier": "deviceCode",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "设备编码"
-		}, {
-			"identifier": "epNum",
-			"dataType": {
-				"specs": {
-					"length": "10"
-				},
-				"type": "text"
-			},
-			"name": "设备路数"
-		}],
-		"method": "thing.service.removeDeviceFromRoom",
-		"name": "removeDeviceFromRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "移除设备从房间"
-	}, {
-		"outputData": [],
-		"identifier": "deleteRoom",
-		"inputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}],
-		"method": "thing.service.deleteRoom",
-		"name": "deleteRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "删除房间"
-	}, {
-		"outputData": [],
-		"identifier": "executeRoom",
-		"inputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}, {
-			"identifier": "productType",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "产品类别"
-		}, {
-			"identifier": "action",
-			"dataType": {
-				"type": "struct",
-				"specs": [{
-					"identifier": "PowerSwitch",
-					"dataType": {
-						"specs": {
-							"0": "关闭",
-							"1": "打开"
-						},
-						"type": "bool"
-					},
-					"name": "电源开关"
-				}]
-			},
-			"name": "动作"
-		}],
-		"method": "thing.service.executeRoom",
-		"name": "executeRoom",
-		"required": true,
-		"callType": "async",
-		"desc": "批量执行房间设备"
-	}],
-	"events": [{
-		"outputData": [{
-			"identifier": "SN",
-			"dataType": {
-				"specs": {
-					"length": "50"
-				},
-				"type": "text"
-			},
-			"name": "设备SN"
-		}, {
-			"identifier": "MACAddress",
-			"dataType": {
-				"specs": {
-					"length": "128"
-				},
-				"type": "text"
-			},
-			"name": "MAC地址"
-		}, {
-			"identifier": "LanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanIPAddress",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "内网IP地址"
-		}, {
-			"identifier": "WanState",
-			"dataType": {
-				"specs": {
-					"0": "无外网",
-					"1": "有外网"
-				},
-				"type": "bool"
-			},
-			"name": "外网链路状态"
-		}, {
-			"identifier": "IOTCloudState",
-			"dataType": {
-				"specs": {
-					"0": "无服务",
-					"1": "有服务"
-				},
-				"type": "bool"
-			},
-			"name": "云服务状态"
-		}, {
-			"identifier": "Version",
-			"dataType": {
-				"specs": {
-					"length": "255"
-				},
-				"type": "text"
-			},
-			"name": "版本"
-		}],
-		"identifier": "property",
-		"method": "thing.event.property.post",
-		"name": "property",
-		"type": "info",
-		"required": true,
-		"desc": "属性上报"
-	}, {
-		"outputData": [],
-		"identifier": "rebootNotification",
-		"method": "thing.event.rebootNotification.post",
-		"name": "重启通知消息",
-		"type": "info",
-		"required": true
-	}, {
-		"outputData": [{
-			"identifier": "roomId",
-			"dataType": {
-				"specs": {
-					"length": "256"
-				},
-				"type": "text"
-			},
-			"name": "房间id"
-		}],
-		"identifier": "addRoomNotification",
-		"method": "thing.event.addRoomNotification.post",
-		"name": "房间添加通知消息",
-		"type": "info",
-		"required": true
-	}, {
-		"outputData": [{
-			"identifier": "ErrorCode",
-			"dataType": {
-				"specs": {
-					"0": "正常"
-				},
-				"type": "enum"
-			},
-			"name": "故障代码"
-		}],
-		"identifier": "error",
-		"method": "thing.event.error.post",
-		"name": "故障上报",
-		"type": "error",
-		"required": true
-	}]
-}
\ No newline at end of file

tsl/gateway-2.json → tsl/gateway_2.json

 {
-    "schema":"https://iotx-tsl.oss-ap-southeast-1.aliyuncs.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/gateway_2.json",
     "productType":"gw",
     "profile":{
-        "type":"KONKE_ZIGBEE_Gateway"
+		"heartbeat": "3000",
+		"productCode": "2",
+		"productName": "网关"
     },
     "properties":[
         {

tsl/product_1002.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_1002.json",
 	"productType": "switch",
 	"profile": {
+		"heartbeat": "3000",	
 		"productCode": "1002",
 		"productName": "铂金系列一路灯控"
 	},
@@ -43,6 +44,24 @@
 		"required": true,
 		"callType": "async",
 		"desc": "属性获取"
+	}, {
+		"outputData": [],
+		"identifier": "negativeProperty",
+		"inputData": [{
+			"identifier": "PropertyName",
+			"dataType": {
+				"specs": {
+					"length": "50"
+				},
+				"type": "text"
+			},
+			"name": "属性名字"
+		}],
+		"method": "thing.service.negativeProperty",
+		"name": "negativeProperty",
+		"required": true,
+		"callType": "async",
+		"desc": "属性值取反"
 	}],
 	"properties": [{
 		"identifier": "PowerSwitch",

tsl/product_1003.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_1003.json",
 	"productType": "switch",
 	"profile": {
+		"heartbeat": "3000",
 		"productCode": "1003",
 		"productName": "铂金系列二路灯控"
 	},
@@ -63,6 +64,24 @@
 		"required": true,
 		"callType": "async",
 		"desc": "属性获取"
+	}, {
+		"outputData": [],
+		"identifier": "negativeProperty",
+		"inputData": [{
+			"identifier": "PropertyName",
+			"dataType": {
+				"specs": {
+					"length": "50"
+				},
+				"type": "text"
+			},
+			"name": "属性名字"
+		}],
+		"method": "thing.service.negativeProperty",
+		"name": "negativeProperty",
+		"required": true,
+		"callType": "async",
+		"desc": "属性值取反"
 	}],
 	"properties": [{
 		"identifier": "PowerSwitch_1",

tsl/product_1004.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_1004.json",
 	"productType": "switch",
 	"profile": {
+		"heartbeat": "3000",	
 		"productCode": "1004",
 		"productName": "铂金系列三路灯控 "
 	},
@@ -83,6 +84,24 @@
 		"required": true,
 		"callType": "async",
 		"desc": "属性获取"
+	}, {
+		"outputData": [],
+		"identifier": "negativeProperty",
+		"inputData": [{
+			"identifier": "PropertyName",
+			"dataType": {
+				"specs": {
+					"length": "50"
+				},
+				"type": "text"
+			},
+			"name": "属性名字"
+		}],
+		"method": "thing.service.negativeProperty",
+		"name": "negativeProperty",
+		"required": true,
+		"callType": "async",
+		"desc": "属性值取反"
 	}],
 	"properties": [{
 		"identifier": "PowerSwitch_1",

tsl/product_1007.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_1007.json",
 	"productType": "curtain",
 	"profile": {
+		"heartbeat": "3000",	
 		"productCode": "1007",
 		"productName": "铂金系列推窗面板"
 	},

tsl/product_1008.json

@@ -30,9 +30,19 @@
 					"step": "0.01"
 				}
 			}
+		}, {
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
 		}],
 		"identifier": "get",
-		"inputData": ["SosState", "Battery"],
+		"inputData": ["SosState", "Battery", "DismantleState"],
 		"method": "thing.service.property.get",
 		"name": "get",
 		"required": true,
@@ -66,6 +76,18 @@
 				"step": "0.01"
 			}
 		}
+	}, {
+		"identifier": "DismantleState",
+		"name": "拆卸状态",
+		"accessMode": "r",
+		"required": false,
+		"dataType": {
+			"type": "enum",
+			"specs": {
+				"0": "正常",
+				"1": "被拆卸"
+			}
+		}
 	}],
 	"events": [{
 		"outputData": [{
@@ -91,6 +113,16 @@
 					"step": "0.01"
 				}
 			}
+		}, {
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
 		}],
 		"identifier": "property",
 		"method": "thing.event.property.post",
@@ -111,7 +143,7 @@
 			}
 		}],
 		"identifier": "sosAlarm",
-		"method": "thing.event.alarm.post",
+		"method": "thing.event.sosAlarm.post",
 		"name": "sosAlarm",
 		"type": "alarm",
 		"required": true,
@@ -132,7 +164,7 @@
 			}
 		}],
 		"identifier": "BatteryAlarm",
-		"method": "thing.event.alarm.post",
+		"method": "thing.event.BatteryAlarm.post",
 		"name": "BatteryAlarm",
 		"type": "alarm",
 		"required": true,
@@ -143,6 +175,16 @@
 		"type": "alert",
 		"required": true,
 		"method": "thing.event.TamperAlarm.post",
-		"outputData": []
+		"outputData": [{
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
+		}]
 	}]
 }
\ No newline at end of file

tsl/product_1012.json

@@ -30,9 +30,19 @@
 					"step": "0.01"
 				}
 			}
+		}, {
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
 		}],
 		"identifier": "get",
-		"inputData": ["SosState", "Battery"],
+		"inputData": ["SosState", "Battery", "DismantleState"],
 		"method": "thing.service.property.get",
 		"name": "get",
 		"required": true,
@@ -66,6 +76,18 @@
 				"step": "0.01"
 			}
 		}
+	}, {
+		"identifier": "DismantleState",
+		"name": "拆卸状态",
+		"accessMode": "r",
+		"required": false,
+		"dataType": {
+			"type": "enum",
+			"specs": {
+				"0": "正常",
+				"1": "被拆卸"
+			}
+		}
 	}],
 	"events": [{
 		"outputData": [{
@@ -91,6 +113,16 @@
 					"step": "0.01"
 				}
 			}
+		}, {
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
 		}],
 		"identifier": "property",
 		"method": "thing.event.property.post",
@@ -111,7 +143,7 @@
 			}
 		}],
 		"identifier": "sosAlarm",
-		"method": "thing.event.alarm.post",
+		"method": "thing.event.sosAlarm.post",
 		"name": "sosAlarm",
 		"type": "alarm",
 		"required": true,
@@ -132,7 +164,7 @@
 			}
 		}],
 		"identifier": "BatteryAlarm",
-		"method": "thing.event.alarm.post",
+		"method": "thing.event.BatteryAlarm.post",
 		"name": "BatteryAlarm",
 		"type": "alarm",
 		"required": true,
@@ -143,6 +175,16 @@
 		"type": "alert",
 		"required": true,
 		"method": "thing.event.TamperAlarm.post",
-		"outputData": []
+		"outputData": [{
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
+		}]
 	}]
 }
\ No newline at end of file

tsl/product_1015.json

@@ -30,9 +30,19 @@
 					"step": "0.01"
 				}
 			}
+		}, {
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
 		}],
 		"identifier": "get",
-		"inputData": ["GasSensorState", "Battery"],
+		"inputData": ["GasSensorState", "Battery", "DismantleState"],
 		"method": "thing.service.property.get",
 		"name": "get",
 		"required": true,
@@ -66,6 +76,18 @@
 				"step": "0.01"
 			}
 		}
+	}, {
+		"identifier": "DismantleState",
+		"name": "拆卸状态",
+		"accessMode": "r",
+		"required": false,
+		"dataType": {
+			"type": "enum",
+			"specs": {
+				"0": "正常",
+				"1": "被拆卸"
+			}
+		}
 	}],
 	"events": [{
 		"outputData": [{
@@ -91,6 +113,16 @@
 					"step": "0.01"
 				}
 			}
+		}, {
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
 		}],
 		"identifier": "property",
 		"method": "thing.event.property.post",
@@ -111,7 +143,7 @@
 			}
 		}],
 		"identifier": "gasAlarm",
-		"method": "thing.event.alarm.post",
+		"method": "thing.event.gasAlarm.post",
 		"name": "gasAlarm",
 		"type": "alarm",
 		"required": true,
@@ -132,7 +164,7 @@
 			}
 		}],
 		"identifier": "BatteryAlarm",
-		"method": "thing.event.alarm.post",
+		"method": "thing.event.BatteryAlarm.post",
 		"name": "batteryAlarm",
 		"type": "alarm",
 		"required": true,
@@ -143,6 +175,16 @@
 		"type": "alert",
 		"required": true,
 		"method": "thing.event.TamperAlarm.post",
-		"outputData": []
+		"outputData": [{
+			"identifier": "DismantleState",
+			"name": "拆卸状态",
+			"dataType": {
+				"type": "enum",
+				"specs": {
+					"0": "正常",
+					"1": "被拆卸"
+				}
+			}
+		}]
 	}]
 }
\ No newline at end of file

tsl/product_1018.json

+{
+	"schema": "https://iot-ap.ikonke.com/model/product_1018.json",
+	"productType": "curtain",
+	"profile": {
+		"heartbeat": "3000",
+		"productCode": "1018",
+		"productName": "杜亚窗帘电机"
+	},
+	"services": [{
+		"outputData": [],
+		"identifier": "set",
+		"inputData": [{
+			"identifier": "OperationMode",
+			"dataType": {
+				"specs": {
+					"0": "关闭",
+					"1": "开启",
+					"2": "暂停"
+				},
+				"type": "enum"
+			},
+			"name": "窗帘操作模式"
+		}, {
+			"identifier": "Position",
+			"dataType": {
+				"specs": {
+					"unit": "%",
+					"min": "0",
+					"unitName": "百分比",
+					"max": "100",
+					"step": "1"
+				},
+				"type": "int"
+			},
+			"name": "窗帘打开位置"
+		}, {
+			"identifier": "WorkMode",
+			"dataType": {
+				"specs": {
+					"0": "正转",
+					"1": "反转",
+					"2": "校验"
+				},
+				"type": "enum"
+			},
+			"name": "窗帘工作模式"
+		}, {
+			"identifier": "RouteState",
+			"dataType": {
+				"specs": {
+					"0": "未设置",
+					"1": "已设置"
+				},
+				"type": "enum"
+			},
+			"name": "行程设置"
+		}],
+		"method": "thing.service.property.set",
+		"name": "set",
+		"required": true,
+		"callType": "async",
+		"desc": "属性设置"
+	}, {
+		"outputData": [{
+			"identifier": "OperationMode",
+			"dataType": {
+				"specs": {
+					"0": "关闭",
+					"1": "开启",
+					"2": "暂停"
+				},
+				"type": "enum"
+			},
+			"name": "窗帘操作模式"
+		}, {
+			"identifier": "Position",
+			"dataType": {
+				"specs": {
+					"unit": "%",
+					"min": "0",
+					"unitName": "百分比",
+					"max": "100",
+					"step": "1"
+				},
+				"type": "int"
+			},
+			"name": "窗帘打开位置"
+		}, {
+			"identifier": "WorkMode",
+			"dataType": {
+				"specs": {
+					"0": "正转",
+					"1": "反转",
+					"2": "校验"
+				},
+				"type": "enum"
+			},
+			"name": "窗帘工作模式"
+		}, {
+			"identifier": "RouteState",
+			"dataType": {
+				"specs": {
+					"0": "未设置",
+					"1": "已设置"
+				},
+				"type": "enum"
+			},
+			"name": "行程设置"
+		}],
+		"identifier": "get",
+		"inputData": ["OperationMode", "Position", "WorkMode", "RouteState"],
+		"method": "thing.service.property.get",
+		"name": "get",
+		"required": true,
+		"callType": "async",
+		"desc": "属性获取"
+	}],
+	"properties": [{
+		"identifier": "OperationMode",
+		"dataType": {
+			"specs": {
+				"0": "关闭",
+				"1": "开启",
+				"2": "暂停"
+			},
+			"type": "enum"
+		},
+		"name": "窗帘操作模式",
+		"accessMode": "rw",
+		"required": true
+	}, {
+		"identifier": "WorkMode",
+		"dataType": {
+			"specs": {
+				"0": "正转",
+				"1": "反转",
+				"2": "校验"
+			},
+			"type": "enum"
+		},
+		"name": "窗帘工作模式",
+		"accessMode": "rw",
+		"required": true
+	}, {
+		"identifier": "Position",
+		"dataType": {
+			"specs": {
+				"unit": "%",
+				"min": "0",
+				"unitName": "百分比",
+				"max": "100",
+				"step": "1"
+			},
+			"type": "int"
+		},
+		"name": "窗帘打开位置",
+		"accessMode": "rw",
+		"required": true
+	}, {
+		"identifier": "RouteState",
+		"dataType": {
+			"specs": {
+				"0": "未设置",
+				"1": "已设置"
+			},
+			"type": "enum"
+		},
+		"accessMode": "rw",
+		"required": true,
+		"name": "行程设置"
+	}],
+	"events": [{
+		"outputData": [{
+			"identifier": "OperationMode",
+			"dataType": {
+				"specs": {
+					"0": "关闭",
+					"1": "开启",
+					"2": "暂停"
+				},
+				"type": "enum"
+			},
+			"name": "窗帘操作模式"
+		}, {
+			"identifier": "Position",
+			"dataType": {
+				"specs": {
+					"unit": "%",
+					"min": "0",
+					"unitName": "百分比",
+					"max": "100",
+					"step": "1"
+				},
+				"type": "int"
+			},
+			"name": "窗帘打开位置"
+		}, {
+			"identifier": "WorkMode",
+			"dataType": {
+				"specs": {
+					"0": "正转",
+					"1": "反转",
+					"2": "校验"
+				},
+				"type": "enum"
+			},
+			"name": "窗帘工作模式"
+		}, {
+			"identifier": "RouteState",
+			"dataType": {
+				"specs": {
+					"0": "未设置",
+					"1": "已设置"
+				},
+				"type": "enum"
+			},
+			"name": "行程设置"
+		}],
+		"identifier": "property",
+		"method": "thing.event.property.post",
+		"name": "property",
+		"type": "info",
+		"required": true,
+		"desc": "属性上报"
+	}]
+}
\ No newline at end of file

tsl/product_102.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_102.json",
 	"productType": "switch",
 	"profile": {
+		"heartbeat": "3000",	
 		"productCode": "102",
 		"productName": "一路零火面板（肖邦系列）定制版"
 	},
@@ -43,6 +44,24 @@
 		"required": true,
 		"callType": "async",
 		"desc": "属性获取"
+	}, {
+		"outputData": [],
+		"identifier": "negativeProperty",
+		"inputData": [{
+			"identifier": "PropertyName",
+			"dataType": {
+				"specs": {
+					"length": "50"
+				},
+				"type": "text"
+			},
+			"name": "属性名字"
+		}],
+		"method": "thing.service.negativeProperty",
+		"name": "negativeProperty",
+		"required": true,
+		"callType": "async",
+		"desc": "属性值取反"
 	}],
 	"properties": [{
 		"identifier": "PowerSwitch",

tsl/product_1022.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_1022.json",
 	"productType": "light",
 	"profile": {
+		"heartbeat": "3000",	
 		"productCode": "1022",
 		"productName": "RGBW灯带"
 	},

tsl/product_1030.json

@@ -4,7 +4,8 @@
 	"profile": {
 		"heartbeat": "3000",
 		"productCode": "1030",
-		"productName": "B1门锁"
+		"productName": "B1门锁",
+		"sleepTime": "30000"
 	},
 	"services": [{
 		"identifier": "set",

tsl/product_105.json

 {
-	"schema": "https://iot.ikonke.com/schema.json",
+	"schema": "https://iot-ap.ikonke.com/model/product_105.json",
 	"productType": "curtain",
 	"profile": {
+		"heartbeat": "3000",
 		"productCode": "105",
 		"productName": "一路窗帘面板（肖邦系列）定制版"
 	},