Merge remote-tracking branch 'origin/WJC'

wei

2020-12-04 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -617,6 +617,36 @@
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\timecondition.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\timeicon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon5.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\delayed.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\weekon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\outletlogic.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\back.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\scene.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\editname.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon1.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon2.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon3.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon4.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />