2020-05-07-2

陈嘉乐

2020-05-07 9bf82668ee7dc8483fcdfa4c9feb8e5305029d5e

2020-05-07-2

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

@@ -1,17 +1,50 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="802" Column="43" />
      <File FileName="Shared/Phone/ZigBee/Common/Config.cs" />
      <File FileName="Shared/Common/House.cs" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="833" Column="74" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="789" Column="9" />
      <File FileName="Shared/Phone/ZigBee/Common/Config.cs" Line="4" Column="11" />
      <File FileName="Shared/Common/House.cs" Line="29" Column="23" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="251" Column="54" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="12" Column="2" />
      <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="114" Column="31" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="343" Column="61" />
      <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="7" Column="2" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="96" Column="71" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs" Line="221" Column="19" />
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="22" Column="17" />
      <File FileName="Shared/Common/Logic.cs" Line="8" Column="6" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="118" Column="46" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <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>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                    <Node name="Logic" expanded="True">
                      <Node name="UserCenterLogic.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />

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

Binary files differ

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

old mode 100755
new mode 100644
@@ -72,6 +72,7 @@
                UserView.HomePage.Instance.PageIndex += 1;
                roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
                roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));

            };
            securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {

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

old mode 100755
new mode 100644
@@ -387,6 +387,7 @@
                                break;
                            case 40:
                                {
                                    
                                    openView.titleBtn.TextID = MyInternationalizationString.smokescreen;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());
@@ -403,7 +404,7 @@
                                }
                                break;
                            case 43:
                                {
                                {//召元说的
                                    openView.titleBtn.TextID = MyInternationalizationString.gas;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());

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

old mode 100755
new mode 100644
@@ -245,7 +245,7 @@
                };
                fra.AddChidren(roomnameBtn);

                if (i == 0)//
                if (i == 0)//默认选中第一个房间
                {
                    roombjButton.IsSelected = false;
                    roombjButton = roombjBtn;
@@ -343,7 +343,17 @@
                    TextSize = 10,
                };
                deviceRowLayout.AddChidren(devicetypename);
               


                //if (i == 0)//默认选中第一个设备类型
                //{
                //    devicetypeButton.IsSelected = false;
                //    devicetypeButton = backgroundColor;
                //    backgroundColor.IsSelected = true;
                //    var list = Method.GetDeviceType(devicetypename.Text);
                //    ConditionDeviceView(list, devicelist);
                //}

                EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
                {
                    devicetypeButton.IsSelected = false;
@@ -361,6 +371,7 @@
            ///显示房间所有设备
            ConditionDeviceView(new List<DeviceType>(), devicelist);


        }
        /// <summary>
        /// 加载该类型设备视图方法

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

@@ -241,9 +241,12 @@
            //下拉刷新自动化列表的事件
            logicScrolView.BeginHeaderRefreshingAction += () =>
            {
                //重新刷新logic列表
                Common.Logic.LogicList.Clear();
                Read(logicScrolView, no);
                if (!Config.Instance.Home.IsVirtually)
                {//虚拟的不获取网关逻辑列表
                    //重新刷新logic列表
                    Common.Logic.LogicList.Clear();
                    Read(logicScrolView, no);
                }
                //关闭刷新View；
                logicScrolView.EndHeaderRefreshing();
            };
@@ -258,6 +261,14 @@
        /// <param name="logicScrolView"></param>
        private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
        {
            //if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId)
            //{
            //    //切换住宅清除之前缓存数据;
            //    Common.Logic.LogicList.Clear();
            //    Common.Logic.LockLogicList.Clear();
            //    Common.Logic.SoneLogicList.Clear();
            //}

            CommonPage.Loading.Start();
            try
            {

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs

old mode 100755
new mode 100644
@@ -215,10 +215,10 @@
            foreach (var floorKey in listFloorKey)

            {

                //客厅

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A2按键面板, RoomId = floorKey + "_KeTing", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A3按键面板, RoomId = floorKey + "_KeTing", DeviceCount = 1 });

                //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A2按键面板, RoomId = floorKey + "_KeTing", DeviceCount = 1 });

                //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A3按键面板, RoomId = floorKey + "_KeTing", DeviceCount = 1 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A4按键面板, RoomId = floorKey + "_KeTing", DeviceCount = 2 });

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A空调网关, RoomId = floorKey + "_KeTing", DeviceCount = 1 });

                //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A空调网关, RoomId = floorKey + "_KeTing", DeviceCount = 1 });



                //阳台

                list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A220pir传感器, RoomId = floorKey + "_YangTai", DeviceCount = 1 });


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

old mode 100755
new mode 100644
@@ -974,7 +974,11 @@
            //当前主页,场景和功能所选择的分支 1:场景 2:功能

            UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;

            //当前分类,场景和功能所选择的分支 0:场景 1:功能 2:自动化

            UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;

            UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
            //切换住宅清除之前缓存数据;
            Common.Logic.LogicList.Clear();
            Common.Logic.LockLogicList.Clear();
            Common.Logic.SoneLogicList.Clear();

        }



        #endregion