2019-10-18-2

WJC

2019-10-18 fdf2472a13873ab3570e3c82de50896b8f5ac1cb

2019-10-18-2

最新

 .DS_Store

Binary files differ

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

@@ -2,32 +2,42 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/ZigBee/Device/CommonDevice.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="243" Column="42" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" />
      <File FileName="Shared/Phone/ZigBee/Device/DeviceType.cs" />
      <File FileName="Shared/Phone/ZigBee/Device/TemperatureSensor.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="230" Column="57" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceCondition.cs" Line="225" Column="57" />
      <File FileName="Shared/Phone/Device/Logic/TemplateDeviceAction.cs" Line="230" Column="57" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="689" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="250" Column="59" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1509" Column="45" />
      <File FileName="Shared/Phone/ZigBee/Device/TemperatureSensor.cs" Line="11" Column="29" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="2601" Column="26" />
      <File FileName="../../../Downloads/ZigbeeApp-6/Shared/Phone/Device/Category/Category.cs" Line="9" Column="39" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1" Column="1" />
      <File FileName="Shared/Common/Room.cs" Line="1" Column="1" />
      <File FileName="GateWay.Ios/Main.cs" Line="14" Column="1" />
      <File FileName="GateWay.Ios/Main.cs" Line="14" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="22" Column="37" />
      <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" Line="294" Column="27" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Ios" expanded="True" />
            <Node name="GateWay.Ios" expanded="True">
              <Node name="Resources" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="ZigeeLogic" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="Send.cs" selected="True" />
                  </Node>
                  <Node name="Category" expanded="True" />
                  <Node name="Logic" expanded="True" />
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Device" expanded="True" />
                  <Node name="Device" expanded="True">
                    <Node name="CommonDevice.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
@@ -39,9 +49,7 @@
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/hdl/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs" relfile="Shared/Phone/Device/Logic/Send.cs" line="689" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-shm

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide-wal

Binary files differ

 ZigbeeApp/GateWay.Ios/Resources/Phone/.DS_Store

Binary files differ

 ZigbeeApp/Shared/Common/Room.cs

@@ -1337,6 +1337,5 @@

        #endregion

       
    }
}

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

@@ -704,7 +704,8 @@
                    BorderWidth=1
                };
                row.AddChidren(roomBtn);
                if (Shared.Common.Room.CurrentRoom==null) {
                if (Shared.Common.Room.CurrentRoom == null)
                {
                    continue;
                }
                if(Shared.Common.Room.CurrentRoom.FileName==roomFilePath)

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

@@ -1416,29 +1416,87 @@

                case DeviceType.TemperatureSensor:
                    {
                    
                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 2 - 20 - 50);
                        devicefra.Height = Application.GetRealHeight(140 + 160 * 2 + 20 + 50);
                        var temperatureSensor = common as TemperatureSensor;
                        var Btntemperaturevalue = new Button
                        {
                            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),
                        };
                        devicefra.AddChidren(Btntemperaturevalue);

                        var horizontalSeekBarVol = new HorizontalSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
                            X = Application.GetRealWidth(80),
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                        };
                        devicefra.AddChidren(horizontalSeekBarVol);
                        horizontalSeekBarVol.MouseUpEventHandler += (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "TemperatureSensor";
                        if (temperatureSensor.SensorDiv == 1)
                        {
                            dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            dictionary(deviceConditionsInfo, "Range", "0");
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                                dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());


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

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



                        if (temperatureSensor.SensorDiv == 1)
                        {
                            dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            dictionary(deviceConditionsInfo, "Range", "0");//0大于AttriButeData1时触发动作
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                            Btntemperaturevalue.Text = "当前>0℃";

                        }
                        else
                        {
                            Btntemperaturevalue.Text = "当前<0%";
                            dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
                            dictionary(deviceConditionsInfo, "Range", "0");//表示大于值
                            dictionary(deviceConditionsInfo, "Range", "2");//2小于AttriButeData1时触发动作
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//温度值
                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                        }

                        if (edit && devices != null)
                        {
                            horizontalSeekBarVol.Progress = int.Parse(devices["AttriButeData1"]);
                            if (temperatureSensor.SensorDiv == 1)
                            {

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

                            }
                            else
                            {
                                Btntemperaturevalue.Text = "当前<" + devices["AttriButeData1"] + "%";
                            }
                        }

                    }
                    break;
            }

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

@@ -529,7 +529,6 @@
                                deviceedit.MouseUpEventHandler += (sender, e) =>
                                {


                                    if (deviceinof.Type != DeviceType.DoorLock)
                                    {
                                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -734,6 +733,25 @@
                                            }
                                        }
                                        break;
                                    case DeviceType.TemperatureSensor:
                                       // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                        var dev = deviceinof as TemperatureSensor;
                                        if (conditions["Cluster_ID"]=="1026") {
                                            dev.SensorDiv = 1;
                                        } else {
                                            dev.SensorDiv = 2;
                                        }
                                        if (conditions["Cluster_ID"] == "1026")
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
                                            devicestatus.Text = ">" + conditions["AttriButeData1"] + "℃";
                                        }
                                        else
                                        {
                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
                                            devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
                                        }
                                        break;

                                }


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

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using Shared;
using ZigBee.Device;

namespace Shared.Phone.Device.Logic
{
    public class LogicIfon
@@ -11,7 +13,7 @@
        /// </summary>
        /// <param name="common">Common.</param>
        /// <param name="objecttype">Objecttype.</param>
        public static void AddDeviceconditions(ZigBee.Device.CommonDevice common, Dictionary<string, string> objecttype)
        public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
        {
            for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
            {
@@ -19,12 +21,35 @@
                {
                    if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
                    {
                        if (common.Type == DeviceType.TemperatureSensor)//设备温度传感器有点特别
                        {
                            var dev = common as TemperatureSensor;
                            string str = "";
                            if (dev.SensorDiv == 1)
                            {
                                str = "1026";
                            }
                            else
                            {
                                str = "1029";
                            }
                            if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == str)
                            {
                        Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
                        Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
                        return;
                    }

                }
                        else
                        {
                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
                            Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
                            return;
                        }
                    }

                }
            }
            Common.Logic.CurrentLogic.Conditions.Add(objecttype);
        }

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

old mode 100755
new mode 100644
@@ -19,7 +19,7 @@
        /// <summary>

        /// 列表控件

        /// </summary>

        private VerticalListControl listView = null;

        private VerticalScrolViewLayout listView = null;

        /// <summary>

        /// 行控件的信息(Keys：Mac地址)

        /// </summary>

@@ -127,7 +127,7 @@
            txtSearchControl.BindEvent(this.SetRowDataBySearchKeys);



            //列表控件

            listView = new VerticalListControl(29);

            listView = new VerticalScrolViewLayout();

            listView.Y = txtSearchControl.Bottom + Application.GetRealHeight(29);

            listView.Height = frame.Height - txtSearchControl.Bottom - Application.GetRealHeight(29);

            frame.AddChidren(listView);

@@ -208,7 +208,7 @@
            rowInfo.frameTable = frameTable;



            //控件

            var rowMenu = new DeviceObjectControl(deviceMac, listView.rowSpace / 2);

            var rowMenu = new DeviceObjectControl(deviceMac, 0);

            frameTable.AddChidren(rowMenu);

            rowMenu.InitControl();

            rowInfo.MenuRow = rowMenu;