From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 09:44:37 +0800
Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库，iOS EditText取消默认密码输入方式。
---
HDL-ON_Android/HDL-ON_Android.csproj | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index ebcbe32..28148ed 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -209,7 +209,7 @@
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
- <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -617,6 +617,36 @@
<AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />
<AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />
<AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" />
+ <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" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\weekon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\outletlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\back.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\scene.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\editname.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon1.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon2.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon3.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon4.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0