上传一个初始版本

黄学彪

2020-12-16 28d269d8aa90eca5470fff825a9b9545135a3ec0

上传一个初始版本

 .vs/HDL_APP_Project/xs/.DS_Store

Binary files differ

 .vs/HDL_APP_Project/xs/UserPrefs.xml

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Android-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Android-Release.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Anroid_-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Release|iPhone.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Release|iPhoneSimulator.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.Droid.Smartrefresh-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.Droid.TouchID-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.IOS-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.IOS-Release.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.IOS.TBL-Debug.json

File was deleted

 .vs/HDL_APP_Project/xs/project-cache/Shared.IOS.TBL-Release.json

File was deleted

 .vs/HDL_APP_Project/xs/sqlite3/db.lock

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal

Binary files differ

 CommonLib/android/Xamarin.Android.Arch.Core.Common.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Arch.Lifecycle.Common.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Arch.Lifecycle.Runtime.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Animated.Vector.Drawable.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Annotations.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Compat.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Core.UI.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Core.Utils.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Fragment.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Media.Compat.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.Vector.Drawable.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.v4.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/android/Xamarin.Android.Support.v7.AppCompat.dll

old mode 100755
new mode 100644
Binary files differ

 CommonLib/dll/Xamarin.Essentials.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Arch.Core.Common.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Arch.Lifecycle.Common.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Arch.Lifecycle.Runtime.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Animated.Vector.Drawable.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Annotations.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Compat.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Core.UI.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Core.Utils.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Design.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Fragment.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Media.Compat.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Transition.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.Vector.Drawable.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.v4.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.v7.AppCompat.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Android/Xamarin.Android.Support.v7.RecyclerView.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/IOS/MJRefresh_Xamarin.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/IOS/Xamarin.Essentials.dll

old mode 100755
new mode 100644
Binary files differ

 DLL/Newtonsoft.Json.dll

old mode 100755
new mode 100644
Binary files differ

 HDL-ON_Android/Assets/Echarts/theme/blue.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/dark.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/gray.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/green.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/helianthus.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/infographic.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/macarons.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/macarons2.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/mint.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/red.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/roma.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/sakura.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Echarts/theme/shine.js

old mode 100755
new mode 100644

 HDL-ON_Android/Assets/Language.ini

@@ -395,6 +395,9 @@
373=添加楼层失败。
374=住宅数据已被删除，APP将自动切换到另一住宅。
375=网关未连接服务器，无法创建场景。
376=欢迎回家
377=二维码失效，请重试
378=重试

5000=音乐
5001=组合

 HDL-ON_Android/Assets/Phone/ErrorIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/AC/AcIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/AC/AcOnIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/FloorHeating/FloorHeatingIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/FloorHeating/FloorHeatingOnIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Light/LightIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Music/MusicIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Music/MusicOnIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/SwitchOn.png

 HDL-ON_Android/Assets/Phone/LogicIcon/+.png

 HDL-ON_Android/Assets/Phone/LogicIcon/-.png

 HDL-ON_Android/Assets/Phone/LogicIcon/addconditiontarget.png

 HDL-ON_Android/Assets/Phone/LogicIcon/airconditionerlogic.png

 HDL-ON_Android/Assets/Phone/LogicIcon/back.png

 HDL-ON_Android/Assets/Phone/LogicIcon/bjicon1.png

 HDL-ON_Android/Assets/Phone/LogicIcon/bjicon2.png

 HDL-ON_Android/Assets/Phone/LogicIcon/bjicon3.png

 HDL-ON_Android/Assets/Phone/LogicIcon/bjicon4.png

 HDL-ON_Android/Assets/Phone/LogicIcon/bjicon5.png

 HDL-ON_Android/Assets/Phone/LogicIcon/curtainlogic.png

 HDL-ON_Android/Assets/Phone/LogicIcon/delayed.png

 HDL-ON_Android/Assets/Phone/LogicIcon/down.png

 HDL-ON_Android/Assets/Phone/LogicIcon/editname.png

 HDL-ON_Android/Assets/Phone/LogicIcon/functionicon.png

 HDL-ON_Android/Assets/Phone/LogicIcon/heatlogic.png

 HDL-ON_Android/Assets/Phone/LogicIcon/lightloguc.png

 HDL-ON_Android/Assets/Phone/LogicIcon/link.png

 HDL-ON_Android/Assets/Phone/LogicIcon/next.png

 HDL-ON_Android/Assets/Phone/LogicIcon/off.png

 HDL-ON_Android/Assets/Phone/LogicIcon/on.png

 HDL-ON_Android/Assets/Phone/LogicIcon/outletlogic.png

 HDL-ON_Android/Assets/Phone/LogicIcon/point.png

 HDL-ON_Android/Assets/Phone/LogicIcon/scene.png

 HDL-ON_Android/Assets/Phone/LogicIcon/selectTheFun.png

 HDL-ON_Android/Assets/Phone/LogicIcon/selectTheScene.png

 HDL-ON_Android/Assets/Phone/LogicIcon/selectTheTime.png

 HDL-ON_Android/Assets/Phone/LogicIcon/selected+.png

 HDL-ON_Android/Assets/Phone/LogicIcon/selected-.png

 HDL-ON_Android/Assets/Phone/LogicIcon/set.png

 HDL-ON_Android/Assets/Phone/LogicIcon/timecondition.png

 HDL-ON_Android/Assets/Phone/LogicIcon/timeicon.png

 HDL-ON_Android/Assets/Phone/LogicIcon/weekoff.png

 HDL-ON_Android/Assets/Phone/LogicIcon/weekon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/1.png

 HDL-ON_Android/Assets/Phone/LoginIcon/3.png

 HDL-ON_Android/Assets/Phone/LoginIcon/AccountIcon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/EmailIcon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/HidePasswordIcon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/PasswordIcon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/SearchIcon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/ShowPasswordIcon.png

 HDL-ON_Android/Assets/Phone/LoginIcon/VerificationCodeIcon.png

 HDL-ON_Android/Assets/Phone/MusicIcon/noMusic.png

 HDL-ON_Android/Assets/Phone/MusicIcon/selectedMusic.png

 HDL-ON_Android/Assets/Phone/Navigation/ClassificationIconOn.png

 HDL-ON_Android/Assets/Phone/Navigation/CollectionIconOn.png

 HDL-ON_Android/Assets/Phone/Navigation/IntellectualizationIconOn.png

 HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_1.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -153,58 +153,73 @@
    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
    <AndroidResource Include="Resources\drawable\Loading.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\drawable\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\xml\network_security_config.xml">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\xml\file_paths.xml">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\layout\zxing_layout.xml">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">
      <SubType></SubType>
      <Generator></Generator>
      <SubType>
      </SubType>
      <Generator>
      </Generator>
    </AndroidResource>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="Resources\drawable\" />
    <Folder Include="Resources\layout\" />
    <Folder Include="Assets\Phone\Intelligence\" />
    <Folder Include="Assets\Phone\DeviceIcon\" />
    <Folder Include="Other\" />
    <Folder Include="Other\JPush\" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup>
    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
@@ -658,6 +673,12 @@
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\Phone\oRobot.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
  </ItemGroup>
  <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

 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="202012162" android:versionName="1.0.202012162" package="com.hdl.onpro">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202012161" android:versionName="1.0.202012161" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
    <!--  å®šä½æƒé™-->
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -1,10 +1,11 @@
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能会导致不正确的行为，并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
// </auto-generated>
//------------------------------------------------------------------------------

@@ -14,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    public partial class Resource
    {
        

 HDL-ON_Android/Resources/drawable/Icon.png

 HDL-ON_Android/Resources/mipmap-anydpi-v26/Icon.png

 HDL-ON_Android/Resources/mipmap-hdpi/Icon.png

 HDL-ON_Android/Resources/mipmap-mdpi/Icon.png

 HDL-ON_Android/Resources/mipmap-xhdpi/Icon.png

 HDL-ON_Android/Resources/mipmap-xxhdpi/Icon.png

 HDL-ON_Android/Resources/mipmap-xxxhdpi/Icon.png

 HDL-ON_Android/libs/armeabi-v7a/libelianjni.so

old mode 100755
new mode 100644
Binary files differ

 HDL-ON_Android/libs/armeabi-v7a/libjcore127.so

old mode 100755
new mode 100644
Binary files differ

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024¡¤1024@2x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120¡¤120@2x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120¡¤120@3x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180¡¤180@3x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20¡¤20.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29¡¤29.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40¡¤40@2x-1.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40¡¤40@2x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58¡¤58@2x-1.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58¡¤58@2x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/60¡¤60@3x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80¡¤80@2x.png

 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/87¡¤87@3x.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1024x500.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125_2436.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242_2208.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242_2688.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792_828.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2048X2732 .png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2208_1242.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2436_1125.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2688_1242.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320_480.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/4096X4096.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_1136-1.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_1136.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_960-1.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_960.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750X1134.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750_1334.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/828_1792.png

 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json

old mode 100755
new mode 100644

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -110,53 +110,147 @@
      </PackageReference>
    </ItemGroup>
    <ItemGroup>
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60·60%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87·87%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80·80%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180·180%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20·20.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x-1.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29·29.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x-1.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024·1024%402x.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60·60%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87·87%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80·80%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180·180%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20·20.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29·29.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024·1024%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    </ItemGroup>
    <ItemGroup>
        <Folder Include="Resources\" />
@@ -629,8 +723,6 @@
      <BundleResource Include="Resources\Phone\LogicIcon\selectTheFun.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\selectTheScene.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Info.plist

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcOnIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingOnIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicOnIcon.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/SwitchOn.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/+.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/-.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/addconditiontarget.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/airconditionerlogic.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/back.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/bjicon1.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/bjicon2.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/bjicon3.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/bjicon4.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/bjicon5.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/curtainlogic.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/delayed.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/down.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/editname.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/functionicon.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/heatlogic.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/lightloguc.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/link.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/next.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/off.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/on.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/outletlogic.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/point.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/scene.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/selectTheFun.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/selectTheScene.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/selectTheTime.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/selected+.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/selected-.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/set.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/timecondition.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/timeicon.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/weekoff.png

 HDL-ON_iOS/Resources/Phone/LogicIcon/weekon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/1.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/3.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/AccountIcon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/EmailIcon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/HidePasswordIcon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/PasswordIcon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/SearchIcon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/ShowPasswordIcon.png

 HDL-ON_iOS/Resources/Phone/LoginIcon/VerificationCodeIcon.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/noMusic.png

 HDL-ON_iOS/Resources/Phone/MusicIcon/selectedMusic.png

 HDL-ON_iOS/Resources/Phone/Navigation/ClassificationIconOn.png

 HDL-ON_iOS/Resources/Phone/Navigation/CollectionIconOn.png

 HDL-ON_iOS/Resources/Phone/Navigation/IntellectualizationIconOn.png

 HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_1.png

 HDL-ON_iOS/Resources/js/echarts-all.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/blue.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/dark.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/gray.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/green.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/helianthus.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/infographic.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/macarons.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/macarons2.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/mint.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/red.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/roma.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/sakura.js

old mode 100755
new mode 100644

 HDL-ON_iOS/Resources/theme/shine.js

old mode 100755
new mode 100644

 HDL-ON_iOS/iTunesArtwork

old mode 100755
new mode 100644
Binary files differ

 HDL-ON_iOS/iTunesArtwork@2x

old mode 100755
new mode 100644
Binary files differ

 HDL_APP_Project.sln

New file
@@ -0,0 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00

# Visual Studio Version 16

VisualStudioVersion = 16.0.29519.87

MinimumVisualStudioVersion = 10.0.40219.1

Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HDL_ON", "HDL_ON\HDL_ON.shproj", "{A5C296B4-CF9A-4205-ACF0-3A6FEA786F12}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_Android", "HDL-ON_Android\HDL-ON_Android.csproj", "{09712674-2A38-407B-B1E2-560B2C352F9A}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_iOS", "HDL-ON_iOS\HDL-ON_iOS.csproj", "{D998E133-F0DD-4760-BE3C-461632F54DA4}"

EndProject

Global

    GlobalSection(SharedMSBuildProjectFiles) = preSolution

        HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4

        HDL_ON\HDL_ON.projitems*{a5c296b4-cf9a-4205-acf0-3a6fea786f12}*SharedItemsImports = 13

        HDL_ON\HDL_ON.projitems*{d998e133-f0dd-4760-be3c-461632f54da4}*SharedItemsImports = 4

    EndGlobalSection

    GlobalSection(SolutionConfigurationPlatforms) = preSolution

        Debug|Any CPU = Debug|Any CPU

        Debug|iPhone = Debug|iPhone

        Debug|iPhoneSimulator = Debug|iPhoneSimulator

        Release|Any CPU = Release|Any CPU

        Release|iPhone = Release|iPhone

        Release|iPhoneSimulator = Release|iPhoneSimulator

    EndGlobalSection

    GlobalSection(ProjectConfigurationPlatforms) = postSolution

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhone.ActiveCfg = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhone.Build.0 = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|Any CPU.Build.0 = Release|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhone.ActiveCfg = Release|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhone.Build.0 = Release|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU

        {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.ActiveCfg = Debug|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.Build.0 = Debug|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.Build.0 = Release|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.ActiveCfg = Release|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.Build.0 = Release|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator

    EndGlobalSection

    GlobalSection(SolutionProperties) = preSolution

        HideSolutionNode = FALSE

    EndGlobalSection

    GlobalSection(ExtensibilityGlobals) = postSolution

        SolutionGuid = {8C0F1E94-EA58-41A0-B620-41091484BCEE}

    EndGlobalSection

EndGlobal


 HDL_ON/Common/HDLCommon.cs

@@ -270,7 +270,7 @@
                    Shared.Application.RunOnMainThread(() =>
                    {
                        new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
                        GetPushMessageAction?.Invoke();
                        //GetPushMessageAction?.Invoke();
                    });
                    return;
                }

 HDL_ON/Common/R.cs

@@ -4,6 +4,9 @@
{
    public static class StringId
    {
        public const int Retry = 378;
        public const int QRCodeIsInvalid = 377;
        public const int WellComBackHome = 376;
        public const int GatewayOfflineCannotCreateScene = 375;
        public const int ResidenceDeletedSwitchToAnotherResidence = 374;
        public const int AddFloorFail = 373;

 HDL_ON/Common/Utlis.cs

@@ -8,7 +8,7 @@
    /// <summary>
    /// å¸¸ç”¨å·¥å…·ç±»
    /// </summary>
    public static class Utlis
    public class Utlis
    {
        /// <summary>
        /// å…¨å±€æ‰“印
@@ -328,54 +328,6 @@
            return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
        }


        #region æ—¶é—´æ ¼å¼è½¬æ¢
        private const int Second = 1;
        private const int Minute = 60 * Second;
        private const int Hour = 60 * Minute;
        private const int Day = 24 * Hour;
        private const int Month = 30 * Day;

        /// <summary>
        /// æ—¶é—´è½¬æ¢
        /// å°‘于1天  æ˜¾ç¤º æ—¶åˆ†
        /// å°‘于一年 æ˜¾ç¤º æœˆæ—¥
        /// å¤§äºŽä¸€å¹´ æ˜¾ç¤º å¹´
        /// </summary>
        /// <param name="dateTime"></param>
        /// <returns></returns>
        public static string ToFriendlyDisplay(this DateTime dateTime)
        {
            var ts = DateTime.Now - dateTime;
            var delta = ts.TotalSeconds;
            if (delta < 24 * Hour)
            {
                //显示 æ—¶:分
                return dateTime.ToString("HH:mm");
            }
            else if (delta < 12 * Month)
            {
                //显示 æœˆ:日
                return dateTime.ToString("MM/dd");
            }
            else
            {   //显示 å¹´
                return dateTime.ToString("yyyy");
            }
        }
        /// <summary>
        /// æ—¶é—´è½¬æ¢
        /// å°‘于1天  æ˜¾ç¤º æ—¶åˆ†
        /// å°‘于一年 æ˜¾ç¤º æœˆæ—¥
        /// å¤§äºŽä¸€å¹´ æ˜¾ç¤º å¹´
        /// </summary>
        /// <param name="dateTime"></param>
        /// <returns></returns>
        public static string ToFriendlyDisplay(long unixTimeStamp)
        {
            return ToFriendlyDisplay(UnixToDateTimeMS(unixTimeStamp));
        }
        #endregion

    }


 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -310,23 +310,9 @@
                    if (RemoteMqttClient.ConnectedHandler == null)
                    {
                        RemoteMqttClient.UseConnectedHandler(async (e) => {
                            if (DB_ResidenceData.Instance.HomeGateway.gatewayStatus)
                            if (DB_ResidenceData.Instance.HomeGateway.GatewayOnline)
                            {
                                Control.Ins.GatewayOnline = true;
                            }
                            else
                            {
                                //new System.Threading.Thread(() => {
                                //    while(true)
                                //    {
                                //        System.Threading.Thread.Sleep(1000);
                                //        if (DB_ResidenceData.Instance.HomeGateway.GatewayOnline)
                                //        {
                                //            Control.Ins.GatewayOnline = true;
                                //            break;
                                //        }
                                //    }
                                //}) { IsBackground = true }.Start();
                            }
                            IfNeedReadAllDeviceStatus = true;
                            Utlis.WriteLine($"============>Mqtt远程连接成功");

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -131,13 +131,31 @@
        /// ç»‘定调试人员提交的住宅,一个住宅只能绑定一次
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew BindingResidence(string key)
        public ResponsePackNew BindingResidence(string strUrl)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("homeId", homeId);
            d.Add("secretKey", key);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindlingResidence, requestJson, HttpUtil.GlobalRequestHttpsHost);
            try
            {
                var client = new RestSharp.RestClient(strUrl);

                var request = new RestSharp.RestRequest(RestSharp.Method.GET);
                request.Timeout = 5 * 1000;
                request.AddHeader("content-type", "application/json");
                request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);

                var response = client.Execute(request);
                if (response.StatusCode == HttpStatusCode.OK)
                {
                    return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
                }
                else
                {
                    return null;
                }
            }
            catch
            {
                return null;
            }
        }

        #region æ³¨å†Œã€ç™»å½•éƒ¨åˆ†
@@ -598,7 +616,7 @@
                            if (mHomeGatewayRes.Count > 0)
                            {
                                DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
                                if(mHomeGatewayRes[0].gatewayStatus)
                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
                                {
                                    //DriverLayer.Control.Ins.IsRemote = true;
                                    DriverLayer.Control.Ins.GatewayOnline = true;
@@ -2030,7 +2048,6 @@
            if (GetType != "All")
            {
                d.Add("roomType", GetType);
                d.Add("pageSize", "10000");
            }
            var requestJson = HttpUtil.GetSignRequestJson(d);
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);

 HDL_ON/DAL/Server/NewApiRes.cs

@@ -569,7 +569,24 @@
        /// ON_LINE(0,"在线"),
        /// OFF_LINE(1,"下线"),;
        /// </summary>
        public bool gatewayStatus;
        public string gatewayStatus;
        /// <summary>
        /// ç½‘关是否在线
        /// </summary>
        public bool GatewayOnline
        {
            get
            {
                if (gatewayStatus == "ON_LINE")
                {
                    return true;
                }
                else
                {
                    return false;
                }
            }
        }

        ///// <summary>
        ///// 

 HDL_ON/Entity/Function/AC.cs

@@ -255,7 +255,7 @@
                    if (_trait_temp.curValue.ToString() == "{}")
                        _trait_temp.curValue = 16;
                }
                //if (_trait_temp.curValue.ToString().Length > 3)
                if (_trait_temp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_temp.curValue);
                    _trait_temp.curValue = Convert.ToInt32(vv);
@@ -335,7 +335,7 @@
                    if (_trait_IndoorTemp.curValue.ToString() == "{}")
                        _trait_IndoorTemp.curValue = 0;
                }
                //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
                    _trait_IndoorTemp.curValue = Convert.ToInt32(vv);

 HDL_ON/Entity/Function/FloorHeating.cs

@@ -186,7 +186,7 @@
                            _trait_IndoorTemp.curValue = 0;
                    }
                }
                //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
                    _trait_IndoorTemp.curValue = Convert.ToInt32(vv);
@@ -224,7 +224,7 @@
                    if(_trait_temp.curValue.ToString() == "{}")
                        _trait_temp.curValue = 16;
                }
                //if (_trait_temp.curValue.ToString().Length > 3)
                if (_trait_temp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_temp.curValue);
                    _trait_temp.curValue = Convert.ToInt32(vv);

 HDL_ON/Entity/Function/Function.cs

@@ -625,15 +625,15 @@
        /// <summary>
        /// å®¶ç”µã€æ’座
        /// </summary>
        public const string ElectricSocket = "electrical.socket";

        public const string ElectricSocket = "electric.socket ";

        /// <summary>
        /// å®¶ç”µã€ç”µè§†
        /// </summary>
        public const string ElectricTV = "electrical.tv";

        public const string ElectricTV = "electric.tv";

        /// <summary>
        /// å®¶ç”µã€é£Žæ‰‡
        /// </summary>
        public const string ElectricFan = "electrical.fan";
        public const string ElectricFan = "electric.fan";
    }

}

 HDL_ON/HDL_ON.projitems

@@ -9,6 +9,7 @@
    <Import_RootNamespace>HDL_ON</Import_RootNamespace>

  </PropertyGroup>

  <ItemGroup>

    <Compile Include="$(MSBuildThisFileDirectory)UI\BindingResidence\WellcomToHomeForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\MainPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)DAL\FileUtils.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Common\R.cs" />

@@ -261,7 +262,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Scene\SceneAddPage.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)UI\" />

    <Folder Include="$(MSBuildThisFileDirectory)DAL\" />

    <Folder Include="$(MSBuildThisFileDirectory)DAL\Mqtt\" />

    <Folder Include="$(MSBuildThisFileDirectory)Common\" />

@@ -290,7 +290,5 @@
    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\AddRoom\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\BindingResidence\" />

    <Folder Include="$(MSBuildThisFileDirectory)Common\Utlis\" />

  </ItemGroup>

</Project>

 HDL_ON/UI/BindingResidence/BindingResidencePage.cs

@@ -91,15 +91,10 @@

            btnAddNewResidence.MouseUpEventHandler = (sender, e) =>
            {
                Action<string> action = (str) => {
                    Application.RunOnMainThread(() => {
                    var pm = new DAL.Server.HttpServerRequest();
                        pm.BindingResidence(str);
                    });
                };
                Scan.OpenScan((scanString) =>
                {
                    action(scanString);
                    //执行绑定住宅
                    this.DoBindResidence(scanString);
                });
            };

@@ -117,5 +112,109 @@
                MainPage.GoLoginPage(UserInfo.Current);
            };
        }

        /// <summary>
        /// æ‰§è¡Œç»‘定住宅
        /// </summary>
        private void DoBindResidence(string scanString)
        {
            var pm = new DAL.Server.HttpServerRequest();
            var result = pm.BindingResidence(scanString);
            if (result == null) { return; }

            if (result.Code == DAL.Server.StateCode.SUCCESS)
            {
                //跳转页面----
                MainPage.GoUserPage();
                //显示欢迎回家的弹窗界面
                var form = new WellcomToHomeForm();
                form.ShowForm();
            }
        }

        /// <summary>
        /// æ˜¾ç¤ºäºŒç»´ç å·²ç»è¿‡æœŸçš„弹窗
        /// </summary>
        private void ShowQrCodeTimeOutView()
        {
            //整个界面的灰色背景
            var frameBack = new Dialog();

            //中间白色区域
            var frameWite = new FrameLayout();
            frameWite.Y = Application.GetRealHeight(223);
            frameWite.Height = Application.GetRealHeight(245);
            frameWite.Width = Application.GetRealWidth(288);
            frameWite.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
            frameWite.Radius = (uint)Application.GetRealWidth(12);
            frameWite.Gravity = Gravity.CenterHorizontal;
            frameBack.AddChidren(frameWite);

            //Icon图标
            var picIcon = new Button();
            picIcon.Y = Application.GetRealHeight(152);
            picIcon.Height = Application.GetRealWidth(160);
            picIcon.Width = Application.GetRealWidth(160);
            picIcon.Gravity = Gravity.CenterHorizontal;
            picIcon.UnSelectedImagePath = "oRobot.png";
            frameBack.AddChidren(picIcon);

            //二维码失效，请重试
            var btnText = new Button();
            btnText.Y = Application.GetRealHeight(98);
            btnText.Height = Application.GetRealHeight(24);
            btnText.TextSize = 16;
            btnText.TextAlignment = TextAlignment.Center;
            btnText.TextColor = CSS.CSS_Color.FirstLevelTitleColor;
            btnText.TextID = StringId.QRCodeIsInvalid;
            frameWite.AddChidren(btnText);

            //取消
            var btnCancel = new Button();
            btnCancel.X = Application.GetRealWidth(30);
            btnCancel.Y = btnText.Bottom + Application.GetRealHeight(48);
            btnCancel.Height = Application.GetRealHeight(44);
            btnCancel.Width = Application.GetRealWidth(108);
            btnCancel.TextSize = 16;
            btnCancel.IsBold = true;
            btnCancel.TextAlignment = TextAlignment.Center;
            btnCancel.TextColor = CSS.CSS_Color.MainColor;
            btnCancel.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
            btnCancel.Radius = (uint)Application.GetRealHeight(22);
            btnCancel.TextID = StringId.Cancel;
            btnCancel.BorderWidth = 1;
            btnCancel.BorderColor = CSS.CSS_Color.MainColor;
            frameWite.AddChidren(btnCancel);

            btnCancel.MouseUpEventHandler += (sender, e) =>
            {
                frameBack.Close();
            };

            //重试
            var btnRedo = new Button();
            btnRedo.Y = btnText.Bottom + Application.GetRealHeight(48);
            btnRedo.Height = Application.GetRealHeight(44);
            btnRedo.Width = Application.GetRealWidth(108);
            btnRedo.TextSize = 16;
            btnRedo.IsBold = true;
            btnRedo.TextAlignment = TextAlignment.Center;
            btnRedo.TextColor = CSS.CSS_Color.MainBackgroundColor;
            btnRedo.BackgroundColor = CSS.CSS_Color.MainColor;
            btnRedo.Radius = (uint)Application.GetRealHeight(22);
            btnRedo.TextID = StringId.Retry;
            frameWite.AddChidren(btnRedo);
            btnRedo.X = frameWite.Width - btnRedo.Width - Application.GetRealWidth(30);

            btnRedo.MouseUpEventHandler += (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                {
                    frameBack.Close();
                    //执行绑定住宅
                    this.DoBindResidence(scanString);
                });
            };
        }
    }
}

 HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs

New file
@@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.UI.CSS;
using Shared;

namespace HDL_ON.UI
{
    /// <summary>
    /// æ¬¢è¿Žå›žå®¶çš„界面
    /// </summary>
    public class WellcomToHomeForm
    {
        /// <summary>
        /// æ˜¾ç¤ºæ¬¢è¿Žå›žå®¶çš„弹窗界面
        /// </summary>
        public void ShowForm()
        {
            //整个界面的灰色背景
            var frameBack = new Dialog();

            //中间白色区域
            var frameWite = new FrameLayout();
            frameWite.Y = Application.GetRealHeight(223);
            frameWite.Height = Application.GetRealHeight(245);
            frameWite.Width = Application.GetRealWidth(288);
            frameWite.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
            frameWite.Radius = (uint)Application.GetRealWidth(12);
            frameWite.Gravity = Gravity.CenterHorizontal;
            frameBack.AddChidren(frameWite);

            //Icon图标
            var picIcon = new Button();
            picIcon.Y = Application.GetRealHeight(152);
            picIcon.Height = Application.GetRealWidth(160);
            picIcon.Width = Application.GetRealWidth(160);
            picIcon.Gravity = Gravity.CenterHorizontal;
            picIcon.UnSelectedImagePath = "oRobot.png";
            frameBack.AddChidren(picIcon);

            //欢迎回家
            var btnText = new Button();
            btnText.Y = Application.GetRealHeight(98);
            btnText.Height = Application.GetRealHeight(24);
            btnText.TextSize = 16;
            btnText.TextAlignment = TextAlignment.Center;
            btnText.TextColor = CSS.CSS_Color.MainColor;
            btnText.TextID = StringId.WellComBackHome;
            frameWite.AddChidren(btnText);

            //确认
            var btnOk = new Button();
            btnOk.Y = btnText.Bottom + Application.GetRealHeight(48);
            btnOk.Height = Application.GetRealHeight(44);
            btnOk.Width = Application.GetRealWidth(220);
            btnOk.TextSize = 16;
            btnOk.IsBold = true;
            btnOk.TextAlignment = TextAlignment.Center;
            btnOk.TextColor = CSS.CSS_Color.MainBackgroundColor;
            btnOk.BackgroundColor = CSS.CSS_Color.MainColor;
            btnOk.Gravity = Gravity.CenterHorizontal;
            btnOk.Radius = (uint)Application.GetRealHeight(22);
            btnOk.TextID = StringId.Confirm;
            frameWite.AddChidren(btnOk);

            btnOk.MouseUpEventHandler += (sender, e) =>
            {
                frameBack.Close();
            };
        }
    }
}

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -376,7 +376,6 @@

                // æŸ¥è¯¢æœªè¯»æ¶ˆæ¯å¹¶æ˜¾ç¤º
                GetUnreadPushMessages();
                RegisterGetPushMessageAction();
            }
            catch (Exception ex)
            {

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -404,7 +404,7 @@
        {
            try
            {
                return Utlis.ToFriendlyDisplay(time);
                return Utlis.UnixToDateTimeWithFormatMS(time, "HH:mm");
            }
            catch (Exception ex)
            {
@@ -417,14 +417,13 @@
        /// </summary>
        void RegisterGetPushMessageAction()
        {
            Action RegisterGetPushMessageAction = () => {
                if (bodyView != null)
                {
            //HDLCommon.GetPushMessageAction = () => {
            //    if (bodyView != null)
            //    {
                    //Utlis.WriteLine("GetPushMessageAction H收到推送");
                    GetUnreadPushMessages();
                }
            };
            HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction;
            //        GetUnreadPushMessages();
            //    }
            //};
        }

        /// <summary>
@@ -432,7 +431,7 @@
        /// </summary>
        void UnregisterGetPushMessageAction()
        {
            HDLCommon.GetPushMessageAction = null;
            //HDLCommon.GetPushMessageAction = null;
        }

        #endregion

 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs

@@ -44,16 +44,11 @@
        /// </summary>
        List<PushMessageInfo> PushMessageInfoList = new List<PushMessageInfo>();

        /// <summary>
        /// é¡µé¢å…³é—­æ—¶é—´
        /// </summary>
        Action backAction;

        public override void RemoveFromParent()
        {
            UnregisterGetPushMessageAction();
            base.RemoveFromParent();
            backAction?.Invoke();
        }

        /// <summary>
@@ -71,8 +66,7 @@
        /// <param name="backAction"></param>
        public void LoadPage(Action backAction)
        {
            this.backAction = backAction;
            new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
            new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction);

            AddTopMenuView();
            AddMessageView();
@@ -637,14 +631,14 @@
        /// </summary>
        void RegisterGetPushMessageAction()
        {
            HDLCommon.GetPushMessageAction = () =>
            {
                if (bodyView != null)
                {
            //HDLCommon.GetPushMessageAction = () =>
            //{
            //    if (bodyView != null)
            //    {
                    //Utlis.WriteLine("GetPushMessageAction M收到推送");
                    GetPushMessageList(showMesType);
                }
            };
            //        GetPushMessageList(showMesType);
            //    }
            //};
        }

        /// <summary>
@@ -652,7 +646,7 @@
        /// </summary>
        void UnregisterGetPushMessageAction()
        {
            HDLCommon.GetPushMessageAction = null;
            //HDLCommon.GetPushMessageAction = null;
        }

#if DEBUG

 HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs

@@ -35,6 +35,7 @@
                ReloadRoomName();
            };

            
            Action delAction = () => {
                this.RemoveFromParent();
                deleteAction?.Invoke();

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs

@@ -126,8 +126,8 @@
                sceneView.btnLine.X = Application.GetRealWidth(20);
                sceneView.btnLine.Width = Application.GetRealWidth(303);
                sceneView.btnNextIcon.X = Application.GetRealWidth(303);
                sceneView.btnNextIcon.Width = Application.GetRealWidth(28);
                sceneView.btnNextIcon.Height = Application.GetRealWidth(28);
                sceneView.btnNextIcon.Width = Application.GetMinRealAverage(28);
                sceneView.btnNextIcon.Height = Application.GetMinRealAverage(28);
                sceneView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
                sceneView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
                verticalRefresh.AddChidren(sceneView.FLayoutView());

 HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs

@@ -82,7 +82,6 @@
                    Height = Application.GetRealHeight(44 * 5),
                };
                var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
               
                if (roomList.Count > 5)
                {
                    bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -135,6 +135,7 @@
        /// <returns></returns>
        public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name)
        {

            List<Entity.Room> roomList = new List<Entity.Room>();
            Entity.Room room1 = new Entity.Room();
            room1.roomName = name;//默认一个房间名为:全部区域
@@ -143,14 +144,9 @@
            var roomLists = GetGatewayRoomList();
            foreach (var room in roomLists)
            {
                var devlist = GetRoomDevice(room);
                if (devlist.Count == 0)
                {
                    //过滤掉没有设备的房间;
                    continue;
                }
                roomList.Add(room);
            }

            return roomList;
        }
        /// <summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs

@@ -52,7 +52,6 @@
                    addLogic.Show();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
                //开关图标的点击事件
                logicView.btnSwitchIcon.MouseUpEventHandler += (sender1, e1) =>
                {
                    logicView.btnSwitchIcon.IsSelected = !logicView.btnSwitchIcon.IsSelected;
@@ -60,25 +59,16 @@
                    {
                        logicView.btnSwitchIcon.IsSelected = true;
                        currLogic.enable = "true";


                    }
                    else
                    {
                        logicView.btnSwitchIcon.IsSelected = false;
                        currLogic.enable = "false";
                    }
                    //Send.switchLogic(currLogic);
                    new System.Threading.Thread(() =>
                    {
                        try
                        {
                            //逻辑使能的命令
                            Send.switchLogic(currLogic);

                        }
                        catch { }
                       
                    })
                    { IsBackground = true }.Start();
                };
                GetSelectIcon(logicView.frameLayout, currLogic);
                //if (i==0)降序排列
@@ -210,6 +200,7 @@
            return weekTextName.TrimEnd(',');
        }


        /// <summary>
        /// èŽ·å–每月的字符串
        /// </summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs

@@ -9,6 +9,17 @@
{
    public  class Send
    {
        ///// <summary>
        ///// ä½å®…ID
        ///// </summary>
        //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
        ///// <summary>
        ///// ç½‘å…³ID（秀桡有网关ID却返回是MAC）
        ///// </summary>
        //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;

        //public static string homeId = UserInfo.Current.CurReginID;

        /// <summary>
        /// ç½‘å…³ID(获取嘉乐网关ID)
        /// </summary>
@@ -27,13 +38,8 @@
        /// <summary>
        /// ä½å®…ID
        /// </summary>
        public static string homeId
        {
            get
            {
                return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
            }
        }
        public static string homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;


        /// <summary>
        /// èŽ·å–逻辑ID列表
@@ -290,6 +296,9 @@
        /// <returns></returns>
        public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 3)
        {



            var requestJson = HttpUtil.GetSignRequestJson(o);
            return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);


 HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs

@@ -230,11 +230,11 @@
            Button btnStartTimeText = new Button
            {
                TextSize = LogicView.TextSize.text12,
                Width = Application.GetRealWidth(32 + 3+20),
                Width = Application.GetRealWidth(32 + 3),
                Height = Application.GetRealHeight(17),
                TextColor = CSS.CSS_Color.textCancelColor,
                Y = Application.GetRealHeight(17),
                X = Application.GetRealWidth(260-20),
                X = Application.GetRealWidth(260),
                Tag = "0",
            };
            startTimeView.frameLayout.AddChidren(btnStartTimeText);
@@ -253,11 +253,11 @@
            Button btnEndTimeText = new Button
            {
                TextSize = LogicView.TextSize.text12,
                Width = Application.GetRealWidth(32 + 3+20),
                Width = Application.GetRealWidth(32 + 3),
                Height = Application.GetRealHeight(17),
                TextColor = CSS.CSS_Color.textCancelColor,
                Y = Application.GetRealHeight(17),
                X = Application.GetRealWidth(260-20),
                X = Application.GetRealWidth(260),
                Tag = "0",
            };
            endTimeView.frameLayout.AddChidren(btnEndTimeText);

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -69,7 +69,7 @@
            };
            bodyView.AddChidren(topView);

            if (DB_ResidenceData.Instance.GatewayType == 0 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (DB_ResidenceData.Instance.GatewayType == 0)
            {
                btnSceneTilte = new Button()
                {
@@ -85,6 +85,7 @@
                };
                topView.AddChidren(btnSceneTilte);
                btnAutomationTitle = new Button();

            }
            else
            {

 HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs

@@ -158,7 +158,7 @@
        {
            btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
            {
                if(!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)
                if(!DB_ResidenceData.Instance.HomeGateway.GatewayOnline)
                {
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GatewayOfflineCannotCreateScene), true);
                    return;

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs

@@ -27,58 +27,67 @@
                    TipDivMsg(Language.StringByID(StringId.PlsEntryAccount));
                    return;
                }
                BindMember(memberAccount);
            };
        }

        /// <summary>
        /// ç»‘定账号
        /// </summary>
        /// <param name="memberAccount"></param>
        void BindMember(string memberAccount)
        {
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));

            new System.Threading.Thread(() =>
            {
                try
                {
                    var result = new HttpServerRequest().BindResidenceMemberAccount(memberAccount, memberAccount);
                    if (result.Code == StateCode.SUCCESS)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            backAction?.Invoke();
                            this.RemoveFromParent();
                            var page = new OperationResultDisPalyPage();
                            page.Show();
                            page.LoadPage(true, Language.StringByID(StringId.AddMember), Language.StringByID(StringId.WelcomeNewMmember), "");
                        });
                    }
                    else
                    {
                        IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
                    }

                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                }
            })
            { IsBackground = true }.Start();
        }
                //switch (result.Code)
                //{
                //    //(1)Success åˆ™è°ƒç”¨æ­¤æŽ¥å£æˆåŠŸ
                //    case "Success":
                //        backAction?.Invoke();
                //        this.RemoveFromParent();
                //        var page = new OperationResultDisPalyPage();
                //        page.Show();
                //        page.LoadPage(true, Language.StringByID(StringId.AddMember), Language.StringByID(StringId.WelcomeNewMmember), "");
                //        break;
                //    //(2)ParameterOrEmpty æä¾›çš„参数错误，详情见ErrorInfo字段
                //    case "ParameterOrEmpty":
                //    //(3)NoLogin,则响应字段中[ErrorInfo]为错误信息为[无效登录Token!]
                //    case "NoLogin":
                //        TipDivMsg(Language.StringByID(StringId.DataExceptionPleaseTryAgain));
                //        break;
                //    //(4)AccountNoExists å­è´¦å·æœªæ³¨å†Œï¼Œè¯·ç»‘定已注册的子账号!
                //    case "AccountNoExists":
                //        TipDivMsg(Language.StringByID(StringId.FailedToAddTheMemberAccountIsNotRegistered));
                //        break;
                //    //(5)SameAccount,不能添加自己为子账号!
                //    case "SameAccount":
                //        TipDivMsg(Language.StringByID(StringId.FailedToAddUnableToAddYourself));
                //        break;
                //    //(6)NoExist ç”¨æˆ·ä¸å­˜åœ¨æ­¤ä½å®…
                //    case "NoExist":
                //        TipDivMsg(Language.StringByID(StringId.ThisHomeDoesNotExistForTheUser));
                //        break;
                //    //(7)Exist è´¦å·å·²å­˜åœ¨æ­¤ä½å®…
                //    case "Exist":
                //        TipDivMsg(Language.StringByID(StringId.MemberAccountHasBeenAddedAndCannotBeAddedAgain));
                //        break;
                //    //(8)Fail æ“ä½œå¤±è´¥
                //    case "Fail":
                //        TipDivMsg(Language.StringByID(StringId.OperationFailed));
                //        break;
                //    //(9)BeRestrict æƒé™ä¸è¶³
                //    case "BeRestrict":
                //        TipDivMsg(Language.StringByID(StringId.AddFailedInsufficientPermissions));
                //        break;
                //    //(10)NoAddMainAccount ä¸èƒ½ç»‘定主账号
                //    case "NoAddMainAccount":

                //        break;
                //}
            };
        }


        void OpenScen(Action<string> action)

 HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using HDL_ON.UI.CSS;
using Shared;

@@ -112,6 +113,51 @@
            //    Radius = (uint)Application.GetMinRealAverage(30),
            //};
            //backView.AddChidren(headImage2);

            //开启检测住宅是否已经添加了的线程
            this.StartCheckResidenceThread();
        }

        /// <summary>
        /// å¼€å¯æ£€æµ‹ä½å®…是否已经添加了的线程
        /// </summary>
        private void StartCheckResidenceThread()
        {
            //获取住宅列表的参数
            var requestJson = DAL.Server.HttpUtil.GetSignRequestJson(new DAL.Server.GetHomeListObj() { homeType = HomeTypeEnum.ALL.ToString() });

            new System.Threading.Thread(() =>
            {
                while (this.Parent != null)
                {
                    System.Threading.Thread.Sleep(4000);

                    //访问云端获取列表
                    var resultObj = DAL.Server.HttpUtil.RequestHttpsPost(DAL.Server.NewAPI.API_POST_Gethomepager, requestJson);
                    if (resultObj.Code == DAL.Server.StateCode.SUCCESS)
                    {
                        var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
                        if (homeList == null || homeList.Count == 0)
                        {
                            //如果还没有住宅的话,继续下一次检测
                            continue;
                        }
                        //调用On原来的方法,刷新住宅列表及其缓存
                        var pm = new DAL.Server.HttpServerRequest();
                        pm.GetHomePager();
                        Application.RunOnMainThread(() =>
                        {
                            //跳转页面----
                            MainPage.GoUserPage();
                            //显示欢迎回家的弹窗界面
                            var form = new WellcomToHomeForm();
                            form.ShowForm();
                        });
                        break;
                    }
                }
            })
            { IsBackground = true }.Start();
        }
    }
}

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs

@@ -445,12 +445,6 @@
                        return;
                    }
                }
                var waitPage = new Loading();
                waitPage.Start();
                new Thread(() =>
                {
                    try
                    {
                        var addResult = SpatialInfo.CurrentSpatial.AddRoom(room, out room);//检查room是否为云端返回的最新数据
                        if (addResult == StateCode.SUCCESS)
                        {
@@ -471,26 +465,9 @@
                                    room.GetRoomFunctions(true);
                                }
                            }
                            Application.RunOnMainThread(() =>
                            {
                                backAction(room);
                                RemoveFromParent();
                            });
                        }
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"添加房间失败msg:{ex.Message}");
                    }
                    finally
                    {
                        Application.RunOnMainThread(() =>
                        {
                            waitPage.Hide();
                        });
                    }
                })
                { IsBackground = true }.Start();
            };
        }


 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs

@@ -31,12 +31,6 @@
            {
                Action action = () =>
                {
                    var waitPage = new Loading();
                    waitPage.Start();
                    new Thread(() =>
                    {
                        try
                        {
                            var delResult = SpatialInfo.CurrentSpatial.DelRoom(room);
                            if (delResult == StateCode.SUCCESS)
                            {
@@ -47,32 +41,14 @@
                                        f.roomIds.Remove(room.roomId);
                                    }
                                }
                                Application.RunOnMainThread(() =>
                                {
                                    //删除事件回调
                                    this.deleteAction?.Invoke();
                                    this.RemoveFromParent();
                                });
                            }
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"添加房间失败msg:{ex.Message}");
                        }
                        finally
                        {
                            Application.RunOnMainThread(() =>
                            {
                                waitPage.Hide();
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                };
                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteRoomTip, action);
            };
        }
            

        /// <summary>
        /// æ˜¾ç¤ºèƒŒæ™¯å›¾é€‰æ‹©é€‰é¡¹

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs

@@ -396,67 +396,27 @@
                //输入登录密码验证
                Action<string> action = (pw) =>
                {
                    AuthenticationByLoginPassword(pw, optionType);
                    //var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                    //if (resultObj.Code == StateCode.SUCCESS)
                    //{
                    //    PasswordInputPassed(optionType);
                    //}
                    //else
                    //{
                    //    Application.RunOnMainThread(() =>
                    //    {
                    //        Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                    //    });
                    //}

                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
            };
        }

        /// <summary>
        /// ç™»å½•å¯†ç éªŒè¯
        /// </summary>
        /// <param name="pw"></param>
        /// <param name="optionType"></param>
        void AuthenticationByLoginPassword(string pw, string optionType)
        {
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));

            new System.Threading.Thread(() =>
            {
                try
                {
                    var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                    Application.RunOnMainThread(() =>
                    {
                        if (resultObj.Code == StateCode.SUCCESS)
                        {
                        //UserInfo.Current.appUnlockPasswrod = "";
                        //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
                        //UserInfo.Current.SaveUserInfo();
                        //this.RemoveFromParent();
                        //backAction();
                            PasswordInputPassed(optionType);
                        }
                        else
                        {
                            Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                        }
                    });
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                            Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                    });
                }
            })
            { IsBackground = true }.Start();

                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
            };
        }
    }
}

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs

@@ -437,68 +437,30 @@
                //输入登录密码验证
                Action<string> action = (pw) =>
                {
                    AuthenticationByLoginPassword(pw, optionType);
                    //var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                    //if (resultObj.Code == StateCode.SUCCESS)
                    //{
                    //    PasswordInputPassed(optionType);
                    //}
                    //else
                    //{
                    //    Application.RunOnMainThread(() =>
                    //    {
                    //        Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                    //    });
                    var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                    if (resultObj.Code.ToUpper() == StateCode.SUCCESS)
                    {
                        //UserInfo.Current.appUnlockPasswrod = "";
                        //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
                        //UserInfo.Current.SaveUserInfo();
                        //this.RemoveFromParent();
                        //backAction();

                    //}
                        PasswordInputPassed(optionType);
                    }
                    else
                    {
                        Application.RunOnMainThread(() =>
                        {
                            Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                        });

                    }

                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
            };
        }

        /// <summary>
        /// ç™»å½•å¯†ç éªŒè¯
        /// </summary>
        /// <param name="pw"></param>
        /// <param name="optionType"></param>
        void AuthenticationByLoginPassword(string pw, string optionType)
        {
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));

            new System.Threading.Thread(() =>
            {
                try
                {
                    var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                    Application.RunOnMainThread(() =>
                    {
                        if (resultObj.Code == StateCode.SUCCESS)
                        {
                            PasswordInputPassed(optionType);
                        }
                        else
                        {
                            Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                        }
                    });
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                    });
                }
            })
            { IsBackground = true }.Start();
        }
    }
}

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs

@@ -46,34 +46,33 @@
        /// </summary>
        Button btnStartupBg;

        #region F3阶段
        ///// <summary>
        ///// è®¾ç½®å®‰é˜²é€‰é¡¹æç¤º
        ///// </summary>
        //Button btnSecuritySelectionTip;
        ///// <summary>
        ///// è®¾ç½®å®‰é˜²é€‰é¡¹é€‰ä¸­å›¾æ ‡
        ///// </summary>
        //Button btnSecuritySelectionIcon;
        ///// <summary>
        ///// è®¾ç½®å®‰é˜²é€‰é¡¹èƒŒæ™¯
        ///// </summary>
        //Button btnSecurityBg;

        /// <summary>
        /// è®¾ç½®å®‰é˜²é€‰é¡¹æç¤º
        /// </summary>
        Button btnSecuritySelectionTip;
        /// <summary>
        /// è®¾ç½®å®‰é˜²é€‰é¡¹é€‰ä¸­å›¾æ ‡
        /// </summary>
        Button btnSecuritySelectionIcon;
        /// <summary>
        /// è®¾ç½®å®‰é˜²é€‰é¡¹èƒŒæ™¯
        /// </summary>
        Button btnSecurityBg;


        ///// <summary>
        ///// è®¾ç½®é—¨é”é€‰é¡¹æç¤º
        ///// </summary>
        //Button btnDoorlockSelectionTip;
        ///// <summary>
        ///// è®¾ç½®é—¨é”é€‰é¡¹é€‰ä¸­å›¾æ ‡
        ///// </summary>
        //Button btnDoorlockSelectionIcon;
        ///// <summary>
        ///// è®¾ç½®é—¨é”é€‰é¡¹èƒŒæ™¯
        ///// </summary>
        //Button btnDoorlockBg;
        #endregion
        /// <summary>
        /// è®¾ç½®é—¨é”é€‰é¡¹æç¤º
        /// </summary>
        Button btnDoorlockSelectionTip;
        /// <summary>
        /// è®¾ç½®é—¨é”é€‰é¡¹é€‰ä¸­å›¾æ ‡
        /// </summary>
        Button btnDoorlockSelectionIcon;
        /// <summary>
        /// è®¾ç½®é—¨é”é€‰é¡¹èƒŒæ™¯
        /// </summary>
        Button btnDoorlockBg;

        /// <summary>
        /// å¯†ç ä½¿ç”¨é€‰æ‹©çš„详细内容提示
@@ -313,93 +312,92 @@
            startupDiv.AddChidren(btnStartupSelectionTip);
            #endregion

            #region F3阶段

            #region Security
            //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });

            //FrameLayout securityDiv = new FrameLayout()
            //{
            //    Width = Application.GetRealWidth(94),
            //};
            //optionView.AddChidren(securityDiv);
            FrameLayout securityDiv = new FrameLayout()
            {
                Width = Application.GetRealWidth(94),
            };
            optionView.AddChidren(securityDiv);

            //btnSecurityBg = new Button()
            //{
            //    Height = Application.GetRealWidth(174),
            //    UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
            //    SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
            //};
            //securityDiv.AddChidren(btnSecurityBg);
            btnSecurityBg = new Button()
            {
                Height = Application.GetRealWidth(174),
                UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
                SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
            };
            securityDiv.AddChidren(btnSecurityBg);

            //btnSecuritySelectionIcon = new Button()
            //{
            //    X = Application.GetRealWidth(5),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(30),
            //    Height = Application.GetRealWidth(30),
            //    UnSelectedImagePath = "Public/ChooseIcon.png",
            //    SelectedImagePath = "Public/ChooseOnIcon.png",
            //};
            //securityDiv.AddChidren(btnSecuritySelectionIcon);
            btnSecuritySelectionIcon = new Button()
            {
                X = Application.GetRealWidth(5),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealWidth(30),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
            };
            securityDiv.AddChidren(btnSecuritySelectionIcon);

            //btnSecuritySelectionTip = new Button()
            //{
            //    X = Application.GetRealWidth(30),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(74),
            //    Height = Application.GetRealWidth(30),
            //    TextID = StringId.DefenseAndUndefense,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //    SelectedTextColor = CSS_Color.MainColor,
            //    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            //};
            //securityDiv.AddChidren(btnSecuritySelectionTip);
            btnSecuritySelectionTip = new Button()
            {
                X = Application.GetRealWidth(30),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(74),
                Height = Application.GetRealWidth(30),
                TextID = StringId.DefenseAndUndefense,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            };
            securityDiv.AddChidren(btnSecuritySelectionTip);
            #endregion


            #region Doorlock
            //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });

            //FrameLayout doorlockDiv = new FrameLayout()
            //{
            //    Width = Application.GetRealWidth(94),
            //};
            //optionView.AddChidren(doorlockDiv);
            FrameLayout doorlockDiv = new FrameLayout()
            {
                Width = Application.GetRealWidth(94),
            };
            optionView.AddChidren(doorlockDiv);

            //btnDoorlockBg = new Button()
            //{
            //    Height = Application.GetRealWidth(174),
            //    UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png",
            //    SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png"
            //};
            //doorlockDiv.AddChidren(btnDoorlockBg);
            btnDoorlockBg = new Button()
            {
                Height = Application.GetRealWidth(174),
                UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png",
                SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png"
            };
            doorlockDiv.AddChidren(btnDoorlockBg);

            //btnDoorlockSelectionIcon = new Button()
            //{
            //    X = Application.GetRealWidth(5),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(30),
            //    Height = Application.GetRealWidth(30),
            //    UnSelectedImagePath = "Public/ChooseIcon.png",
            //    SelectedImagePath = "Public/ChooseOnIcon.png",
            //};
            //doorlockDiv.AddChidren(btnDoorlockSelectionIcon);
            btnDoorlockSelectionIcon = new Button()
            {
                X = Application.GetRealWidth(5),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealWidth(30),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
            };
            doorlockDiv.AddChidren(btnDoorlockSelectionIcon);

            //btnDoorlockSelectionTip = new Button()
            //{
            //    X = Application.GetRealWidth(30),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(74),
            //    Height = Application.GetRealWidth(30),
            //    TextID = StringId.RemoteUnlocking,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //    SelectedTextColor = CSS_Color.MainColor,
            //    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            //};
            //doorlockDiv.AddChidren(btnDoorlockSelectionTip);
            #endregion
            btnDoorlockSelectionTip = new Button()
            {
                X = Application.GetRealWidth(30),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(74),
                Height = Application.GetRealWidth(30),
                TextID = StringId.RemoteUnlocking,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            };
            doorlockDiv.AddChidren(btnDoorlockSelectionTip);
            #endregion

            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs

@@ -32,10 +32,8 @@
                {
                    btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
                    btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = false;
                    #region F3阶段
                    //btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = false;
                    //btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false;
                    #endregion
                    btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = false;
                    btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false;

                    btnTipMsg.TextID = StringId.UnprotectedTipMsg;

@@ -133,93 +131,94 @@
            btnStartupSelectionIcon.MouseUpEventHandler = eventHandler2;
            btnStartupSelectionTip.MouseUpEventHandler = eventHandler2;

            #region F3阶段
            //EventHandler<MouseEventArgs> eventHandler3 = (sender, e) =>
            //{
            //    bool result = !btnSecurityBg.IsSelected;
            //    if (!result)
            //    {
            //        //如果只剩布防/撤防一种 ä¸èƒ½å–消布防/撤防
            //        if (!CheckIfCanDeselect("2")) return;
            //    }
            //    btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result;
            //    btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
            //    if (result)
            //    {
            //        btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
            //        if (!UserInfo.Current.appUnlockPage.Contains("2"))
            //        {
            //            UserInfo.Current.appUnlockPage.Add("2");
            //            if (UserInfo.Current.appUnlockPasswrod != "")
            //                UserInfo.Current.SaveUserInfo();
            //        }
            //        unlockOptionView.Visible = true;
            //    }
            //    else
            //    {
            //        if (UserInfo.Current.appUnlockPage.Contains("2"))
            //        {
            //            UserInfo.Current.appUnlockPage.Remove("2");
            //        }
            //        if (UserInfo.Current.appUnlockPage.Count == 0)
            //        {
            //            btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result;
            //            btnTipMsg.TextID = StringId.UnprotectedTipMsg;
            //            UserInfo.Current.appUnlockPasswrod = "";
            //            unlockOptionView.Visible = false;
            //            refreshAction();
            //        }
            //        UserInfo.Current.SaveUserInfo();
            //    }
            //};
            //btnSecurityBg.MouseUpEventHandler = eventHandler3;
            //btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3;
            //btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3;
            EventHandler<MouseEventArgs> eventHandler3 = (sender, e) =>
            {
                bool result = !btnSecurityBg.IsSelected;
                if (!result)
                {
                    //如果只剩布防/撤防一种 ä¸èƒ½å–消布防/撤防
                    if (!CheckIfCanDeselect("2")) return;
                }

            //EventHandler<MouseEventArgs> eventHandler4 = (sender, e) =>
            //{
            //    bool result = !btnDoorlockBg.IsSelected;
            //    if (!result)
            //    {
            //        //如果只剩远程开锁不能取消远程开锁
            //        if (!CheckIfCanDeselect("3")) return;
            //    }
                btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result;

            //    btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result;
                btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);

            //    btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
            //    if (result)
            //    {
            //        btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
            //        if (!UserInfo.Current.appUnlockPage.Contains("3"))
            //        {
            //            UserInfo.Current.appUnlockPage.Add("3");
            //            if (UserInfo.Current.appUnlockPasswrod != "")
            //                UserInfo.Current.SaveUserInfo();
            //        }
            //        unlockOptionView.Visible = true;
            //    }
            //    else
            //    {
            //        if (UserInfo.Current.appUnlockPage.Contains("3"))
            //        {
            //            UserInfo.Current.appUnlockPage.Remove("3");
            //        }
            //        if (UserInfo.Current.appUnlockPage.Count == 0)
            //        {
            //            btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
            //            btnTipMsg.TextID = StringId.UnprotectedTipMsg;
            //            UserInfo.Current.appUnlockPasswrod = "";
            //            unlockOptionView.Visible = false;
            //            refreshAction();
            //        }
            //        UserInfo.Current.SaveUserInfo();
            //    }
            //};
            //btnDoorlockBg.MouseUpEventHandler = eventHandler4;
            //btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4;
            //btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4;
            #endregion
                if (result)
                {
                    btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
                    if (!UserInfo.Current.appUnlockPage.Contains("2"))
                    {
                        UserInfo.Current.appUnlockPage.Add("2");
                        if (UserInfo.Current.appUnlockPasswrod != "")
                            UserInfo.Current.SaveUserInfo();
                    }
                    unlockOptionView.Visible = true;
                }
                else
                {
                    if (UserInfo.Current.appUnlockPage.Contains("2"))
                    {
                        UserInfo.Current.appUnlockPage.Remove("2");
                    }
                    if (UserInfo.Current.appUnlockPage.Count == 0)
                    {
                        btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result;
                        btnTipMsg.TextID = StringId.UnprotectedTipMsg;
                        UserInfo.Current.appUnlockPasswrod = "";
                        unlockOptionView.Visible = false;
                        refreshAction();
                    }
                    UserInfo.Current.SaveUserInfo();
                }
            };
            btnSecurityBg.MouseUpEventHandler = eventHandler3;
            btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3;
            btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3;

            EventHandler<MouseEventArgs> eventHandler4 = (sender, e) =>
            {
                bool result = !btnDoorlockBg.IsSelected;
                if (!result)
                {
                    //如果只剩远程开锁不能取消远程开锁
                    if (!CheckIfCanDeselect("3")) return;
                }

                btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result;

                btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
                if (result)
                {
                    btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
                    if (!UserInfo.Current.appUnlockPage.Contains("3"))
                    {
                        UserInfo.Current.appUnlockPage.Add("3");
                        if (UserInfo.Current.appUnlockPasswrod != "")
                            UserInfo.Current.SaveUserInfo();
                    }
                    unlockOptionView.Visible = true;
                }
                else
                {
                    if (UserInfo.Current.appUnlockPage.Contains("3"))
                    {
                        UserInfo.Current.appUnlockPage.Remove("3");
                    }
                    if (UserInfo.Current.appUnlockPage.Count == 0)
                    {
                        btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
                        btnTipMsg.TextID = StringId.UnprotectedTipMsg;
                        UserInfo.Current.appUnlockPasswrod = "";
                        unlockOptionView.Visible = false;
                        refreshAction();
                    }
                    UserInfo.Current.SaveUserInfo();
                }
            };
            btnDoorlockBg.MouseUpEventHandler = eventHandler4;
            btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4;
            btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4;
        }

        /// <summary>
@@ -238,18 +237,16 @@
                    btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = true;
                    btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg);
                }
                #region F3阶段
                //if (UserInfo.Current.appUnlockPage.Contains("2"))
                //{
                //    btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true;
                //    btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
                //}
                //if (UserInfo.Current.appUnlockPage.Contains("3"))
                //{
                //    btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true;
                //    btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
                //}
                #endregion
                if (UserInfo.Current.appUnlockPage.Contains("2"))
                {
                    btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true;
                    btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
                }
                if (UserInfo.Current.appUnlockPage.Contains("3"))
                {
                    btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true;
                    btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
                }
            }
        }


 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -266,11 +266,7 @@

            LoadEventList();
            new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(aC);
            })
            { IsBackground = true }.Start();
        }
        /// <summary>
        /// åŠ è½½ä¿®æ”¹æ¨¡å¼åŒºåŸŸ

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs

@@ -156,11 +156,6 @@

            LoadEventList();
            new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(curtain);
            })
            { IsBackground = true }.Start();
        }

    }

 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs

@@ -218,11 +218,6 @@

            LoadEventList();
            new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain,actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(curtain);
            })
            { IsBackground = true }.Start();
        }

    }

 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs

@@ -219,11 +219,7 @@

            LoadEventList();
            new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(curtain);
            })
            { IsBackground = true }.Start();
        }

    }
}

 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs

@@ -169,11 +169,7 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(fan, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(fan);
            })
            { IsBackground = true }.Start();

        }

    }

 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs

@@ -130,11 +130,7 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(socketFunction, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(socketFunction);
            })
            { IsBackground = true }.Start();

        }

    }

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs

@@ -332,7 +332,6 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(tv);

        }


 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs

@@ -243,11 +243,8 @@

            LoadEventList();
            new TopViewDiv(bodyView, Language.StringByID(StringId.FloorHeating)).LoadTopView_FunctionTop(fh, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(fh);
            })
            { IsBackground = true }.Start();

        }
        /// <summary>
        /// åŠ è½½ä¿®æ”¹æ¨¡å¼åŒºåŸŸ

 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs

@@ -241,11 +241,7 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(light);
            })
            { IsBackground = true }.Start();

        }



 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs

@@ -176,7 +176,7 @@
            {
                X = Application.GetRealWidth(35),
                Y = btnBrightnessText.Bottom,
                Width = Application.GetRealWidth(30),
                Width = Application.GetRealWidth(22),
                Height = Application.GetRealHeight(21),
                Text = "0%",
                TextAlignment = TextAlignment.CenterLeft,
@@ -187,7 +187,7 @@

            dimmerBar = new DiyImageSeekBar()
            {
                X = Application.GetRealWidth(35 +22),
                X = btnMinValuesText.Right,
                Y = Application.GetRealHeight(312),
                Width = Application.GetRealWidth(210),
                Height = Application.GetRealHeight(54),
@@ -207,7 +207,7 @@
            {
                X = dimmerBar.Right,
                Y = btnBrightnessText.Bottom,
                Width = Application.GetRealWidth(45),
                Width = Application.GetRealWidth(35),
                Height = Application.GetRealHeight(21),
                Text = "100%",
                TextAlignment = TextAlignment.CenterLeft,
@@ -303,11 +303,6 @@

            LoadEventList();
            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(light);
            })
            { IsBackground = true }.Start();
        }
    }
}

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs

@@ -151,11 +151,7 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(light);
            })
            { IsBackground = true }.Start();

        }
    }
}

 HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs

@@ -102,26 +102,24 @@
        {
            X = Application.GetRealWidth(22),
            Y = Application.GetRealHeight(261),
            Width = Application.GetRealWidth(37 + 5+20),
            Width = Application.GetRealWidth(37 + 5),
            Height = Application.GetRealHeight(20),
            TextColor = MusicColor.TextTimeColor,
            TextSize = TextSize.Text14,
            TextAlignment = TextAlignment.CenterLeft,

        };
        /// <summary>
        ///音乐结束时间
        /// </summary>
        public Button endTimeBtn = new Button
        {
            X = Application.GetRealWidth(269-20),
            X = Application.GetRealWidth(269),
            Y = Application.GetRealHeight(261),
            Width = Application.GetRealWidth(37 + 5+20),
            Width = Application.GetRealWidth(37 + 5),
            Height = Application.GetRealHeight(20),
            TextColor = MusicColor.TextTimeColor,
            TextSize = TextSize.Text14,
            TextAlignment = TextAlignment.CenterRight,

        };
        /// <summary>
        /// æ­Œååç§°ï¼ˆTextView超出长度自己滚动）
@@ -220,7 +218,7 @@
        {
            X = Application.GetRealWidth(279 - 4),
            Y = Application.GetRealHeight(418),
            Width = Application.GetRealWidth(26 + 4+10),
            Width = Application.GetRealWidth(26 + 4),
            Height = Application.GetRealHeight(17),
            Text = "0%",
            TextColor = MusicColor.MusicNoTxetColor,

 asset/logo/1024¡¤1024@2x.png

 asset/logo/120¡¤120@2x.png

 asset/logo/120¡¤120@3x.png

 asset/logo/180¡¤180@3x.png

 asset/logo/20¡¤20.png

 asset/logo/29¡¤29.png

 asset/logo/40¡¤40@2x.png

 asset/logo/512¡¤512.png

 asset/logo/58¡¤58@2x.png

 asset/logo/60¡¤60@3x.png

 asset/logo/80¡¤80@2x.png

 asset/logo/87¡¤87@3x.png