From 035c219e795a77caff26e0fac776cadc7afb0037 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 07 六月 2021 12:01:57 +0800
Subject: [PATCH] 1
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL-ON_iOS/Info.plist | 4 ++--
HDL_ON/DAL/Server/HttpUtil.cs | 4 +---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 47 +++++++++++++++++++++++++----------------------
HDL_ON/UI/MainPage.cs | 2 +-
5 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 95ed532..1f714cd 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.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>
\ No newline at end of file
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index ca58945..4e2648d 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="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" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 9d26e8c..a3295e0 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/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>
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index a380e0c..ef6c120 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/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;
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 49c6d7e..015f1e3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/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>
--
Gitblit v1.8.0