2019-12-13-2

WJC

2019-12-13 9c6bd67d66859e48f0e794cd2746aef9310ce71d

 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs

@@ -758,22 +758,54 @@
                                        }
                                        break;
                                    case DeviceType.TemperatureSensor:
                                       // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                        // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                        var dev = deviceinof as TemperatureSensor;
                                        if (conditions["Cluster_ID"]=="1026") {
                                        if (conditions["Cluster_ID"] == "1026")
                                        {
                                            dev.SensorDiv = 1;
                                        } else {
                                        }
                                        else
                                        {
                                            dev.SensorDiv = 2;
                                        }
                                        string s = "";
                                        switch (conditions["Range"])
                                        {
                                            case "0":
                                                {
                                                    s = ">";
                                                }
                                                break;
                                            case "1":
                                                {
                                                    s = "=";
                                                }
                                                break;
                                            case "2":
                                                {
                                                    s = "<";
                                                }
                                                break;
                                            case "6":
                                                {
                                                    s = "≥";
                                                }
                                                break;
                                            case "7":
                                                {
                                                    s = "≤";
                                                }
                                                break;
                                        }
                                        if (conditions["Cluster_ID"] == "1026")
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                            devicestatus.Text = ">" + conditions["AttriButeData1"] + "℃";
                                            devicestatus.Text = s + conditions["AttriButeData1"] + "℃";
                                        }
                                        else
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
                                            devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
                                            devicestatus.Text = s + conditions["AttriButeData1"] + "%";
                                        }
                                        break;

@@ -1960,7 +1992,7 @@
                }

                Common.Logic.CurrentLogic.LogicName = name;

                bool succeed = false;
                //判断是新添加逻辑(默认0)还是修改逻辑
                CommonPage.Loading.Start();
                if (Common.Logic.CurrentLogic.LogicId == 0)
@@ -1969,6 +2001,7 @@
                    var logicifon = await Send.AddModifyLogic(Common.Logic.CurrentLogic);
                    if (logicifon != null && logicifon.LogicId != 0)
                    {
                        succeed = true;
                        Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
                        Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
                    }
@@ -1976,10 +2009,18 @@
                else
                {
                    //发送修改逻辑命令
                    Send.AddModifyLogic(Common.Logic.CurrentLogic);
                   var modlogic=Send.AddModifyLogic(Common.Logic.CurrentLogic);
                    //编辑默认成功（不考虑网络情况）；
                    succeed = true;
                }

                CommonPage.Loading.Hide();

                if (!succeed) {
                    //网关回复失败，不关闭界面，让它停留当前界面；
                    //（原因：考虑到失败重新编辑原来数据给用户带来了麻烦）
                    ///提示：添加自动化失败；
                    return;
                }
                UserView.HomePage.Instance.RemoveViewByTag("Logic");
                Category.Category.instance?.RefreshBodyView();