wei
2020-12-23 848dc3467aa22af89e6a4c0a8703ca83cb0b7b06
20000
3个文件已修改
81 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/Function/Function.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,24 +1,39 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
  <MonoDevelop.Ide.Workbench>
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="365" Column="26" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="75" Column="27" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/MainPage.cs" Line="235" Column="61" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="831" Column="82" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL_ON/Entity/Room.cs" Line="585" Column="41" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs" Line="16" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs" Line="289" Column="71" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="838" Column="30" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="386" Column="9" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="188" Column="14" />
      <File FileName="HDL_ON/Entity/FunctionList.cs" Line="584" Column="40" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="322" Column="21" />
      <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="312" Column="32" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="692" Column="10" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs" Line="81" Column="38" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="177" Column="75" />
    </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="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True">
                  <Node name="Function.cs" selected="True" />
                </Node>
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Scene" expanded="True" />
                  </Node>
                  <Node name="FuntionControlView" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" />
          </Node>
        </State>
@@ -31,7 +46,7 @@
    <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>
HDL_ON/Entity/Function/Function.cs
@@ -316,6 +316,15 @@
                return "FunctionData_" + sid;
            }
        }
        /// <summary>
        /// 保存功能文件
        /// </summary>
        public void SaveFunctionFile()
        {
        }
        /// <summary>
        /// 保存功能数据
        /// </summary>
@@ -323,17 +332,20 @@
        {
            if (upSevser)
            {
                var pm = new HttpServerRequest();
                var pack = pm.UpdataDevcieInfo(this);
                if (pack.Code == StateCode.SUCCESS)
                new System.Threading.Thread(() =>
                {
                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
                    FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                }
                else
                {
                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                }
                    var pm = new HttpServerRequest();
                    var pack = pm.UpdataDevcieInfo(this);
                    if (pack.Code == StateCode.SUCCESS)
                    {
                        var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
                        FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                    }
                    else
                    {
                        IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                    }
                });
            }
            else
            {
HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.0.1222";
        public static string VersionString = "1.0.1223";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>