From 52748710122f275a060538564c1086e69d11ff76 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 08 七月 2021 19:37:18 +0800
Subject: [PATCH] 新增功能：海林传感器，调试云端接口，暂时无法通过接口读取数据 Bug修复：乐橙可视对讲历史记录
---
HDL_ON/Entity/Function/Scene.cs | 2
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 2
HDL-ON_Android/Assets/Language.ini | 4
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 5 -
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 43 ++++++++------
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 6 +-
HDL_ON/Entity/FunctionList.cs | 19 ++++-
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 4
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 4
HDL_ON/DAL/Server/NewAPI.cs | 3
HDL_ON/Entity/Function/Function.cs | 13 ++++
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs | 12 +++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 26 +++-----
HDL_ON/DAL/DriverLayer/Control.cs | 20 ++++++
HDL_ON/UI/UI1-Login/LoginPage.cs | 1
17 files changed, 108 insertions(+), 64 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b80ef41..9ec7481 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,29 +1,24 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs">
<Files>
- <File FileName="HDL_ON/Entity/FunctionList.cs" Line="128" Column="50" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="331" Column="4" />
- <File FileName="HDL_ON/Entity/Function/Scene.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs" Line="42" Column="30" />
- <File FileName="HDL_ON/Entity/Function/Sensor.cs" Line="253" Column="1" />
- <File FileName="HDL-ON_Android/LeChengVideoActivity.cs" Line="114" Column="1" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="55" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="22" Column="87" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="190" Column="57" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="420" Column="21" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True">
+ <Node name="Function.cs" selected="True" />
</Node>
</Node>
- <Node name="Entity" expanded="True" />
</Node>
<Node name="HDL-ON_iOS" expanded="True" />
</Node>
@@ -37,12 +32,11 @@
<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.7374d754" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<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" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="384" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 6a316d9..229d6ae 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -641,7 +641,7 @@
4000=Video intercom
4001=Call record
-4002=*Cloud photos are only kept for 30 days
+4002=*Cloud records are only kept for 30 days
4003=Door phone call
4004=Answered
4005=Unlocked
@@ -1720,7 +1720,7 @@
4000=鍙瀵硅
4001=閫氳瘽璁板綍
-4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4002=*浜戠璁板綍鍙繚鐣�30澶�
4003=闂ㄥ彛鏈哄懠鍙�
4004=宸叉帴鍚�
4005=宸插紑閿�
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index b4ff9fc..c4c4c22 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.202107071</string>
+ <string>1.2.202107081</string>
<key>CFBundleVersion</key>
- <string>1.2.07071</string>
+ <string>1.2.07081</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 3dce668..61032f9 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -640,7 +640,7 @@
4000=Video intercom
4001=Call record
-4002=*Cloud photos are only kept for 30 days
+4002=*Cloud records are only kept for 30 days
4003=Door phone call
4004=Answered
4005=Unlocked
@@ -1719,7 +1719,7 @@
4000=鍙瀵硅
4001=閫氳瘽璁板綍
-4002=*浜戠鐓х墖鍙繚鐣�30澶�
+4002=*浜戠璁板綍鍙繚鐣�30澶�
4003=闂ㄥ彛鏈哄懠鍙�
4004=宸叉帴鍚�
4005=宸插紑閿�
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 0152ec7..0724f2b 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -359,6 +359,15 @@
}
}
}
+ //Bug淇锛氫竴绔彛杩滅▼鎺у埗璋冨厜璁惧鐨勮皟鍏夊睘鎬ф椂锛屾棤娉曟帶鍒跺埌0锛屽弽澶嶆í璺炽��
+ //鍥犱负On + 杩滅▼鎺у埗鍙戦�佺粰浜戠浣跨敤鐨勬槸link鍗忚鏁版嵁锛屾潹娑涗腑杞粰楂樿儨澶勭悊鏃跺�欓�昏緫涓婃湁鍐茬獊锛屽鑷存棤娉曞崟鐙帶鍒朵寒搴﹀�硷紝闇�瑕佸悓鏃跺彂閫佸紑鍏冲�间笌浜害鍊笺��
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ if(commandDictionary.Count == 1 && commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
+ {
+ commandDictionary.Add(FunctionAttributeKey.OnOff, commandDictionary[FunctionAttributeKey.Brightness] == "0" ? "off" : "on");
+ }
+ }
///dome鎺у埗
if (MainPage.NoLoginMode)
@@ -902,6 +911,17 @@
}
EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
break;
+ case SPK.SensorEnvironment:
+ if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Temperature))
+ {
+ HomePage.LoadEvent_RefreshEnvirIndoorTemp();
+ }
+ if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Humidity))
+ {
+ HomePage.LoadEvent_RefreshEnvirIndoorHumi();
+ }
+ EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
+ break;
case SPK.ElectricSocket:
SocketPage.UpdataState(localFunction);
break;
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 0dec30c..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>
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 2871e44..bd27310 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -632,7 +632,8 @@
/// <summary>
/// 鑾峰彇閫氳瘽璁板綍
/// </summary>
- public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
+ //public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
+ public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
/// <summary>
/// 鍒犻櫎閫氳瘽璁板綍
/// </summary>
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 15c1e19..38ecf24 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -281,6 +281,11 @@
return _trait_on_off;
}
}
+ /// <summary>
+ /// 鍔熻兘鐨勫睘鎬х姸鎬佸垪琛�
+ /// </summary>
+ public List<AttributesStatus> status = new List<AttributesStatus>();
+
/// <summary>
/// 浣跨敤娆℃暟
@@ -660,7 +665,7 @@
public List<AttributesStatus> status = new List<AttributesStatus>();
}
/// <summary>
- /// a鍗忚鎺у埗鍔ㄤ綔鏁版嵁
+ /// 鍔熻兘灞炴�х姸鎬�
/// </summary>
public class AttributesStatus
{
@@ -712,6 +717,7 @@
/// </summary>
public object curValue = new object();
}
+
/// <summary>
/// 鍔熻兘灞炴�ч敭鍚嶅垪琛�
/// </summary>
@@ -773,6 +779,7 @@
/// 绌鸿皟銆佸湴鐑�//app鑷姞
/// </summary>
public const string TempType = "temperature_type";
+
/// <summary>
/// 鏃堕棿鏍囪
/// 鍦扮儹//app鑷姞
@@ -884,6 +891,10 @@
/// </summary>
public const string Humidity = "humidity";
/// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const string Temperature = "temperature";
+ /// <summary>
/// 瀹ゅ唴娓╁害
/// </summary>
public const string IndoorTemp = "indoor_temp";
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index b9ecb02..29a3503 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -87,7 +87,7 @@
/// <summary>
/// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
/// </summary>
- public string userId = "";
+ public string userId = UserInfo.Current.ID;
///// <summary>
///// 鍦烘櫙鑳屾櫙
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 042a71b..0d84b83 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -478,11 +478,20 @@
var revPack = pm.AddScene(scene);
if (revPack.Code == StateCode.SUCCESS)
{
- var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
- tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
- FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
- result = tempScene;
+ if (MainPage.NoLoginMode)
+ {
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(scene));
+ FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ result = scene;
+ }
+ else
+ {
+ var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
+ tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
+ FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ result = tempScene;
+ }
}
else
{
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index b2005e4..8d3d3da 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -230,6 +230,7 @@
//etAccount.Text = "551775569@qq.com";//wcf
//etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
//etAccount.Text = "15971583093";// gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 鍥藉鏈嶅姟鍣ㄦ祴璇�
+ etAccount.Text = "15971583093";//楂樿儨 璋冨厜0 100 鍙嶅妯烦
}
b = !b;
etPassword.Text = "123456";
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 63b97f5..f057023 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1127,7 +1127,7 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ if (scene.userId == UserInfo.Current.ID)
{
view.AddChidren(btnSettingIcon);
}
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index f85bcf3..f704df6 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -43,7 +43,7 @@
name = enviTemp.name,
sid = enviTemp.sid,
deviceId = enviTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = tempAttr.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
};
humiSensorList.Add(newTemp);
}
@@ -85,7 +85,7 @@
name = enviTemp.name,
sid = enviTemp.sid,
deviceId = enviTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = tempAttr.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
};
tempSensorList.Add(newTemp);
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs
index 37d4567..6da7fb2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs
@@ -195,15 +195,21 @@
{
list.Add(logic.name);
}
- new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view
- ) =>
+ new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view) =>
{
Logic.currlogic.name = logicName;
Logic.currlogic.sid = LogicMethod.CurrLogicMethod.NewSid();
+ if (MainPage.NoLoginMode)
+ {
+ Logic.currlogic.userLogicId = Guid.NewGuid().ToString();
+ Logic.LogicList.Add(Logic.currlogic);
+ LogicMethod.CurrLogicMethod.RemoveAllView();
+ MainView.MainShow();
+ return;
+ }
loading.Start();
new System.Threading.Thread(() =>
{
-
try
{
//鍙戦�佹柊鍔犻�昏緫鍛戒护锛�
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 15217b3..6754818 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -413,11 +413,6 @@
IsSelected = scene.collect,
};
view.AddChidren(btnCollection);
- //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- //{
- // view.AddChidren(btnCollection);
- //}
btnCollection.MouseUpEventHandler = (sender, e) => {
scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
scene.CollectScene();
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index bfeb602..f05323d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -105,6 +105,7 @@
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(603 - 50),
+ //BackgroundColor = CSS_Color.DividingLineColor,
};
bodyView.AddChidren(contentView);
contentView.AddChidren(new Button() { Height = Application.GetRealWidth(12) });
@@ -113,7 +114,7 @@
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(252),
- Height = Application.GetRealWidth(188 + 24),
+ Height = Application.GetRealWidth(184),
Radius = (uint)Application.GetRealWidth(12),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -325,28 +326,28 @@
functionListView = new VerticalScrolViewLayout()
{
- Height = 0,
+ Height = Application.GetRealHeight(228+48),
+ BackgroundColor = CSS_Color.DividingLineColor,
ScrollEnabled = false,
};
contentView.AddChidren(functionListView);
LoadFunctionRow(functionListView);
- Button btnLine1 = new Button()
- {
- //Y = sceneDelayRow.Bottom,
- Height = Application.GetRealHeight(8),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- contentView.AddChidren(btnLine1);
+ //Button btnLine1 = new Button()
+ //{
+ // //Y = sceneDelayRow.Bottom,
+ // Height = Application.GetRealHeight(8),
+ //};
+ //contentView.AddChidren(btnLine1);
- Button btnLine2 = new Button()
- {
- //Y = sceneDelayRow.Bottom,
- Height = Application.GetRealHeight(228),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- contentView.AddChidren(btnLine2);
+ //Button btnLine2 = new Button()
+ //{
+ // //Y = sceneDelayRow.Bottom,
+ // Height = Application.GetRealHeight(228),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ //};
+ //contentView.AddChidren(btnLine2);
#endregion
Button btnBottomLine = new Button()
@@ -380,7 +381,10 @@
void LoadFunctionRow(VerticalScrolViewLayout functionListView)
{
functionListView.RemoveAll();
- functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
+ if (scene.functions.Count > 4)
+ {
+ functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
+ }
foreach (var scenefunction in scene.functions)
{
var row = new RowLayout()
@@ -483,7 +487,10 @@
btnDelSceneFunction.MouseUpEventHandler = (sender, e) => {
scene.functions.Remove(scenefunction);
row.RemoveFromParent();
- functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
+ if (scene.functions.Count > 4)
+ {
+ functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
+ }
};
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index c75cf65..cd99561 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -280,7 +280,7 @@
name = sensor.name,
sid = sensor.sid,
deviceId = sensor.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = seTemp.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state, curValue = seTemp.curValue } },
};
switch (seTemp.key)
{
@@ -310,8 +310,8 @@
continue;
#endif
LoadSensorDiv(sensor, index);
+ index++;
}
- index++;
new System.Threading.Thread(() =>
{
@@ -757,7 +757,7 @@
name = updateTemp.name,
sid = updateTemp.sid,
deviceId = updateTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = seTemp.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state ,curValue = seTemp.curValue} },
};
switch (seTemp.key)
{
--
Gitblit v1.8.0