From 6088557e7bfc84e627f5da97d107771eb7afb151 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 03 九月 2021 11:04:30 +0800
Subject: [PATCH] 1
---
HDL-ON_iOS/Info.plist | 4 ++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 12 ++++++++----
HDL_ON/UI/UI1-Login/LoginPage.cs | 3 +--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 67c9948..28b8041 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,6 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Info.plist">
<Files>
<File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="89" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs" Line="304" Column="119" />
@@ -8,15 +8,19 @@
<File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="605" Column="54" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="288" Column="103" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption.cs" Line="8" Column="31" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="213" Column="54" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="208" Column="54" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="895" Column="68" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs" Line="62" Column="49" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="142" Column="2" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
</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_iOS" expanded="True">
+ <Node name="Info.plist" selected="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index f7ea616..c7e7475 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.2.202100921</string>
+ <string>1.2.202109022</string>
<key>CFBundleVersion</key>
- <string>1.2.09021</string>
+ <string>1.2.09022</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4510b85..24c5e09 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -205,7 +205,6 @@
{
//etAccount.Text = "tf@smarttech.com.ua";//鍥藉璐﹀彿锛屾湁浣忓畢锛岀櫥褰曟棤娉曟樉绀�
//etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
- //etAccount.Text = "13450425803";
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
@@ -213,7 +212,7 @@
//etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "15626203746";
- //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
+ etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
}
else
{
--
Gitblit v1.8.0