wei
2020-12-25 f534d41c36d5895322bf691784a10435b64609fe
修复添加、删除楼层时候,界面刷新异常问题
6个文件已修改
83 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,32 +1,65 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs">
    <Files>
      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="550" Column="17" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" Line="533" Column="14" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" Line="20" Column="21" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="200" Column="50" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="89" Column="85" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="611" Column="53" />
      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="306" Column="55" />
      <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="368" Column="1" />
      <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="2030" Column="27" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="251" Column="53" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="157" Column="32" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="727" Column="18" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="209" Column="46" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="402" Column="24" />
      <File FileName="HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings" Line="7" Column="1" />
      <File FileName="HDL-ON_iOS/Entitlements.plist" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="166" Column="45" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="53" Column="25" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="525" Column="55" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" Line="47" Column="30" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" Line="166" Column="37" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="161" Column="47" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs" Line="94" Column="22" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs" Line="92" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL-ON_Android" selected="True" />
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="1-HomePage" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="RoomListManage" expanded="True">
                      <Node name="AddRoom" expanded="True" />
                      <Node name="FloorsManagementPage.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Curtain" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True">
                <Node name="zh-Hans.lproj" expanded="True" />
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State>
          <Value>row.Tag</Value>
          <Value>btn.Tag</Value>
          <Value>light.BlueColor</Value>
          <Value>e2[0]</Value>
          <Value>e2[1]</Value>
          <Value>e2[2]</Value>
          <Value>deviceList</Value>
          <Value>b1</Value>
        </State>
      </Pad>
    </Pads>
@@ -37,12 +70,13 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="90" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="331" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202012255" android:versionName="1.0.202012255" package="com.hdl.onpro">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202012256" android:versionName="1.0.202012256" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
    <!--  定位权限-->
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
HDL-ON_iOS/Info.plist
@@ -96,9 +96,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.0.202012254</string>
    <string>1.0.202012256</string>
    <key>CFBundleVersion</key>
    <string>202012254</string>
    <string>202012256</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>
HDL_ON/Common/ApiUtlis.cs
@@ -238,6 +238,7 @@
                                    localScene.collect = newScene.collect;
                                    localScene.modifyTime = newScene.modifyTime;
                                    localScene.roomIds = newScene.roomIds;
                                    localScene.image = newScene.image;
                                    localScene.SaveSceneFile();
                                }
                                sceneList.Remove(newScene);//操作完的数据清理掉,剩下的就是新增的功能
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -139,6 +139,11 @@
                            Application.RunOnMainThread(() =>
                            {
                                LoadFloorRow(f);
                                int count2 = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
                                var contentViewHeight = (count2 + 1) * Application.GetRealHeight(50);
                                contentView.Height = contentViewHeight;
                                floorsListView.Height = count2 * Application.GetRealHeight(50);
                            });
                        }
                    }
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -100,7 +100,10 @@
                            if (row.Tag.ToString() == btn.Tag.ToString())
                            {
                                row.RemoveFromParent();
                                floorsListView.Height = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
                                int count = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
                                var contentViewHeight = (count + 1) * Application.GetRealHeight(50);
                                contentView.Height = contentViewHeight;
                                floorsListView.Height = count * Application.GetRealHeight(50);
                            }
                        }
                    }