From efb9eeae0cd82b15b21d947784147e9a98308a65 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 十二月 2021 09:26:30 +0800
Subject: [PATCH] 1
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4 +-
HDL-ON_iOS/HDL-ON_iOS.csproj | 1
.vs/HDL_APP_Project/xs/UserPrefs.xml | 55 ++++++---------------------
HDL_ON/UI/MainPage.cs | 2
5 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 47602a9..08a93c6 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -2,63 +2,33 @@
<MonoDevelop.Ide.ItemProperties.SiriIntentUI>
<MonoDevelop.MacDev.AppleDevelopmentTeam />
</MonoDevelop.Ide.ItemProperties.SiriIntentUI>
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
<Files>
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="65" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="SiriIntents/HDLRunSceneIntentHandlder.cs" Line="116" Column="96" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs" Line="1" Column="1" />
- <File FileName="SiriKit/Data/SceneDateManager.cs" Line="41" Column="1" />
- <File FileName="SiriIntentsUI/IntentViewController.cs" Line="33" Column="48" />
- <File FileName="SiriIntents/Server/HttpUtil.cs" Line="27" Column="23" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="20" Column="87" />
- <File FileName="HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs" Line="293" Column="19" />
- <File FileName="SiriIntentsUI/IntentViewController.designer.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="209" Column="2" />
- <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" Line="140" Column="10" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="892" Column="78" />
- <File FileName="HDL_ON/UI/UI2/UserPageBLL.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="38" Column="43" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1391" Column="38" />
+ <File FileName="SiriIntents/Server/HttpUtil.cs" Line="19" Column="65" />
+ <File FileName="SiriKit/Base.lproj/Intents.intentdefinition" Line="162" Column="3" />
+ <File FileName="SiriIntentsUI/IntentViewController.cs" Line="47" Column="47" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="439" Column="17" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="29" Column="51" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- <Node name="Server" expanded="True">
- <Node name="HttpServerRequest.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 name="MainPage.cs" selected="True" />
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="LeChengVideo" expanded="True">
- <Node name="Form" expanded="True" />
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Other" expanded="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
<Node name="SiriIntents" expanded="True">
<Node name="Server" expanded="True" />
</Node>
- <Node name="SiriIntentsUI" expanded="True">
- <Node name="IntentViewController.cs" expanded="True" />
- </Node>
+ <Node name="SiriIntentsUI" expanded="True" />
<Node name="SiriKit" expanded="True">
<Node name="Base.lproj" expanded="True" />
- <Node name="Data" expanded="True" />
</Node>
</Node>
</State>
@@ -80,14 +50,13 @@
<String>HDLSiriKit/HDLSiriKit.csproj</String>
<String>SiriBinding/SiriBinding.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="28" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="14" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" line="366" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1359" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 5533d7f..4c2afa8 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/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="202111231" android:versionName="1.3.202111231" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202111301" android:versionName="1.3.202111301" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 941ee2a..b8b1496 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -72,7 +72,6 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
- <CodesignProvision>OnPro-Hoc20211117-1</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index be3cd85..09e5f7d 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.3.202111231</string>
+ <string>1.3.202112061</string>
<key>CFBundleVersion</key>
- <string>1.3.11231</string>
+ <string>1.3.12061</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 043eafc..b8d5627 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.3.1123";
+ public static string VersionString = "1.3.1206";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
--
Gitblit v1.8.0