2019.12.13

gxc

2019-12-13 eb424d24e39bab4a245725f35deab3f234ea0f13

 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs

@@ -302,6 +302,7 @@
                };
                functionSceneBodyView.AddChidren(deviceListScrolView);
                tempFunctionTypeBtn = new FunctionButton();
                tempFunctionTypeBtn.Init("","");

                EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
                {
@@ -724,7 +725,7 @@

            if (sceneTarget.TaskList.Count > 0)
            {
                if (sceneTarget.TaskList[0].Data1 == 0)
                if (sceneTarget.TaskList[0].Data1 == 1)
                {
                    open.IsSelected = false;
                    shut.IsSelected = true;
@@ -733,7 +734,7 @@
                {
                    open.IsSelected = true;
                    shut.IsSelected = false;
                    open.SetProgress(sceneTarget.TaskList[0].Data1);
                    open.SetProgress(sceneTarget.TaskList[0].Data2);
                }
            }

@@ -748,14 +749,14 @@
                if (shut.IsSelected)
                {
                    //关
                    data1 = 0;
                    data1 = 1;
                    data2 = 0;
                }
                else
                {
                    //百分比
                    data1 = open.SeekBar.Progress;
                    data2 = 0;
                    data1 = 5;
                    data2 = open.SeekBar.Progress;
                }

                var taskInfo = new ZigBee.Device.Scene.TaskListInfo
@@ -1078,7 +1079,7 @@
                        }
                        if (tasklist.Data1 == 4 || tasklist.Data1 == 5)
                        {
                            tempId = open.temperatureList.IndexOf(tasklist.Data2);
                            tempId = open.temperatureList.IndexOf(tasklist.Data2/100);
                        }
                    }

@@ -1138,7 +1139,7 @@
                        {
                            TaskType = taskType,
                            Data1 = 4,
                            Data2 = open.temperatureList[tempId]
                            Data2 = open.temperatureList[tempId]*100
                        };
                        taskList.Add(taskInfo3);

@@ -1150,7 +1151,7 @@
                        {
                            TaskType = taskType,
                            Data1 = 5,
                            Data2 = open.temperatureList[tempId]
                            Data2 = open.temperatureList[tempId]*100
                        };
                        taskList.Add(taskInfo3);
                    }