From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。

---
 HDL-ON_Android/HDL-ON_Android.csproj |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 1d0bb75..fe96c56 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -620,16 +620,13 @@
     <AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />
-    <AndroidAsset Include="Assets\Phone\LogicIcon\timecondition.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />
-    <AndroidAsset Include="Assets\Phone\LogicIcon\timeicon.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon5.png" />
-    <AndroidAsset Include="Assets\Phone\LogicIcon\delayed.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />
@@ -655,6 +652,7 @@
     <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelGray.png" />
     <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelTip.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\time.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />

--
Gitblit v1.8.0