From 24068547ed1396034f56c7bd34ecbd2891f00653 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 10 五月 2021 17:39:28 +0800
Subject: [PATCH] 代码优化
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 24 +-
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 8
HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 6
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs | 94 +++++++++++
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 16 +-
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 11 +
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs | 8
HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png | 0
HDL_ON/HDL_ON.projitems | 1
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 8
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 3
HDL-ON_Android/HDL-ON_Android.csproj | 4
HDL-ON_iOS/Info.plist | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 8
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 2
HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 8
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 10
.vs/HDL_APP_Project/xs/UserPrefs.xml | 57 ++++--
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 2
HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs | 8
HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs | 8
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 12
HDL-ON_iOS/Entitlements.plist | 4
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 6
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 63 ++-----
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 1
HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 8
HDL-ON_iOS/Main.cs | 2
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 6
HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png | 0
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 14 +
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 8
HDL_ON/DAL/Server/HttpServerRequest.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 2
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs | 4
47 files changed, 289 insertions(+), 173 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index e0a7134..ef5bdbc 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,29 +1,49 @@
锘�<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/Info.plist">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/1-HomePage/HomePage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs" Line="152" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" Line="24" Column="34" />
- <File FileName="HDL_ON/Common/R.cs" Line="396" Column="58" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="856" Column="3" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1703" Column="12" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="23" Column="55" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="441" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs" Line="10" Column="42" />
- <File FileName="HDL_ON/Entity/FunctionList.cs" Line="178" Column="26" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="246" Column="14" />
- <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="1062" Column="62" />
</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 name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="ResponseEntity" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True" />
+ <Node name="UI0-Stan" expanded="True">
+ <Node name="Form" expanded="True" />
+ </Node>
+ <Node name="UI1-Login" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True">
+ <Node name="HomePage.cs" selected="True" />
+ </Node>
+ <Node name="2-Classification" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True" />
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True" />
+ </Node>
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="AC" expanded="True" />
+ <Node name="Curtain" expanded="True" />
+ <Node name="Electrical" expanded="True" />
+ <Node name="FoolHeating" expanded="True" />
+ <Node name="Light" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Info.plist" selected="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -35,13 +55,12 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<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/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="57" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIcon.png
new file mode 100644
index 0000000..aa035b9
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png
new file mode 100644
index 0000000..d53d091
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIcon.png
new file mode 100644
index 0000000..c27d6ec
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png
new file mode 100644
index 0000000..3b0b424
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 2b2c1f9..c7e7aee 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -1127,6 +1127,10 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\BurglarAlarmIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HistoryIcon.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\shiwaitianqi.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainDownIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainDownIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 73dfa52..f0ad94e 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="202104224" android:versionName="1.2.202104241" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202104282" android:versionName="1.2.202104282" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!-- 鍙瀵硅鏉冮檺-->
<uses-permission android:name="android.permission.CAMERA" />
diff --git a/HDL-ON_iOS/Entitlements.plist b/HDL-ON_iOS/Entitlements.plist
index ba21fbd..f6d873f 100644
--- a/HDL-ON_iOS/Entitlements.plist
+++ b/HDL-ON_iOS/Entitlements.plist
@@ -4,5 +4,9 @@
<dict>
<key>com.apple.developer.networking.wifi-info</key>
<true/>
+ <key>com.apple.developer.associated-domains</key>
+ <array>
+ <string>applinks:china-gateway.hdlcontrol.com</string>
+ </array>
</dict>
</plist>
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 90c1150..5618514 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -55,7 +55,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>On+Dev-20210428-1</CodesignProvision>
+<CodesignProvision>On+Dev-20210510-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -1234,6 +1234,10 @@
<BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HistoryIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityCenterFunctionBg.png" />
<BundleResource Include="Resources\Phone\LogicIcon\shiwaitianqi.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainDownIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 382550f..3cf1a8d 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.202104281</string>
+ <string>1.2.202104282</string>
<key>CFBundleVersion</key>
- <string>202104281</string>
+ <string>202104282</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Main.cs b/HDL-ON_iOS/Main.cs
index b35ec68..8ebc107 100644
--- a/HDL-ON_iOS/Main.cs
+++ b/HDL-ON_iOS/Main.cs
@@ -16,7 +16,7 @@
try
{
Shared.Application.LocationAction = null;
- new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
+ new HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
}
catch(Exception ex)
{
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIcon.png
new file mode 100644
index 0000000..aa035b9
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png
new file mode 100644
index 0000000..d53d091
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainDownIconOn.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIcon.png
new file mode 100644
index 0000000..c27d6ec
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png
new file mode 100644
index 0000000..3b0b424
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainUpIconOn.png
Binary files differ
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 1878354..361b22e 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -50,8 +50,8 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("type", qType);
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
- d.Add("deviceId", new List<string>() { deviceId });
- d.Add("key", new List<string>() { deviceKey });
+ d.Add("deviceId", deviceId );
+ d.Add("key", "value" );
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 2b7a612..a3d47c1 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
index ca7415a..7028c70 100644
--- a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
+++ b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -66,8 +66,8 @@
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
- public bool IsOthreShare = false;
-
+ public bool isOtherShare { get; set; }
+
//2020-11-13 鏂板
/// <summary>
/// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛�
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 217113f..6a92c9e 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -403,6 +403,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Entity\Function\SecurityAlarm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\ArmDeploymentSettingPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\OnePortAutomation.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EchartsOption_BrokenLine.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index fb5f8be..36b2834 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -147,7 +147,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -177,7 +177,7 @@
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -210,7 +210,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index 9407e12..1ff1ef2 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -141,7 +141,7 @@
btnRoomName.Width = btnRoomName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnRoomName);
//鎴愬憳娌℃湁鏀惰棌鍔熻兘
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false && ShowColltionButton)
+ //if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false && ShowColltionButton)
{
var btnCollection = new IconViewControl(40);
btnCollection.X = Application.GetRealWidth(273);
@@ -259,10 +259,10 @@
private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)
{
//濡傛灉鏄垚鍛樻病鏈夊姛鑳�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
- {
- return;
- }
+ //if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
+ //{
+ // return;
+ //}
//璁剧疆鍥炬爣
var btnSetting = new PicViewControl(28, 28);
btnSetting.X = Application.GetRealWidth(337);
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d8cb65e..c69b5f4 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -740,10 +740,10 @@
};
//view.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- view.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // view.AddChidren(btnCollection);
+ //}
LoadEvent_FunctionCollection(btnCollection, function);
if (//SPK.CurtainSpkList().Contains(function.spk))
@@ -1012,10 +1012,10 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- view.AddChidren(btnSettingIcon);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // view.AddChidren(btnSettingIcon);
+ //}
Button btnName;
btnName = new Button()
@@ -1059,10 +1059,10 @@
};
//view.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- view.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // view.AddChidren(btnCollection);
+ //}
LoadEvent_SceneCollection(btnCollection, scene);
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 6045637..544fcaa 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -493,7 +493,6 @@
functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
if(functionCount == 0)
{
- if(MainPage.InternetStatus == 2)
functionCount = FunctionList.List.GetMusicList().Count;
}
break;
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index c88c448..e0dbadc 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -228,7 +228,7 @@
};
//bodyDiv.AddChidren(btnCollectionIcon);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare && function.Spk_Prefix != FunctionCategory.Sensor)
+ if ( function.Spk_Prefix != FunctionCategory.Sensor)//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare &&
{
bodyDiv.AddChidren(btnCollectionIcon);
}
@@ -313,6 +313,11 @@
Tag = function.sid + "_off"
};
bodyDiv.AddChidren(btnCurtainClose);
+ if(function.spk == SPK.CurtainRoller)
+ {
+ btnCurtainClose.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png";
+ btnCurtainClose.SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png";
+ }
var btnCurtainStop = new Button()
{
@@ -338,6 +343,11 @@
IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0"
};
bodyDiv.AddChidren(btnCurtainOpen);
+ if (function.spk == SPK.CurtainRoller)
+ {
+ btnCurtainOpen.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png";
+ btnCurtainOpen.SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png";
+ }
LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function);
#endregion
}
@@ -399,7 +409,7 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "MusicIcon/pause.png",
SelectedImagePath = "MusicIcon/play.png",
- IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
+ //IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
Tag = function.spk + "_State_" + function.sid
};
bodyDiv.AddChidren(btnPlay);
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 7d61094..4791f34 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -293,6 +293,8 @@
/// <param name="curtain"></param>
void LoadEvent_ControlMusic(Button btnPlay,Button btnNext,Button btnPrev, A31MusicModel a31player)
{
+ if (a31player == null)
+ return;
///涓婁竴鏇茬偣鍑讳簨浠�
btnPrev.MouseDownEventHandler = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index bcf7f24..cdcdf18 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -191,10 +191,10 @@
};
//bodyDiv.AddChidren(btnCollectionIcon);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- bodyDiv.AddChidren(btnCollectionIcon);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // bodyDiv.AddChidren(btnCollectionIcon);
+ //}
btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
if (scene.sceneType == SceneType.MovieScene)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d14cf00..461b095 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -529,7 +529,7 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
}
}
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 2543213..a1d1ecd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -359,7 +359,8 @@
//2-鍔熻兘鍥炬爣
for (int i = 0; i < logic.input.Count; i++)
{
-
+ if (logic.input[i] == null)
+ continue;
var int1 = int.Parse(logic.input[i].condition_type);
int iconInt = 0;
switch (int1)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 4579724..b75b06e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -72,7 +72,7 @@
bodyView.AddChidren(topView);
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
- var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
@@ -130,7 +130,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
topView.AddChidren(btnAddIconBg);
}
@@ -140,7 +140,7 @@
Width = Application.GetMinRealAverage(28+30),
Height = Application.GetMinRealAverage(28+29),
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
topView.AddChidren(btnAddIcon);
}
@@ -396,7 +396,7 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
view.AddChidren(btnSettingIcon);
}
@@ -414,7 +414,7 @@
};
//view.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
view.AddChidren(btnCollection);
}
@@ -583,7 +583,7 @@
if (!btnAutomationTitle.IsSelected)
{
//濡傛灉鏄垚鍛�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
//濡傛灉娌℃湁鍦烘櫙鏉冮檺
if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 5587946..eabce7a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -308,7 +308,7 @@
BackgroundImagePath = "PersonalCenter/UserTypebg.png",
};
residenceInfoView.AddChidren(userTypeView);
- if (Language.CurrentLanguage != "Chinese" && !DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
userTypeView.X = Application.GetRealWidth(200);
userTypeView.Width = Application.GetRealWidth(180);
@@ -321,7 +321,7 @@
Y = Application.GetRealHeight(15),
Width = Application.GetMinRealAverage(20),
Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
+ UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
== false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
@@ -333,14 +333,14 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
+ TextID = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
== false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 5379de2..1f6ae80 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -18,7 +18,7 @@
LoadEvent_GoPersonalDataPage();
LoadEvent_SkipAboutOnPage();
LoadEvent_SkipGetSupportPage();
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
LoadEvent_SkipResdentialManagePage();
LoadEvent_GoMemberManagement();
@@ -135,7 +135,7 @@
var btnHomeName = new Button()
{
Width = Application.GetRealWidth(112),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(40),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS.CSS_Color.MainColor,
@@ -194,7 +194,7 @@
#region 浣忓畢绠＄悊
void LoadEvent_SkipResdentialManagePage()
{
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index ebdbebd..bd3c0d0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -43,7 +43,7 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
}
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index fcdb7b0..f355a93 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -137,10 +137,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
arcBar = new DiyArcSeekBar()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index f77216c..cefa915 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -26,7 +26,7 @@
VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(603),
+ Height = Application.GetRealHeight(667 - 64),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
@@ -71,6 +71,7 @@
{
X = Application.GetRealWidth(23),
Height = Application.GetRealWidth(80),
+ ScrollEnabled = false,
};
contentView.AddChidren(customDeploymentView);
@@ -84,6 +85,11 @@
Language.StringByID(StringId.HouseDefense));
customDeploymentView.AddChidren(view);
+ if(FunctionList.List.securities.Count>3)
+ {
+ customDeploymentView.ScrollEnabled = true;
+ }
+
foreach (var mode in FunctionList.List.securities)
{
}
@@ -96,7 +102,7 @@
var fixedDeploymentView = new FrameLayout()
{
- Height = Application.GetRealHeight(123),
+ Height = Application.GetRealHeight(133),
};
contentView.AddChidren(fixedDeploymentView);
@@ -129,6 +135,7 @@
{
Y = btnFixedDeploymentTip.Bottom + Application.GetRealHeight(15),
Height = Application.GetRealHeight(80),
+ ScrollEnabled = false,
};
fixedDeploymentView.AddChidren(fixedDeploymentTypeView);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index 6e8c66f..5427688 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -111,10 +111,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
btnCurtainBgIcon = new Button()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index 8a1097b..7940fd9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -129,10 +129,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
curtainSeekBar = new CurtainSeekBarOn()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 55ef055..3c87ac3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -129,10 +129,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
curtainSeekBar = new CurtainRollSeekBarOn()
{
@@ -201,8 +201,8 @@
Y = Application.GetRealHeight(466),
Width = Application.GetMinRealAverage(32),
Height = Application.GetMinRealAverage(32),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png",
IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0",
};
controlView.AddChidren(btnCurtainClose);
@@ -224,8 +224,8 @@
Y = Application.GetRealHeight(466),
Width = Application.GetMinRealAverage(32),
Height = Application.GetMinRealAverage(32),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png",
IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0",
};
controlView.AddChidren(btnCurtainOpen);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
index 05e47f6..c93572a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -104,10 +104,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
btnSwitchIcon = new Button()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index f34d757..d6d096b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -103,10 +103,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
btnSwitchIcon = new Button()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
index 3cf65f2..afc80b3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -119,10 +119,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
new file mode 100644
index 0000000..79ba10d
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
@@ -0,0 +1,94 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace HDL_ON.UI
+{
+ /// <summary>
+ /// 楗煎浘
+ /// </summary>
+ public class EchartsOption_BrokenLine
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="xData"></param>
+ public void InitXdata (List<string> xData)
+ {
+ //缁勮Value
+ string valueText = string.Empty;
+ foreach (var data in xData)
+ {
+ valueText += "'" + data + "',";
+ }
+ optionString = optionString.Replace("{0}", valueText);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="yData"></param>
+ public string GetYdata(string name, List<EnvironmentalSensorHistor> yData, string color)
+ {
+ //缁勮Value
+ string valueText = string.Empty;
+ var yAxisValue = @"{name:'{0}',
+ data:[{1}],
+ type:'line',
+ smooth:0.6,
+ symbol:'none',
+ color:'{2}'}
+ ";
+ yAxisValue = yAxisValue.Replace("{0}", name);
+
+ foreach (var data in yData)
+ {
+ valueText += "'" + data.fieldValue + "',";
+ }
+ yAxisValue = yAxisValue.Replace("{1}", valueText);
+ yAxisValue = yAxisValue.Replace("{2}", color);
+ return yAxisValue;
+ }
+
+ public void InitYdataString(string yData)
+ {
+ //缁勮Value
+ optionString = optionString.Replace("{1}", yData);
+ }
+
+
+ public string optionString = @"{
+ tooltip: {
+ trigger: 'axis'
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: [{0}]
+ },
+ yAxis: {
+ type: 'value',
+ },
+ series: [
+ {1}
+ ]
+ }";
+
+ /// <summary>
+ /// 棰滆壊鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<string> ColorList ()
+ {
+ var list = new List<string>();
+ return list;
+ }
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 0a5da4e..0ddb270 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -806,12 +806,8 @@
/// <summary>
/// 璇诲彇浼犳劅鍣ㄥ巻鍙叉暟鎹�
/// </summary>
- void LoadMothed_GetSensorHistoryData()
+ void LoadMothed_GetSensorHistoryData( )
{
- string echartRootJsonString;
- EchartsOption echartRootJson = new EchartsOption();
- var seriesList = new List<EchartSeriesItem>();
- echartRootJson.xAxis.data = new List<string>();
var loadPage = new Loading() {
LodingBackgroundColor = 0x88888888,
};
@@ -825,7 +821,11 @@
loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
int i = 0;
-
+
+ var ebl = new EchartsOption_BrokenLine();
+
+ string yDataString = "";
+
foreach (var sr in FunctionList.List.GetEnvirSensorsList())
{
if (sr.spk != function.spk)
@@ -840,61 +840,32 @@
var sensorType = sr.spk.Split(".")[1];
var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,sensorType);
-
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
- var sItem = new EchartSeriesItem
+ if (i == 0)
{
- name = sr.GetRoomListName(),
- data = new List<int>(),
- lineStyle = new EchartLineStyle()
+ List<string> vs = new List<string>();
+ foreach(var data in revertData)
{
- color = tipColorStringList[i],
-#if __IOS__
- width = 5,
-#elif __ANDROID__
- width = 2,
-#endif
- },
- };
-
- foreach (var d in revertData)
- {
- echartRootJson.xAxis.data.Add(d.fieldName);
- echartRootJson.yAxis.data.Add(d.fieldValue);
+ vs.Add(data.fieldName);
+ }
+ ebl.InitXdata(vs);
}
- seriesList.Add(sItem);
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- IMessageCommon.Current.ShowErrorInfoAlter("", true, 2, Language.StringByID(StringId.GetSensorHistoryFailed),false);
- //new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GetSensorHistoryFailed), true);
- });
+ yDataString += ebl.GetYdata(sr.name, revertData, tipColorStringList[i]);
}
}
i++;
}
- echartRootJson.series = seriesList;
+ ebl.InitYdataString(yDataString);
-
-#if __IOS__
- echartRootJson.xAxis.axisLabel.fontSize = 22;
- echartRootJson.yAxis.axisLabel.fontSize = 22;
-#else
- echartRootJson.xAxis.axisLabel.fontSize = 8;
- echartRootJson.yAxis.axisLabel.fontSize = 8;
-#endif
- echartRootJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(echartRootJson);
Application.RunOnMainThread(() =>
{
- myEchartsView.ShowWithOptionJsonString(echartRootJsonString);
+ myEchartsView.ShowWithOption(ebl.optionString);
});
}
@@ -930,7 +901,7 @@
btnShowHistroyData_Day.IsSelected = false;
btnShowHistroyData_Month.IsSelected = true;
btnShowHistroyData_Week.IsSelected = false;
- curQueryType = "week";
+ curQueryType = "month";
LoadMothed_GetSensorHistoryData();
};
btnShowHistroyData_Week.MouseUpEventHandler = (sender, e) =>
@@ -939,7 +910,7 @@
btnShowHistroyData_Day.IsSelected = false;
btnShowHistroyData_Month.IsSelected = false;
btnShowHistroyData_Week.IsSelected = true;
- curQueryType = "month";
+ curQueryType = "week";
LoadMothed_GetSensorHistoryData();
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index f11bb02..adf4ed6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -133,10 +133,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
arcBar = new DiyArcSeekBar()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index c7305f0..f84cdcc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -132,10 +132,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
dimmerBar = new WaveSeekBarOn()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index 3bbb89d..84a61f1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -126,10 +126,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
dimmerBar = new WaveSeekBarOn()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 372e38b..899c0aa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -141,10 +141,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
//鑹茬洏鐨勬甯冩帶浠�(闄愬埗閭ｄ釜鐧借壊婊戝姩鐞冧娇鐢�)
var framePickerBack = new FrameLayout();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 42728f6..aa139b6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -125,10 +125,10 @@
};
//controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
btnSwitchIcon = new Button()
{
--
Gitblit v1.8.0