发布到商店的版本

黄学彪

2020-08-21 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026

 ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs

@@ -245,10 +245,22 @@
            //获取对象

            var classData = new ModelDeviceBindData();

            var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A设备绑定列表, classData);



            //清空绑定表的返回值

            string clearResult = "{"

                + SetDouMarks("Device_ID") + ":" + (int)device.Type + ","

                + SetDouMarks("DeviceAddr") + ":" + SetDouMarks(device.DeviceAddr) + ","

                + SetDouMarks("Epoint") + ":" + device.DeviceEpoint + ","

                + SetDouMarks("Data_ID") + ":5006,"

                + SetDouMarks("Data") + ": {"

                + SetDouMarks("Result") + ": 0,"

                + SetDouMarks("ResultRemark") + ":" + SetDouMarks("Success") + "}"

                + "}";



            if (memoryData.ListReceiveResult.Count == 1)

            {

                //设备绑定有三条命令 第一条为清空

                memoryData.ListReceiveResult.Insert(0, "{" + SetDouMarks("Result") + ": 0," + SetDouMarks("ResultRemark") + ": " + SetDouMarks("Success") + " }");

                memoryData.ListReceiveResult.Insert(0, clearResult);

                memoryData.ListReceiveTopic.Insert(0, "Bind/ClearBindInfo_Respon");

                memoryData.ListSendTopic.Insert(0, "Bind/ClearBindInfo");



@@ -256,6 +268,13 @@
                memoryData.ListReceiveTopic.Add(string.Empty);

                memoryData.ListSendTopic.Add(string.Empty);

            }

            else

            {

                memoryData.ListReceiveResult[0] = clearResult;

                memoryData.ListReceiveTopic[0] = "Bind/ClearBindInfo_Respon";

                memoryData.ListSendTopic[0] = "Bind/ClearBindInfo";

            }



            memoryData.ListSendTopic[2] = "Bind/SetBind";

            memoryData.ListReceiveTopic[2] = "Bind/SetBind_Respon";

            memoryData.ListReceiveResult[2] = receiveResult;

@@ -419,9 +438,9 @@
                if (memoryData.ListReceiveResult.Count == 1)

                {

                    //设备绑定有三条命令 第一条为清空

                    memoryData.ListReceiveResult.Insert(0, "{" + SetDouMarks("Result") + ": 0," + SetDouMarks("ResultRemark") + ": " + SetDouMarks("Success") + " }");

                    memoryData.ListReceiveTopic.Insert(0, "Bind/ClearBindInfo_Respon");

                    memoryData.ListSendTopic.Insert(0, "Bind/ClearBindInfo");

                    memoryData.ListReceiveResult.Insert(0, string.Empty);

                    memoryData.ListReceiveTopic.Insert(0, string.Empty);

                    memoryData.ListSendTopic.Insert(0, string.Empty);



                    memoryData.ListReceiveResult.Add(string.Empty);

                    memoryData.ListReceiveTopic.Add(string.Empty);

@@ -583,7 +602,7 @@
            + SetDouMarks("Data_ID") + ": 100,"

            + SetDouMarks("Data") + ": {"

            + SetDouMarks("Result") + ": 0,"

            + SetDouMarks("MacName") + ":" + macName+ "}"

            + SetDouMarks("MacName") + ":" + SetDouMarks(macName) + "}"

            + "}";



            memoryData.ListSendTopic[0] = "MacRename";

@@ -617,13 +636,13 @@


            //设备返回的结果

            var receiveResult = "{"

            + SetDouMarks("Device_ID") + ": 2,"

            + SetDouMarks("Device_ID") + ": " + (int)device.Type + ","

            + SetDouMarks("DeviceAddr") + ": " + SetDouMarks(device.DeviceAddr) + ","

            + SetDouMarks("Epoint") + ": " + device.DeviceEpoint + ","

            + SetDouMarks("Data_ID") + ": 96,"

            + SetDouMarks("Data") + ": {"

            + SetDouMarks("Result") + ": 0,"

            + SetDouMarks("DeviceName") + ":" + deviceName + "}"

            + SetDouMarks("DeviceName") + ":" + SetDouMarks(deviceName) + "}"

            + "}";



            memoryData.ListSendTopic[0] = "DeviceRename";