From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码
---
HDL-ON_iOS/ViewController.cs | 1
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_Android/Assets/Language.ini | 2
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 4
HDL-ON_iOS/HDL-ON_iOS.csproj | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs | 1
HDL-ON_iOS/AppDelegate.cs | 1
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs | 4
.vs/HDL_APP_Project/xs/UserPrefs.xml | 45 +++++++-
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 2
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 79 ++++++++-------
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 13 +-
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 2
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll | 0
HDL_ON/Entity/FunctionList.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs | 11 +-
HDL_ON/Entity/Function/Function.cs | 13 +-
HDL_ON/DAL/Server/HttpUtil.cs | 8 -
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs | 16 +-
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 40 ++++----
HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs | 10 -
26 files changed, 150 insertions(+), 124 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index d390c4c..f35a1e0 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,41 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs">
+锘�<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/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs">
<Files>
- <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="16" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="200" Column="80" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" Line="34" Column="13" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs" Line="664" Column="55" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs" Line="327" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs" Line="342" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="335" Column="45" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1242" Column="19" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="199" Column="50" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="368" Column="49" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
- <Node name="HDL_APP_Project" expanded="True" />
+ <Node name="HDL_APP_Project" expanded="True">
+ <Node name="HDL_ON" expanded="True">
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Enumerative" expanded="True" />
+ <Node name="Function" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI2" expanded="True">
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True">
+ <Node name="ConditionDeviceFunList.cs" selected="True" />
+ </Node>
+ <Node name="Scene" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </Node>
</State>
</Pad>
</Pads>
@@ -19,10 +46,12 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.822QECU5228FU" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
index 78a7649..7974ad9 100644
--- a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
+++ b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
Binary files differ
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 7ece7fc..6a316d9 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1704,7 +1704,7 @@
1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
1153=缁堟
1154=姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
-1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢鏂扮鐞嗗憳
1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
1157=杩囨埛澶辫触
1158=璇烽噸鏂板皾璇�
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index a12b1bc..fc35615 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="202107023" android:versionName="1.2.202107023" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202107052" android:versionName="1.2.202107052" 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/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 8ea5561..03ce2b3 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -245,6 +245,7 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
+ Console.WriteLine("111111111111");
SetCurrentLanguage();
//Shared.Application.FontSize = 12;
//Bugly.Bugly.StartWithAppId("b58fb35436");
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 15f7215..d26dc65 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,6 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
-<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>On+Dev-20210616-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index c90f41b..d481868 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.202107023</string>
+ <string>1.2.202107052</string>
<key>CFBundleVersion</key>
- <string>1.2.07023</string>
+ <string>1.2.07052</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 98e2f4c..3dce668 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1703,7 +1703,7 @@
1152=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
1153=缁堟
1154=姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
-1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+1155=鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢鏂扮鐞嗗憳
1156=璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
1157=杩囨埛澶辫触
1158=璇烽噸鏂板皾璇�
@@ -1802,7 +1802,7 @@
6016=绂荤嚎
6017=鐗堟湰鍙�
6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被锛屾煡鎵句娇鐢�
6020=鎺ㄨ崘鎸夐敭
6021=璇疯緭鍏ユ寜閿悕绉�
6022=涓嬩竴姝�
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index 05c71bf..ddecb00 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -24,6 +24,7 @@
public override void ViewDidLoad()
{
+ Console.WriteLine("qidong 1111");
base.ViewDidLoad();
HDL_ON.MainPage.Show();
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index d038f71..b271fdb 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,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>
@@ -329,10 +329,6 @@
urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
string requestFullUrl = urlHead + apiPath;
-
- ////**************娴嬭瘯**************
- //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- ////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
RestRequest request = new RestRequest(Method.POST);
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 252f912..069dd71 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1164,7 +1164,7 @@
/// <summary>
/// 瓒呭０娉紶鎰熷櫒
/// </summary>
- public const string SensoruUtrasonic = "sensor.ultrasonic";
+ public const string SensorUtrasonic = "sensor.ultrasonic";
/// <summary>
/// 锛堝共鎺ョ偣锛�
/// </summary>
@@ -1173,10 +1173,6 @@
/// 姣背娉紶鎰熷櫒
/// </summary>
public const string SenesorMegahealth = "sensor.megahealth";
- /// <summary>
- /// 鐜妫�娴嬩紶鎰熷櫒
- /// </summary>
- public const string SenesorEnvironment = "sensor.environment";
/// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
/// </summary>
@@ -1220,6 +1216,13 @@
/// 婀垮害浼犳劅鍣�
/// </summary>
public const string SensorHumidity = "sensor.humidity";
+ /// <summary>
+ /// 鐜浼犳劅鍣�
+ /// 鐜妫�娴嬩紶鎰熷櫒
+ /// 鐗规畩绫籹pk
+ /// 璇pk鍔熻兘鏄幆澧冧紶鎰熷櫒鍔熻兘鐨勯泦鎴�
+ /// </summary>
+ public const string SensorEnvironment = "sensor.environment";
/// <summary>
/// 鐜浼犳劅鍣╯pk鍒楄〃
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 1f2fe17..042a71b 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -184,7 +184,6 @@
/// <para>false:鐩存帴鏃犳潯浠舵坊鍔�</para></param>
public void IniFunctionList(string filePath, bool checkRepeat = false)
{
- //MainPage.Log("12346890sdkxghjkl");
// todo 澧炲姞璁惧锛屽鍔犲姛鑳借繘鍔熻兘鍒楄〃
if (filePath.StartsWith("FunctionData_"))
{
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 59b607b..256e79f 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0702";
+ public static string VersionString = "1.2.0705";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 022b8bc..aa64eb6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -221,7 +221,7 @@
//etAccount.Text = "15217626103";//
//etAccount.Text = "13682244600";//娉㈠摜
//etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
- etAccount.Text = "551775569@.com";
+ etAccount.Text = "551775569@qq.com";
//etAccount.Text = "13168123446";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
//etAccount.Text = "13602944661";//kx
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 5e24b64..5b55584 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -150,7 +150,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -278,7 +278,7 @@
case SPK.SensorDuiShe:
case SPK.SensorPir:
case SPK.SensorDoorWindow:
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
keyVlaue = "status";
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c888bc1..cf14834 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -256,7 +256,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
string str = "";
foreach (var dic in dicList)
@@ -1348,7 +1348,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
foreach (var dic in dicList)
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 85ad984..15217b3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -1,5 +1,5 @@
锘縰sing System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -21,8 +21,8 @@
/// 鍦烘櫙鍐呭鏄剧ず鍖哄煙
/// </summary>
FrameLayout floorChangeView;
- /// <summary>
- /// 妤煎眰鎴块棿閫夋嫨鐨勪笅鎷夊璞�
+ /// <summary>
+ /// 妤煎眰鎴块棿閫夋嫨鐨勪笅鎷夊璞�
/// </summary>
FloorRoomSelectPopupView floorRoomSelectView = null;
Button btnSceneTilte;
@@ -136,9 +136,9 @@
}
btnAddIcon = new Button()
{
- X = Application.GetRealWidth(337-20),
- Width = Application.GetMinRealAverage(28+30),
- Height = Application.GetMinRealAverage(28+29),
+ X = Application.GetRealWidth(337 - 20),
+ Width = Application.GetMinRealAverage(28 + 30),
+ Height = Application.GetMinRealAverage(28 + 29),
};
//if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
@@ -189,7 +189,7 @@
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
X = Application.GetRealWidth(16),
- Gravity = Gravity.CenterVertical,
+ Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Public/DownIcon.png",
};
floorChangeView.AddChidren(btnFloorDownIcon);
@@ -199,7 +199,7 @@
btnFloor = new Button()
{
X = btnFloorDownIcon.Right,
- Gravity = Gravity.CenterVertical,
+ Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(200),
Height = Application.GetMinRealAverage(16),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -207,30 +207,30 @@
TextAlignment = TextAlignment.CenterLeft,
Text = DB_ResidenceData.Instance.CurFloor.roomName,
};
- floorChangeView.AddChidren(btnFloor);
-
- string nowSelectId = null;
- btnFloor.MouseUpEventHandler += (sender, e) =>
- {
- if (this.floorRoomSelectView == null)
- {
- //鍏堝垵濮嬪寲
- this.floorRoomSelectView = new FloorRoomSelectPopupView();
- }
- //鏄剧ず涓嬫媺鍒楄〃
- this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
- {
- nowSelectId = selectId;
- //閲嶆柊鍒锋柊鍦烘櫙鍒楄〃
- this.LoadSceneFunctionControlZone(listScene);
- }, nowSelectId);
+ floorChangeView.AddChidren(btnFloor);
+
+ string nowSelectId = null;
+ btnFloor.MouseUpEventHandler += (sender, e) =>
+ {
+ if (this.floorRoomSelectView == null)
+ {
+ //鍏堝垵濮嬪寲
+ this.floorRoomSelectView = new FloorRoomSelectPopupView();
+ }
+ //鏄剧ず涓嬫媺鍒楄〃
+ this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
+ {
+ nowSelectId = selectId;
+ //閲嶆柊鍒锋柊鍦烘櫙鍒楄〃
+ this.LoadSceneFunctionControlZone(listScene);
+ }, nowSelectId);
};
#endregion
-
+
sceneFunctionView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(53),
+ Y = Application.GetRealHeight(53),
Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
};
scenePageView.AddChidren(sceneFunctionView);
@@ -250,15 +250,15 @@
{
int index = 0;
//鑾峰彇鑳藉鏄剧ず鐨勫満鏅�
- if (listScene == null)
- {
- //鍒濆鍊�
- if (this.floorRoomSelectView == null)
- {
- //鍏堝垵濮嬪寲
- this.floorRoomSelectView = new FloorRoomSelectPopupView();
- }
- listScene = this.floorRoomSelectView.GetCanShowListScene();
+ if (listScene == null)
+ {
+ //鍒濆鍊�
+ if (this.floorRoomSelectView == null)
+ {
+ //鍏堝垵濮嬪寲
+ this.floorRoomSelectView = new FloorRoomSelectPopupView();
+ }
+ listScene = this.floorRoomSelectView.GetCanShowListScene();
}
foreach (var scene in listScene)
{
@@ -503,7 +503,7 @@
contentPageView.AddChidren(automationPage);
UI2.Intelligence.Automation.MainView.automationPage = automationPage;
UI2.Intelligence.Automation.MainView.MainShow();
- }
+ }
#endregion
}
@@ -606,7 +606,8 @@
else
{
//璺宠浆鍒伴�昏緫鐣岄潰
- UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
+ UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
+ logicMainView.SkipAddLogicPage();
}
};
}
@@ -615,7 +616,7 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
+ void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Button btnShowDelay, Scene scene)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 3d30cdf..2899a09 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -331,6 +331,8 @@
functionListView = new VerticalScrolViewLayout() {
Height = 0,
+ ScrollEnabled = false,
+ BackgroundColor = 0xffff0000
};
contentView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
index c770e5a..dd7c026 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -82,7 +82,7 @@
quyuPatchView.frameLayout.Y = namePatchView.frameLayout.Bottom;
this.AddChidren(quyuPatchView.FLayoutView());
quyuPatchView.btnText1.TextID = StringId.suoshuquyu;
- quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(GetFunction(control.deviceId));
+ quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(GetFunction(control.deviceId));
//缁х画娣诲姞
Button addBtn = new Button
@@ -137,7 +137,7 @@
method.ManagementPosition(GetFunction(control.deviceId), () =>
{
//鏇存柊鍖哄煙
- quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(GetFunction(control.deviceId));
+ quyuPatchView.btnText2.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(GetFunction(control.deviceId));
});
};
//缁х画娣诲姞鐐瑰嚮浜嬩欢
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
index 547e878..519e855 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs
@@ -11,7 +11,7 @@
{
Tag = "PirView";
}
- public void Show(Entity.Function control,Action<Entity.Function> action)
+ public void Show(Entity.Function control, Action<Entity.Function> action)
{
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -33,7 +33,7 @@
};
this.AddChidren(viewLayout);
//閬ユ帶鍣ㄥ悕绉�:
- FrameLayout50 editNameFLayout = new FrameLayout50();
+ FrameLayout50 editNameFLayout = new FrameLayout50();
editNameFLayout.btnText.Text = Language.StringByID(StringId.yaokongqimingcheng) + ":";
editNameFLayout.btnEditText.Text = control.name;
editNameFLayout.btnNextIcon.Height = Application.GetRealWidth(28);
@@ -41,9 +41,9 @@
editNameFLayout.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
viewLayout.AddChidren(editNameFLayout.FLayoutView());
//閬ユ帶鍣ㄦ墍灞炲尯鍩�:
- FrameLayout50 areaFLayout = new FrameLayout50();
+ FrameLayout50 areaFLayout = new FrameLayout50();
areaFLayout.btnText.Text = Language.StringByID(StringId.yaokongqiquyu);
- areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
+ areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
areaFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
viewLayout.AddChidren(areaFLayout.FLayoutView());
#endregion
@@ -58,7 +58,7 @@
list.Add(Pir.currPir.FunctioList[i].name);
}
PirMethod method = new PirMethod();
- method.EditControlName(StringId.editName,list, control.name, (name, dialog) =>
+ method.EditControlName(StringId.editName, list, control.name, (name, dialog) =>
{
PirMethod.ThreadSend(new Control { deviceId = control.deviceId, name = name }, (responsePackNew) =>
{
@@ -67,8 +67,8 @@
control.name = name;
}, "淇敼鍚嶇О", "dialog", null, dialog);
-
- },()=> { });
+
+ }, () => { });
};
//閬ユ帶鍣ㄦ墍灞炲尯鍩熼�変腑浜嬩欢
areaFLayout.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -77,7 +77,7 @@
method.ManagementPosition(control, () =>
{
//鏇存柊鍖哄煙
- areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
+ areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
});
};
#endregion
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 38b713e..6f9eee0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -38,7 +38,7 @@
this.AddChidren(topView.FLayoutView());
topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
-
+
RemoveFromParent();
};
@@ -57,30 +57,30 @@
Width = Application.GetRealWidth(82),
Height = Application.GetRealWidth(84),
UnSelectedImagePath = "PirIcon/add.png",
- Visible=false,
+ Visible = false,
};
middFLayout.AddChidren(addDevice);
-
+
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
///涓嬫媺鍒锋柊鐣岄潰浜嬩欢
vv.BeginHeaderRefreshingAction += () =>
+ {
+ ////鍏抽棴鍒锋柊View锛�
+ vv.EndHeaderRefreshing();
+
+ PirMethod.GetControlList(this, () =>
{
- ////鍏抽棴鍒锋柊View锛�
- vv.EndHeaderRefreshing();
-
- PirMethod.GetControlList(this, () =>
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
- {
- //鍒锋柊鐣岄潰
- UIView(vv);
- });
- }, Pir.currPir);
+ //鍒锋柊鐣岄潰
+ UIView(vv);
+ });
+ }, Pir.currPir);
- };
+ };
///璁剧疆鍥炬爣鐐瑰嚮浜嬩欢
topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -126,8 +126,8 @@
GetDeviceTypeList(true, () =>
{
DeviceTypeViewClick(if_value);
- //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
- view.RemoveFromParent();
+ //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+ view.RemoveFromParent();
});
}
@@ -197,7 +197,7 @@
//閬ユ帶鍣ㄥ悕绉�
controlView.nameBtn.Text = control.name;
//閬ユ帶鍣ㄥ瓨鏀惧尯鍩�
- controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
//鏍囪閬ユ帶鍣�
controlView.delBtn.Tag = control;
//鍒犻櫎鐐瑰嚮浜嬩欢
@@ -208,7 +208,7 @@
TipPopView tipPopView = new TipPopView();
tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
- PirMethod.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
+ PirMethod.ThreadSend(new Control { deviceId = control.deviceId }, (responsePackNew) =>
{
dialog.Close();
var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid);
@@ -232,11 +232,11 @@
{
EditControl editControl = new EditControl();
MainPage.BasePageView.AddChidren(editControl);
- editControl.Show(control,(device) =>
+ editControl.Show(control, (device) =>
{
//鍥炶皟鏇存柊鍚嶅瓧/鍖哄煙
controlView.nameBtn.Text = device.name;
- controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(device);
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device);
});
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index d6d93ae..a097bcd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -196,8 +196,10 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "FunctionIcon/AC/SweepIconNullOn.png",
};
- FrameWhiteCentet1.AddChidren(btnSwing);
-
+ if (device.GetAttribute(FunctionAttributeKey.Swing) != null)
+ {
+ FrameWhiteCentet1.AddChidren(btnSwing);
+ }
btnWindSpeed = new Button()
@@ -327,8 +329,7 @@
btnModeIcon.IsSelected = btnModeText.IsSelected = true;
device.SetAttrState(FunctionAttributeKey.Mode, m);
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(m);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- //btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.Mode, m);
Control.Ins.SendWriteCommand(device, d);
dialog.Close();
@@ -594,8 +595,8 @@
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(334 + 80),
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(30),
+ Width = Application.GetRealWidth(35),
+ Height = Application.GetRealWidth(35),
UnSelectedImagePath = "FunctionIcon/AC/More.png",
};
FrameWhiteCentet1.AddChidren(btnMore);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
index 3cc7993..11604ef 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -31,7 +31,7 @@
//鍒濆鍖栫涓�涓储寮曢〉鐨勫唴瀹�
this.InitFrameWhiteContent1();
- ;
+
}
/// <summary>
@@ -184,7 +184,7 @@
btnTitle = new Button()
{
- Y = btnIcon.Bottom,
+ Y = Application.GetRealWidth(28),
Text = title,
Height = Application.GetRealHeight(30),
TextColor = CSS_Color.TextualColor,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
index 7b051bd..5873fdd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
@@ -322,8 +322,6 @@
#endregion
new TopViewDiv(bodyView, Language.StringByID(StringId.PJT)).LoadTopView_FunctionTop(device, actionRefresh);
- DriverLayer.Control.Ins.SendReadCommand(device);
-
LoadEventList();
}
@@ -344,8 +342,8 @@
var bodyView = new FrameLayout()
{
- Y = Application.GetRealHeight(427),//667
- Height = Application.GetRealHeight(240),
+ Y = Application.GetRealHeight(417),//667
+ Height = Application.GetRealHeight(250),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
div.AddChidren(bodyView);
@@ -355,6 +353,7 @@
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(296 + 200),
+ Height = Application.GetRealHeight(234),
};
bodyView.AddChidren(contentView);
@@ -504,9 +503,6 @@
dialog.Show();
}
-
-
-
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
index b6557c1..8d323c4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
@@ -317,8 +317,8 @@
{
X = Application.GetRealWidth(116),
Y = Application.GetRealHeight(466),
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
+ Width = Application.GetRealWidth(35),
+ Height = Application.GetRealWidth(35),
UnSelectedImagePath = "FunctionIcon/AC/More.png",
};
controlView.AddChidren(btnMore);
@@ -341,8 +341,6 @@
LoadEventList();
new TopViewDiv(bodyView, Language.StringByID(StringId.STB)).LoadTopView_FunctionTop(device, actionRefresh);
- Control.Ins.SendReadCommand(device);
-
}
@@ -652,8 +650,8 @@
var bodyView = new FrameLayout()
{
- Y = Application.GetRealHeight(427),//667
- Height = Application.GetRealHeight(240),
+ Y = Application.GetRealHeight(417),//667
+ Height = Application.GetRealHeight(250),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
div.AddChidren(bodyView);
@@ -663,6 +661,7 @@
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(296 + 200),
+ Height = Application.GetRealHeight(234),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
index 0b64046..b0ee9af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -339,7 +339,6 @@
LoadEventList();
new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(function, actionRefresh);
- DriverLayer.Control.Ins.SendReadCommand(function);
}
--
Gitblit v1.8.0