From 8c6f7113f6aaa9d1fe74405070f3892886ebd156 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 17 三月 2023 17:21:06 +0800
Subject: [PATCH] 修复创景梦幻帘角度信息显示闪退问题
---
HDL_ON/Entity/Function/Scene.cs | 2 +-
HDL-ON_iOS/Resources/Language.ini | 27 +++++++++++++++++++++++++++
HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png | 0
HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 1 +
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 17 ++++++++++++++++-
6 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
index 2ccd215..3f836f1 100644
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 9d4583b..b227c9c 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1570,6 +1570,7 @@
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
<BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 7f62ed4..4e47611 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -575,6 +575,11 @@
588=Tip
589=Disagree
590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
2532=Visitor Invitation Record
@@ -1820,6 +1825,13 @@
588=浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
589=涓嶅悓鎰�
590=浣忓畢浜や粯
+591=*鎴愬憳鍚嶇О
+592=鎴愬憳璐﹀彿
+593=浜鸿劯鐓х墖
+594=璇疯緭鍏ユ垚鍛樺悕绉�
+595=鍒犻櫎浜鸿劯鏁版嵁
+
+
2532=璁垮閭�璇疯褰�
2533=璁垮绠＄悊
@@ -3040,6 +3052,11 @@
588=Tip
589=Disagree
590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
@@ -4265,6 +4282,11 @@
588=Tip
589=Disagree
590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
@@ -5475,6 +5497,11 @@
588=Tip
589=Disagree
590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png
new file mode 100644
index 0000000..52310e3
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png
Binary files differ
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index a6b5568..492def1 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -624,7 +624,7 @@
var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
if (perAngle != null)
{
- sceneFunctionInfo += " " + perState.value + "掳";
+ sceneFunctionInfo += " " + perAngle.value + "掳";
}
return sceneFunctionInfo;
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 73e67bc..5f0518a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -1,10 +1,25 @@
锘縰sing System;
+using Shared;
+
namespace HDL_ON.UI
{
- public class CombinedDimmingListPage
+ public class CombinedDimmingListPage : FrameLayout
{
+ FrameLayout bodyView;
+
public CombinedDimmingListPage()
{
+ bodyView = this;
+ }
+
+ public void LoadPage()
+ {
+
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_AddIcon("CombinedDimming",
+ (s,c)=>{
+
+ });
+
}
}
}
--
Gitblit v1.8.0