parent: dc896724 | 补丁 | 提交 | ignore whitespace
1
wei
2021-06-07 035c219e795a77caff26e0fac776cadc7afb0037 
1
5个文件已修改
59 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpUtil.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .vs/HDL_APP_Project/xs/UserPrefs.xml


@@ -1,13 +1,14 @@


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


  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs">


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


  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />


  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Resources/Language.ini">


    <Files>


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="41" Column="68" />


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="93" Column="28" />


      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="618" Column="19" />


      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="61" />


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


      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="229" Column="40" />


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


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


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


      <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="340" Column="35" />


      <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="657" Column="42" />


      <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="75" Column="1" />


      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="47" Column="1" />


    </Files>


    <Pads>


      <Pad Id="ProjectPad">


@@ -19,16 +20,11 @@


              </Node>


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


                <Node name="UI1-Login" expanded="True" />


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


                  <Node name="3-Intelligence" expanded="True">


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


                  </Node>


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


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


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


                    </Node>


                  </Node>


                </Node>


              </Node>


            </Node>


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


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


                <Node name="Language.ini" selected="True" />


              </Node>


            </Node>


          </Node>


@@ -42,10 +38,17 @@


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


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


  </DisabledProjects>


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


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


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


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


  <MonoDevelop.Ide.DebuggingService.Breakpoints>


    <BreakpointStore />


    <BreakpointStore>


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" />


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


      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="119" column="1" />


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


    </BreakpointStore>


  </MonoDevelop.Ide.DebuggingService.Breakpoints>


  <MultiItemStartupConfigurations />


</Properties>




 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="202105255" android:versionName="1.2.202105255" package="com.hdl.onpro">


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202106062" android:versionName="1.2.202106062" package="com.hdl.onpro">


    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />


    <!--  可视对讲权限-->


    <uses-permission android:name="android.permission.CAMERA" />




 HDL-ON_iOS/Info.plist


@@ -104,9 +104,9 @@


    <key>UIStatusBarStyle</key>


    <string>UIStatusBarStyleLightContent</string>


    <key>CFBundleShortVersionString</key>


    <string>1.2.202105255</string>


    <string>1.2.202106062</string>


    <key>CFBundleVersion</key>


    <string>1.2.05255</string>


    <string>1.2.06062</string>


    <key>NSLocationWhenInUseUsageDescription</key>


    <string>Use geographic location to provide services such as weather</string>


    <key>NSAppleMusicUsageDescription</key>




 HDL_ON/DAL/Server/HttpUtil.cs


@@ -153,9 +153,7 @@


                {


                    urlHead = OnAppConfig.Instance.RequestHttpsHost;


                }


                urlHead="https://test-gz.hdlcontrol.com";


                //"https://bahrain-gateway.hdlcontrol.com";


                //urlHead="https://china-gateway.hdlcontrol.com";




                string requestFullUrl = urlHead + apiPath;








 HDL_ON/UI/MainPage.cs


@@ -20,7 +20,7 @@


        /// <summary>


        /// 版本号


        /// </summary>


        public static string VersionString = "1.2.0525";


        public static string VersionString = "1.2.0606";


        ///// <summary>


        ///// 客户端类型


        ///// </summary>