2020-07-24-1

陈嘉乐

2020-07-24 47239ae675902655eab03a115e05116b0b227d4f

2020-07-24-1

修改球形传感器的判断方法，用模块id去识别该设备

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

@@ -1,47 +1,32 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SkipView.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="341" Column="59" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="687" Column="6" />
      <File FileName="Shared/R.cs" Line="1160" Column="22" />
      <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="304" Column="24" />
      <File FileName="Shared/Phone/MainPage/Controls/DeviceFunctionUnallocatedControl.cs" Line="55" Column="73" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs" Line="358" Column="27" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs" Line="164" Column="1" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/AddScenePage.cs" Line="232" Column="34" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/RoomClickView.cs" Line="37" Column="72" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="33" Column="1" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="352" Column="42" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="68" Column="47" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="528" Column="78" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="15" Column="122" />
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="447" Column="31" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="265" Column="102" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="ZigeeLogic" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="Home.IOS" expanded="True" />
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Category" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="SkipView.cs" selected="True" />
                    <Node name="Method.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Controls" expanded="True" />
                  </Node>
                  <Node name="CommonBase" expanded="True" />
                </Node>
                <Node name="UserView" expanded="True" />
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>
@@ -50,9 +35,9 @@
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>

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

Binary files differ

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

@@ -323,8 +323,9 @@
                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                            openView.selectedIconBtn.Visible = true;
                            closeView.selectedIconBtn.Visible = false;
                            if (iASZonedevice.IasDeviceType == 13||iASZonedevice.IasDeviceType == 541)
                            if (iASZonedevice.IasDeviceType == 13)
                            {
                                
                                closeView.selectedIconBtn.Visible = true;
                            }
                            Send.dictionary(deviceConditionsInfo, "Range", "5");
@@ -355,13 +356,74 @@
                        {
                            case 13:
                                {
                                    openView.titleBtn.TextID = MyInternationalizationString.someone;
                                    closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
                                    closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
                                    closeView.selectedIconBtn.Visible = true;
                                    completeView.Show(2).AddChidren(openView.Show());
                                    completeView.Show(2).AddChidren(closeView.Show());

                                    if (common.ModelIdentifier == "MSPIRB-ZB.10")
                                    {
                                        int _height = 3;
                                        if (edit)
                                        {
                                            _height = 2;
                                        }
                                        var view = completeView.Show(_height);
                                        openView.titleBtn.TextID = MyInternationalizationString.someone;
                                        closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
                                        closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
                                        closeView.selectedIconBtn.Visible = true;
                                        view.AddChidren(openView.Show());
                                        view.AddChidren(closeView.Show());

                                        takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                        takebackView.selectedIconBtn.Visible = true;
                                        takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
                                        takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
                                        if (edit)
                                        {

                                            if (devices["Cluster_ID"] == "1024")
                                            {
                                                flMain.RemoveFromParent();
                                                var illumination = new Illumination();
                                                UserView.HomePage.Instance.AddChidren(illumination);
                                                UserView.HomePage.Instance.PageIndex += 1;
                                                illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
                                            }
                                            else
                                            {
                                                closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                            }
                                        }
                                        else
                                        {
                                            view.AddChidren(takebackView.Show());

                                        }


                                        takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
                                        {
                                            SelectedDeviceStatus = "";
                                            openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                            openView.selectedIconBtn.Visible = false;
                                            var illumination = new Illumination();
                                            UserView.HomePage.Instance.AddChidren(illumination);
                                            UserView.HomePage.Instance.PageIndex += 1;
                                            illumination.Show(common, takebackView.titleBtn.Text, 0, false);

                                        };

                                    }
                                    else
                                    {

                                        openView.titleBtn.TextID = MyInternationalizationString.someone;
                                        closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
                                        closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                        closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
                                        closeView.selectedIconBtn.Visible = true;
                                        completeView.Show(2).AddChidren(openView.Show());
                                        completeView.Show(2).AddChidren(closeView.Show());

                                    }
                                }
                                break;
                            case 21:
@@ -433,61 +495,6 @@
                                    openView.titleBtn.TextID = MyInternationalizationString.callthepolice;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());
                                }
                                break;
                            case 541:
                                {
                                    int _height = 3;
                                    if (edit)
                                    {
                                        _height = 2;
                                    }
                                    var view = completeView.Show(_height);
                                    openView.titleBtn.TextID = MyInternationalizationString.someone;
                                    closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
                                    closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
                                    closeView.selectedIconBtn.Visible = true;
                                    view.AddChidren(openView.Show());
                                    view.AddChidren(closeView.Show());

                                    takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    takebackView.selectedIconBtn.Visible = true;
                                    takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
                                    takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
                                    if (edit)
                                    {

                                        if (devices["Cluster_ID"] == "1024")
                                        {
                                            flMain.RemoveFromParent();
                                            var illumination = new Illumination();
                                            UserView.HomePage.Instance.AddChidren(illumination);
                                            UserView.HomePage.Instance.PageIndex += 1;
                                            illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
                                        }
                                        else
                                        {
                                            closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                        }
                                    }
                                    else
                                    {
                                        view.AddChidren(takebackView.Show());

                                    }


                                    takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
                                    {
                                        SelectedDeviceStatus = "";
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                        openView.selectedIconBtn.Visible = false;
                                        var illumination = new Illumination();
                                        UserView.HomePage.Instance.AddChidren(illumination);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        illumination.Show(common,takebackView.titleBtn.Text, 0, false);

                                    };
                                }
                                break;
                            default:

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

@@ -261,8 +261,17 @@
                        {
                            break;
                        }
                        patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
                        selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";

                        if (device.ModelIdentifier == "MSPIRB-ZB.10")
                        {
                            patm = $"ZigeeLogic/sensor541.png";
                            selectedpatm = $"ZigeeLogic/selectedsensor541.png";
                        }
                        else
                        {
                            patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
                            selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
                        }
                    }
                    break;
                case DeviceType.TemperatureSensor:

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

@@ -1362,8 +1362,8 @@
        /// 判断字典是否存在的方法
        /// </summary>
        /// <param name="deviceConditionsInfo"></param>
        /// <param name="Key"></param>
        /// <param name="Value"></param>
        /// <param name="Key">键</param>
        /// <param name="Value">键值</param>
        public static void dictionary(Dictionary<string, string> deviceConditionsInfo, string Key, string Value)
        {
            if (deviceConditionsInfo.ContainsKey(Key))

 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

old mode 100755
new mode 100644