From 65dafd4fde255b9e0bee516345453ea2b3bb2090 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 08 七月 2021 13:37:14 +0800
Subject: [PATCH] 安卓：乐橙闪退处理
---
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 32 ++++++++
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4 -
HDL_ON/Entity/Function/Function.cs | 1
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 94 +++++++++++++++++++++--
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs | 3
.vs/HDL_APP_Project/xs/UserPrefs.xml | 43 ++++------
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 2
11 files changed, 140 insertions(+), 48 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 303c431..b80ef41 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,42 +1,31 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs" Line="121" Column="39" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs" Line="44" Column="17" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="22" Column="89" />
- <File FileName="HDL-ON_iOS/Info.plist" />
+ <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" />
</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="DriverLayer" expanded="True" />
- <Node name="Mqtt" 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="UI1-Login" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
- </Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True" />
- </Node>
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
</Node>
</Node>
+ <Node name="Entity" expanded="True" />
</Node>
- <Node name="HDL-ON_iOS" expanded="True" selected="True" />
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -48,8 +37,8 @@
<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.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|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" />
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index f3aab45..6511e92 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -51,7 +51,6 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
- <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 389565c..98c7a12 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="202107061" android:versionName="1.2.202107061" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202107081" android:versionName="1.2.202107081" 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/Info.plist b/HDL-ON_iOS/Info.plist
index a1cde2e..b4ff9fc 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -13,10 +13,6 @@
<string>AispeechMobile</string>
</dict>
<dict>
- <key>CFBundleURLName</key>
- <string>xiaoduapp</string>
- </dict>
- <dict>
<key>CFBundleURLSchemes</key>
<array>
<string>hdlonpro</string>
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index b271fdb..0dec30c 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/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 04b4840..15c1e19 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1258,6 +1258,7 @@
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
+ spkList.Add(SensorEnvironment);
return spkList;
}
#endregion
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 639ff0a..0a502ab 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.0707";
+ public static string VersionString = "1.2.0708";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 56d3f19..b2005e4 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -213,7 +213,7 @@
//etAccount.Text = "18316120654";//tujie
// "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
etAccount.Text = "15626203746";
- etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
+ //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
}
else
{
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index f0fdbc0..f85bcf3 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -32,6 +32,22 @@
if (bodyView != null)
{
var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
+ var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+ foreach (var enviTemp in enviSensorList)
+ {
+ var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "humidity");
+ if (tempAttr != null)
+ {
+ var newTemp = new Function()
+ {
+ name = enviTemp.name,
+ sid = enviTemp.sid,
+ deviceId = enviTemp.deviceId,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = tempAttr.value } },
+ };
+ humiSensorList.Add(newTemp);
+ }
+ }
double humiTotalValues = 0;
foreach (var temp in humiSensorList)
{
@@ -58,6 +74,22 @@
if (bodyView != null)
{
var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
+ var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+ foreach (var enviTemp in enviSensorList)
+ {
+ var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
+ if (tempAttr != null)
+ {
+ var newTemp = new Function()
+ {
+ name = enviTemp.name,
+ sid = enviTemp.sid,
+ deviceId = enviTemp.deviceId,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = tempAttr.value } },
+ };
+ tempSensorList.Add(newTemp);
+ }
+ }
double tempTotalValues = 0;
foreach (var temp in tempSensorList)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index 93eea05..3ab1bf7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -48,7 +48,8 @@
if (editResult == DAL.Server.StateCode.SUCCESS)
{
btn.Text = newName;
- }else
+ }
+ else
{
floor.roomName = oldName;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index 86d0ace..c75cf65 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -271,8 +271,53 @@
int index = 0;
foreach (var sensor in FunctionList.List.GetEnvirSensorsList())
{
- LoadSensorDiv(sensor, index);
+ if(sensor.spk == SPK.SensorEnvironment)
+ {
+ foreach (var seTemp in sensor.attributes)
+ {
+ var newTemp = new Function()
+ {
+ name = sensor.name,
+ sid = sensor.sid,
+ deviceId = sensor.deviceId,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = seTemp.value } },
+ };
+ switch (seTemp.key)
+ {
+ case "co2":
+ newTemp.spk = SPK.SensorCO2;
+ break;
+ case "pm25":
+ newTemp.spk = SPK.SensorPm25;
+ break;
+ case "humidity":
+ newTemp.spk = SPK.SensorHumidity;
+ break;
+ case "temperature":
+ newTemp.spk = SPK.SensorTemperature;
+ break;
+ case "tvoc":
+ newTemp.spk = SPK.SensorTVOC;
+ break;
+ }
+ LoadSensorDiv(newTemp, index);
+ index++;
+ }
+ }
+ else
+ {
+#if DEBUG
+ continue;
+#endif
+ LoadSensorDiv(sensor, index);
+ }
index++;
+
+ new System.Threading.Thread(() =>
+ {
+ Control.Ins.SendReadCommand(sensor);
+ })
+ { IsBackground = true }.Start();
}
}
@@ -283,10 +328,9 @@
{
var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
-
if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
{
- var sensorTag = sensor.sid;
+ var sensorTag = sensor.spk + sensor.sid + sensor.deviceId;
FrameLayout sensorView = new FrameLayout()
{
X = Application.GetRealWidth(7),
@@ -411,12 +455,6 @@
#endregion
};
-
- new System.Threading.Thread(() =>
- {
- Control.Ins.SendReadCommand(sensor);
- })
- { IsBackground = true }.Start();
}
}
@@ -710,9 +748,45 @@
{
if (bodyView != null)
{
+ if (updateTemp.spk == SPK.SensorEnvironment)
+ {
+ foreach (var seTemp in updateTemp.attributes)
+ {
+ var newTemp = new Function()
+ {
+ name = updateTemp.name,
+ sid = updateTemp.sid,
+ deviceId = updateTemp.deviceId,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = seTemp.value } },
+ };
+ switch (seTemp.key)
+ {
+ case "co2":
+ newTemp.spk = SPK.SensorCO2;
+ break;
+ case "pm25":
+ newTemp.spk = SPK.SensorPm25;
+ break;
+ case "humidity":
+ newTemp.spk = SPK.SensorHumidity;
+ break;
+ case "temperature":
+ newTemp.spk = SPK.SensorTemperature;
+ break;
+ case "tvoc":
+ newTemp.spk = SPK.SensorTVOC;
+ break;
+ }
+ if(!string.IsNullOrEmpty(newTemp.spk))
+ {
+ LoadEvent_UpdataStatus(newTemp);
+ }
+ }
+ }
+
for (int i = 0; i < bodyView.sensorListView.ChildrenCount; i++)
{
- var sensorTag = updateTemp.sid;
+ var sensorTag = updateTemp.spk + updateTemp.sid + updateTemp.deviceId;
var view = bodyView.sensorListView.GetChildren(i);
if (view.GetType() == typeof(FrameLayout))
{
--
Gitblit v1.8.0