From 55c2df277f4e6af6ee6ccb9851a53709eb3b063b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 15 十月 2021 09:53:27 +0800
Subject: [PATCH] sj
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs | 2 ++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 27 ++++++++++++++++++---------
HDL_ON/UI/UI1-Login/LoginPage.cs | 2 +-
4 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index d971019..f3d27b0 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,23 +1,32 @@
锘�<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/2-Classification/FunctionControlZone.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs" Line="351" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs" Line="741" Column="24" />
<File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" />
<File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" Line="26" Column="1" />
<File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="237" Column="52" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" Line="186" Column="54" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="400" Column="14" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="208" Column="51" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="67" Column="30" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="239" Column="24" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="492" Column="49" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="30" Column="20" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
+ <Node name="HDL_ON" expanded="True">
+ <Node name="UI" expanded="True" />
+ </Node>
<Node name="HDL-ON_Android" selected="True" />
</Node>
</State>
@@ -30,7 +39,7 @@
<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.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 06c336b..fd879be 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="202110143" android:versionName="1.2.202110143" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202110145" android:versionName="1.2.202110145" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 527045c..966b679 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -234,7 +234,7 @@
etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
//etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
//etAccount.Text = "18402017839";//wjc
- //etAccount.Text = "13430286286";//cwc
+ etAccount.Text = "13430286286";//cwc
}
b = !b;
etPassword.Text = "123456";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
index 8f9ab01..848c823 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
@@ -738,10 +738,12 @@
this.btnFanView.Text = this.dicText["1妗�"];
}
this.btnFan.IsSelected = this.airFreshData.Open;
+ this.btnFan.CanClick = this.airFreshData.Open;
this.btnSetHumidityView.Text = this.airFreshData.Humidity.ToString() + "%";
this.btnSetHumidity.Enable = this.airFreshData.Open;
this.btnSetHumidity.CanClick = this.airFreshData.Open;
+ this.btnSetHumidity.IsSelected = this.airFreshData.Open;
}
--
Gitblit v1.8.0