HDL Home App 第二版本 旧平台金堂用 正在使用
parent: 993ecf49 | 补丁 | 提交 | show whitespace
温居城
2021-11-23 8b0c761887fc1bc3ec777e4aec87133233550836 
2021-11-23-01
6个文件已修改
80 ■■■■■ 已修改文件
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/GateWay.Droid/packages.config 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj


@@ -38,7 +38,6 @@


    <AndroidTlsProvider>btls</AndroidTlsProvider>



    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>



    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>



    <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>



    <AndroidDexTool>d8</AndroidDexTool>



    <AotAssemblies>false</AotAssemblies>



    <EnableLLVM>false</EnableLLVM>



@@ -66,18 +65,6 @@


    <AndroidUseAapt2>false</AndroidUseAapt2>



  </PropertyGroup>



  <ItemGroup>



    <Reference Include="AndriodBluetoothLibrary">



      <HintPath>..\AndriodBluetooth\bin\Debug\AndriodBluetoothLibrary.dll</HintPath>



    </Reference>



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



      <HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>



    </Reference>



    <Reference Include="DroidLib">



      <HintPath>..\DroidLib\bin\Debug\DroidLib.dll</HintPath>



    </Reference>



    <Reference Include="FastAndroidCamera, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">



      <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>



    </Reference>



    <Reference Include="LeakCanary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">



      <HintPath>..\packages\LeakCanaryBinding.1.5.1.1\lib\MonoAndroid10\LeakCanary.dll</HintPath>



    </Reference>



@@ -132,14 +119,8 @@


    </Reference>



    <Reference Include="System.IO.Compression" />



    <Reference Include="System.Net.Http" />



    <Reference Include="MQTTnet.Core">



      <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>



    </Reference>



    <Reference Include="MQTTnet">



      <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>



    </Reference>



    <Reference Include="BouncyCastle.Crypto">



      <HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>



    </Reference>



    <Reference Include="Microsoft.AppCenter.Android.Bindings">



      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll</HintPath>



@@ -207,13 +188,19 @@


    <Reference Include="Xamarin.Android.Support.Vector.Drawable">



      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>



    </Reference>



    <Reference Include="ZXing.Net.Mobile.Core, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">



    <Reference Include="BouncyCastle.Crypto">



      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>



    </Reference>



    <Reference Include="FastAndroidCamera">



      <HintPath>..\packages\FastAndroidCamera.2.0.0\lib\MonoAndroid403\FastAndroidCamera.dll</HintPath>



    </Reference>



    <Reference Include="ZXing.Net.Mobile.Core">



      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXing.Net.Mobile.Core.dll</HintPath>



    </Reference>



    <Reference Include="zxing.portable, Version=0.16.2.0, Culture=neutral, PublicKeyToken=830ae994e36ac27d, processorArchitecture=MSIL">



    <Reference Include="zxing.portable">



      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\zxing.portable.dll</HintPath>



    </Reference>



    <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">



    <Reference Include="ZXingNetMobile">



      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>



    </Reference>



  </ItemGroup>



@@ -2721,6 +2708,16 @@


  <ItemGroup>



    <AndroidAsset Include="Assets\Echarts\js\world.js" />



  </ItemGroup>



  <ItemGroup>



    <ProjectReference Include="..\DroidLib\DroidLib.csproj">



      <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>



      <Name>DroidLib</Name>



    </ProjectReference>



    <ProjectReference Include="..\AndriodBluetooth\AndriodBluetooth.csproj">



      <Project>{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}</Project>



      <Name>AndriodBluetooth</Name>



    </ProjectReference>



  </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')" />





 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml


@@ -148,7 +148,6 @@


        </receiver>


        <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" />


        <!-- User defined.  For test only  用户自定义的广播接收器-->


	


        <!-- Required  . Enable it you can get statistics data with channel -->


        <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />


        <meta-data android:name="JPUSH_APPKEY" android:value="07cfd3177490173e7c072f49" />




 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs


@@ -1,11 +1,10 @@


#pragma warning disable 1591


//------------------------------------------------------------------------------


// <auto-generated>


//     此代码由工具生成。


//     运行时版本:4.0.30319.42000


//     This code was generated by a tool.


//


//     对此文件的更改可能会导致不正确的行为，并且如果


//     重新生成代码，这些更改将会丢失。


//     Changes to this file may cause incorrect behavior and will be lost if


//     the code is regenerated.


// </auto-generated>


//------------------------------------------------------------------------------




@@ -15,7 +14,7 @@


{


    


    


    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]


    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]


    public partial class Resource


    {


        




 ZigbeeApp/GateWay.Droid/packages.config

old mode 100755
new mode 100644

@@ -1,6 +1,6 @@


<?xml version="1.0" encoding="utf-8"?>



<packages>



  <package id="BouncyCastle.Crypto.dll" version="1.8.1" targetFramework="monoandroid60" />



  <package id="BouncyCastle" version="1.8.1" targetFramework="monoandroid80" />


  <package id="FastAndroidCamera" version="2.0.0" targetFramework="monoandroid80" />



  <package id="LeakCanaryBinding" version="1.5.1.1" targetFramework="monoandroid80" />



  <package id="Microsoft.AppCenter" version="1.14.0" targetFramework="monoandroid60" />





 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

old mode 100755
new mode 100644

@@ -463,6 +463,12 @@


                btnRow.AddBottomLine();







                var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];



                ///值为空再去读取本地


                if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))



                {


                    ///读取本地远程开锁密码，看看之前是否配置过


                    doorLock.RemoteUnlockPassword = ReadLocalPassword();



                }


                if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword) == false)



                {



                    btnswitch.IsSelected = true;



@@ -518,7 +524,24 @@


                 };



            }



        }







        /// <summary>


        /// 保存远程门锁密码


        /// </summary>


        /// <param name="password">密码</param>



        public void SaveLocalPassword(string password) {



            var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(password));



            IO.FileUtils.WriteFileByBytes(Config.Instance.HomeId + "_" + Config.Instance.Guid, bytes);



        }


        /// <summary>


        /// 读取远程门锁密码


        /// </summary>


        /// <returns></returns>


        public string ReadLocalPassword()


        {


            var str = System.Text.Encoding.UTF8.GetString(IO.FileUtils.ReadFile(Config.Instance.HomeId + "_" + Config.Instance.Guid));



            //Newtonsoft.Json.JsonConvert.DeserializeObject<对像>(str);


            return str;


        }



        #endregion







        #region ■ 门锁时间(门锁)_____________________





 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs

old mode 100755
new mode 100644

@@ -292,6 +292,8 @@


                {


                    if (verifyResult.result == 0)


                    {


                        ///保存远程门锁密码


                        new Device.DeviceMacInfoEditorForm { }.SaveLocalPassword(editInputPassword.Text);


                        System.Threading.Thread.Sleep(500);


                        doorLock.RemoteUnlockPassword = editInputPassword.Text;


                        ZigBee.Device.DoorLock.minValue = DateTime.MinValue;