parent: c7f6a15a | 补丁 | 提交 | ignore whitespace
JLChen
2021-10-09 5da8b5819bebf4665b8dd715f8fc601913b3fe40 
2021-10-09 1.添加Multicast Networking权限，适配Xcode12.5之后编译在iOS14.5 +系统无法发送UDP广播包问题。
4个文件已修改
99 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Entitlements.plist 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpUtil.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .vs/HDL_APP_Project/xs/UserPrefs.xml


@@ -1,47 +1,33 @@


<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">


  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.220222E9-B9CA-4834-9318-2BC22465F050" />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs">


<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">


  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control_Udp.cs">


    <Files>


      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="20" Column="57" />


      <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="55" />


      <File FileName="HDL-ON_iOS/Info.plist" />


      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="759" Column="32" />


      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="395" Column="23" />


      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="758" Column="1" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="643" Column="1" />


      <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="166" Column="46" />


      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="45" Column="53" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs" Line="32" Column="16" />


      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="281" Column="62" />


      <File FileName="HDL_ON/DAL/Server/HttpServerRequestBase.cs" Line="1" Column="1" />


      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="18" Column="21" />


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="524" Column="1" />


      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="322" Column="48" />


      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="1073" Column="21" />


    </Files>


    <Pads>


      <Pad Id="ProjectPad">


        <State name="__root__">


          <Node name="HDL_APP_Project" expanded="True">


            <Node name="Blufi" expanded="True">


              <Node name="NativeReferenceFolder" expanded="True" />


            </Node>


            <Node name="HDL_ON" expanded="True">


              <Node name="DAL" expanded="True">


                <Node name="DriverLayer" expanded="True">


                  <Node name="Control_Udp.cs" selected="True" />


                </Node>


                <Node name="Server" expanded="True" />


              </Node>


              <Node name="UI" expanded="True">


                <Node name="UI0-Public" expanded="True">


                  <Node name="Widget" expanded="True" />


                </Node>


                <Node name="UI2" expanded="True">


                  <Node name="1-HomePage" expanded="True" />


                  <Node name="2-Classification" expanded="True" />


                  <Node name="4-PersonalCenter" expanded="True" />


                  <Node name="FuntionControlView" expanded="True">


                    <Node name="Energy" expanded="True" />


                    <Node name="EnvironmentalScience" expanded="True" />


                    <Node name="Light" expanded="True">


                      <Node name="LightScene" expanded="True">


                        <Node name="AddLightScene.cs" selected="True" />


                      </Node>


                    </Node>


                  </Node>


                </Node>


              </Node>


            </Node>


            <Node name="HDL-ON_iOS" expanded="True" />


            <Node name="HDL-ON_Android" expanded="True" />


            <Node name="HDL-ON_iOS" expanded="True">


              <Node name="Other" expanded="True" />


            </Node>


          </Node>


        </State>


      </Pad>


@@ -53,28 +39,26 @@


    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>


    <String>Shared.IOS/Shared.IOS.csproj</String>


  </DisabledProjects>


  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />


  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />


  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />


  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />


  <MonoDevelop.Ide.DebuggingService.Breakpoints>


    <BreakpointStore>


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="431" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" line="758" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" line="106" 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="168" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="481" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="541" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="315" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="475" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="474" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="153" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="338" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" line="244" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" line="148" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" line="865" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2689" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2685" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" line="524" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="431" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" line="758" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" line="106" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="168" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="481" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="541" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="475" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs" relfile="HDL_ON/Entity/FunctionList.cs" line="474" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="153" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="338" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" line="244" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" line="148" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" line="865" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2689" column="1" />


      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2685" column="1" />


    </BreakpointStore>


  </MonoDevelop.Ide.DebuggingService.Breakpoints>


  <MultiItemStartupConfigurations />




 HDL-ON_iOS/Entitlements.plist


@@ -8,5 +8,7 @@


    <array>


        <string>applinks:china-gateway.hdlcontrol.com</string>


    </array>


    <key>com.apple.developer.networking.multicast</key>


    <true/>


</dict>


</plist>




 HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings


@@ -7,4 +7,5 @@


"NSPhotoLibraryAddUsageDescription"="应用程序希望访问您的照片库，用于设置房间的背景图片";


"NSMicrophoneUsageDescription"="应用程序希望访问您的手机麦克风，用于语音对讲";


"NSBluetoothPeripheralUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。";


"NSBluetoothAlwaysUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。";


"NSBluetoothAlwaysUsageDescription"="此应用程序使用蓝牙与设备通信，此应用程序不收集、存储或记录通过蓝牙通信的任何数据。";


"NSLocalNetworkUsageDescription"="应用程序希望使用本地网络来连接你的设备。";




 HDL_ON/DAL/Server/HttpUtil.cs


@@ -17,8 +17,8 @@


        /// 固定域名,正式环境


        /// 公共域名就近解析


        /// </summary>


        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";


        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm


        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";


        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm


        /// <summary>


        /// RegionMark


        /// </summary>