2019-12-13-1

WJC

2019-12-13 097cc5c10057156872ce69b2b1576335b782c555

2019-12-13-1

修改温湿度传感器的界面

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,29 +1,38 @@
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicDevicePage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1908" Column="11" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1435" Column="38" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="122" Column="20" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="798" Column="37" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="20" Column="31" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="750" Column="59" />
      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2059" Column="53" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="315" Column="53" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Home.IOS" expanded="True" />
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True">
                <Node name="Phone" expanded="True" />
              </Node>
              <Node name="MainViewController.cs" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Category" expanded="True" />
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True">
                      <Node name="AddCondition.cs" selected="True" />
                    </Node>
                    <Node name="LogicDevicePage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="Device" expanded="True">
                    <Node name="Bind" expanded="True" />
                  </Node>
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>
@@ -32,7 +41,7 @@
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>

 ZigbeeApp/Home.Ios/MainViewController.cs

@@ -40,7 +40,10 @@

        public override void ViewWillAppear(bool animated)
        {
            UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent;
            //顶部信息栏字体颜色为黑色；
            UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.Default;
            //顶部信息栏字体颜色为白色；
            //UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent;
            //base.ViewWillAppear(animated);
        }


 ZigbeeApp/Home.Ios/Resources/.DS_Store

Binary files differ

 ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg

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

@@ -1440,94 +1440,116 @@
                case DeviceType.TemperatureSensor:
                    {
                        string current = Language.StringByID(MyInternationalizationString.current);
                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 2 - 20 - 50);
                        devicefra.Height = Application.GetRealHeight(140 + 160 * 2 + 20 + 50);
                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 600);
                        devicefra.Height = Application.GetRealHeight(140 + 600);
                        var temperatureSensor = common as TemperatureSensor;
                        var Btntemperaturevalue = new Button
                        SelectedDeviceStatuscondition = "TemperatureSensor";
                        #region  布局View
                        var PickerViewfra = new FrameLayout
                        {
                            TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                            Height = Application.GetRealHeight(60),
                            Width = Application.GetRealWidth(400),
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(80),
                            Y = timetype.Bottom + Application.GetRealHeight(70),
                            TextSize = 14,
                            Y = Application.GetRealHeight(140),
                            Height = Application.GetRealHeight(600),
                        };
                        devicefra.AddChidren(Btntemperaturevalue);
                        devicefra.AddChidren(PickerViewfra);

                        var horizontalSeekBarVol = new DiyImageSeekBar

                        var mUIPickerView = new UIPickerView
                        {
                            Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
                            X = Application.GetRealWidth(80),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = false,//显示百分比
                            IsClickable = true,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            //ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                            Height = Application.GetRealHeight(600 - 5),
                        };
                        devicefra.AddChidren(horizontalSeekBarVol);
                        PickerViewfra.AddChidren(mUIPickerView);

                        EventHandler<int> progressclick = (sender, e) =>
                        var mList1 = new List<string> { ">", "<", "=", "≥", "≤" };
                        var mList2 = new List<string>();
                        var mList3 = new List<string>();
                        for (int i = 1; i <=100; i++)
                        {

                            SelectedDeviceStatuscondition = "TemperatureSensor";
                            if (temperatureSensor.SensorDiv == 1)
                            {
                                dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());

                                Btntemperaturevalue.Text = current + ">" + horizontalSeekBarVol.Progress.ToString() + "℃";

                            }
                            else
                            {
                                Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%";
                                dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//温度值
                            }

                        };
                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;


                        if (temperatureSensor.SensorDiv == 1)
                        {
                            mList2.Add(i.ToString());
                        }
                        if (temperatureSensor.SensorDiv == 1) {
                            mList3.Add("℃");
                            dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            dictionary(deviceConditionsInfo, "Range", "0");//0大于AttriButeData1时触发动作
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                            dictionary(deviceConditionsInfo, "Range", "1");//1:等于AttriButeData1时触发动作
                            dictionary(deviceConditionsInfo, "AttriButeData1", "50");//默认温度值50℃
                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                            Btntemperaturevalue.Text = current + ">0℃";

                        }
                        else
                        {
                            Btntemperaturevalue.Text = current + "<0%";
                        } else {
                            mList3.Add("%");
                            dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            dictionary(deviceConditionsInfo, "Range", "2");//2小于AttriButeData1时触发动作
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//温度值
                            dictionary(deviceConditionsInfo, "Range", "1");//1:等于AttriButeData1时触发动作
                            dictionary(deviceConditionsInfo, "AttriButeData1", "50");//默认湿度值50%
                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                        }
                        mUIPickerView.setNPicker(mList1, mList2, mList3);

                        #endregion

                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
                        {
                            SelectedDeviceStatuscondition = "TemperatureSensor";
                            dictionary(deviceConditionsInfo, "AttriButeData1", mList2[s2]);
                            switch (mList1[s1])
                            {
                                case ">": {
                                        dictionary(deviceConditionsInfo, "Range", "0");
                                    } break;
                                case "<": {
                                        dictionary(deviceConditionsInfo, "Range", "2");
                                    } break;
                                case "=": {
                                        dictionary(deviceConditionsInfo, "Range", "1");
                                    } break;
                                case "≥": {
                                        dictionary(deviceConditionsInfo, "Range", "6");
                                    } break;
                                case "≤": {
                                        dictionary(deviceConditionsInfo, "Range", "7");
                                    } break;
                            }
                        };

                        //默认=,50
                        int index1 = 2, index2 = 49;
                        if (edit && devices != null)
                        {
                            horizontalSeekBarVol.Progress = int.Parse(devices["AttriButeData1"]);
                            if (temperatureSensor.SensorDiv == 1)
                            SelectedDeviceStatuscondition = "";
                            string s = "";
                            switch (devices["Range"])
                            {

                                Btntemperaturevalue.Text = current + ">" + devices["AttriButeData1"] + "℃";

                                case "0":
                                    {
                                        s = ">";
                                    }
                                    break;
                                case "1":
                                    {
                                        s = "=";
                                    }
                                    break;
                                case "2":
                                    {
                                        s = "<";
                                    }
                                    break;
                                case "6":
                                    {
                                        s = "≥";
                                    }
                                    break;
                                case "7":
                                    {
                                        s = "≤";
                                    }
                                    break;
                            }
                            else
                            {
                                Btntemperaturevalue.Text = current + "<" + devices["AttriButeData1"] + "%";
                            }
                            //查找索引
                            index1 = mList1.IndexOf(s);
                            index2 = mList2.IndexOf(devices["AttriButeData1"]);

                        }
                        ///更新最新状态；
                        mUIPickerView.setCurrentItems(index1, index2, 0);

                    }
                    break;

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -1057,6 +1057,8 @@
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Y = openrowlayout.Bottom,
                            X = Application.GetRealWidth(80),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
@@ -1068,7 +1070,7 @@
                            ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
                        openframelayout.AddChidren(horizontalSeekBarVol);

                        #endregion

@@ -1357,6 +1359,8 @@
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Y = openrowlayout.Bottom,
                            X = Application.GetRealWidth(80),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
@@ -1368,7 +1372,7 @@
                            ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
                        openframelayout.AddChidren(horizontalSeekBarVol);

                        #endregion


 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;


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

@@ -1054,6 +1054,8 @@
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Y = openrowlayout.Bottom,
                            X = Application.GetRealWidth(80),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
@@ -1061,12 +1063,12 @@
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                            ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度

                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
                        openframelayout.AddChidren(horizontalSeekBarVol);
                         #endregion

                        #region  关
@@ -1354,6 +1356,8 @@
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Y = openrowlayout.Bottom,
                            X = Application.GetRealWidth(80),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
@@ -1363,9 +1367,9 @@
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextSize = 14,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                            SeekBarViewHeight = Application.GetRealHeight(10),
                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
                        openframelayout.AddChidren(horizontalSeekBarVol);

                        #endregion

@@ -1742,7 +1746,7 @@
                        }
                    }
                    break;
                    
                ///空调
                case DeviceType.Thermostat:
                    {

@@ -1877,8 +1881,7 @@
                        var closeBtnSelected = new SelectedButton();
                        closerowlayout.AddChidren(closeBtnSelected);
                        #endregion
                      
                   


                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
                        {
@@ -1897,12 +1900,13 @@

                            }
                        };

                        #endregion 
                        
                        #endregion
                        //默认26,自动,中风
                        int indextemperature = 10, indexmode = 2, indexspeed = 1;
                        if (edit && TaskList != null)
                        {
                       
                            foreach (var value in TaskList)
                            {
                                if (TaskList.Count == 1)
@@ -2044,6 +2048,7 @@
                        ///取消事件
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
              
                            //清除之前数据；
                            taskListInfo.Clear();
                            dictionary(modedictionary, "TaskType", "5");

 ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs

old mode 100755
new mode 100644
@@ -669,7 +669,7 @@

                try
                {
                    System.Console.WriteLine("Bind/GetDeviceBind_Actions 启动" + "_" + System.DateTime.Now.ToString());
                   // System.Console.WriteLine("Bind/GetDeviceBind_Actions 启动" + "_" + System.DateTime.Now.ToString());
                    var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5007 } };
                    mainGateway.Send("Bind/GetDeviceBind", jObject.ToString());
                }
@@ -689,7 +689,7 @@
                    d = new GetDeviceBindResponseAllData { errorMessageBase = " 回复超时，请重新操作" };
                }
                mainGateway.Actions -= action;
                System.Console.WriteLine("Bind/GetDeviceBind_Actions 退出" + System.DateTime.Now.ToString());
                //System.Console.WriteLine("Bind/GetDeviceBind_Actions 退出" + System.DateTime.Now.ToString());

                return d;
            });