优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

xm

2020-09-11 f14dcfd967404e197e7ec995ca8d6f2b090d3b7d

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -39,9 +39,9 @@
    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <AndroidDexTool>d8</AndroidDexTool>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidKeyStore></AndroidKeyStore>

    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>

    <AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

    <DebugSymbols>true</DebugSymbols>

@@ -57,6 +57,7 @@
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">

@@ -221,92 +222,136 @@
    <AndroidResource Include="Resources\values\Strings.xml" />

    <AndroidResource Include="Resources\values\Styles.xml" />

    <AndroidResource Include="Resources\layout\activity_video_phone.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\layout\dialog_tip.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\layout\fragment_call.axml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\layout\fragment_monitor.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\back.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\call.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\dialog_background.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\floor.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\hangup.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\screenshot_def.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\screenshot_sel.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\screenshot.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\sure_background_def.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\sure_background_sel.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\tip_background.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\unlock_def.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\unlock_disable.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\unlock_sel.png">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\unlock.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\drawable\video_background.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\color\text_color.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

    <AndroidResource Include="Resources\values\Color.xml">

      <SubType></SubType>

      <Generator></Generator>

      <SubType>

      </SubType>

      <Generator>

      </Generator>

    </AndroidResource>

  </ItemGroup>

  <ItemGroup>

@@ -346,7 +391,7 @@
    <AndroidAsset Include="Assets\Phone\Account\Code.png" />

    <AndroidAsset Include="Assets\Phone\Account\HidePwd.png" />

    <AndroidAsset Include="Assets\Phone\Account\Logo_loginBG.png" />

    <AndroidAsset Include="Assets\Phone\Account\Logo_White.png" />

    <AndroidAsset Include="Assets\Phone\Account\Logo_Evoyo.png" />

    <AndroidAsset Include="Assets\Phone\Account\Password.png" />

    <AndroidAsset Include="Assets\Phone\Account\PhoneEmail_White.png" />

    <AndroidAsset Include="Assets\Phone\Account\UnhidePwd.png" />

@@ -2445,6 +2490,33 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\BindPic\TemperaTureReduction.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Account\Logo_WhiteHome.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButton.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorEmergencyButtonSelected2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorMotionSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\ScanQrCodeGroud.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\TransferOfResidence.png" />

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />