From 8b0c761887fc1bc3ec777e4aec87133233550836 Mon Sep 17 00:00:00 2001
From: 温居城 <wenjucheng@wenjuchengdeMacBook-Pro.local>
Date: 星期二, 23 十一月 2021 11:15:56 +0800
Subject: [PATCH] 2021-11-23-01
---
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 9 +-
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 2
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 3
ZigbeeApp/GateWay.Droid/packages.config | 130 ++++++++++++++++----------------
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 41 ++++-----
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 27 ++++++
6 files changed, 116 insertions(+), 96 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index d31baff..4e7d5db 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/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')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 1010a3f..969d77b 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -97,7 +97,7 @@
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
- <application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon">
+ <application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon">
<!-- 鑷姩鏇存柊 -->
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.evoyo.home.fileProvider" android:grantUriPermissions="true" android:exported="false">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
@@ -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" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index cca305f..0f3868a 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/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
{
diff --git a/ZigbeeApp/GateWay.Droid/packages.config b/ZigbeeApp/GateWay.Droid/packages.config
old mode 100755
new mode 100644
index 27f5243..16cc72f
--- a/ZigbeeApp/GateWay.Droid/packages.config
+++ b/ZigbeeApp/GateWay.Droid/packages.config
@@ -1,66 +1,66 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="BouncyCastle.Crypto.dll" version="1.8.1" targetFramework="monoandroid60" />
- <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" />
- <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid60" />
- <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid60" />
- <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid60" />
- <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" />
- <package id="MQTTnet" version="3.0.8" targetFramework="monoandroid80" />
- <package id="NETStandard.Library" version="2.0.0" targetFramework="monoandroid80" />
- <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Collections" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Console" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Globalization" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.IO" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.IO.Compression" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Linq" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Net.Http" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Net.Security" version="4.3.2" targetFramework="monoandroid60" />
- <package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Net.WebSockets" version="4.3.0" targetFramework="monoandroid80" />
- <package id="System.Net.WebSockets.Client" version="4.3.2" targetFramework="monoandroid80" />
- <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Runtime" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Threading" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid60" />
- <package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid60" />
- <package id="Xamarin.Android.Support.Annotations" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="Xamarin.Android.Support.Compat" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="Xamarin.Android.Support.Fragment" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="Xamarin.Android.Support.v4" version="25.4.0.1" targetFramework="monoandroid80" />
- <package id="ZXing.Net.Mobile" version="2.4.1" targetFramework="monoandroid80" />
+锘�<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <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" />
+ <package id="Microsoft.AppCenter.Analytics" version="1.14.0" targetFramework="monoandroid60" />
+ <package id="Microsoft.AppCenter.Crashes" version="1.14.0" targetFramework="monoandroid60" />
+ <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid60" />
+ <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="MQTTnet" version="3.0.8" targetFramework="monoandroid80" />
+ <package id="NETStandard.Library" version="2.0.0" targetFramework="monoandroid80" />
+ <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Collections" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Console" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Globalization" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.IO" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.IO.Compression" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Linq" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Net.Http" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Net.Security" version="4.3.2" targetFramework="monoandroid60" />
+ <package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Net.WebSockets" version="4.3.0" targetFramework="monoandroid80" />
+ <package id="System.Net.WebSockets.Client" version="4.3.2" targetFramework="monoandroid80" />
+ <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Runtime" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Threading" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid60" />
+ <package id="Xamarin.Android.Support.Annotations" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="Xamarin.Android.Support.Compat" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="Xamarin.Android.Support.Core.UI" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="Xamarin.Android.Support.Core.Utils" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="Xamarin.Android.Support.Fragment" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="Xamarin.Android.Support.v4" version="25.4.0.1" targetFramework="monoandroid80" />
+ <package id="ZXing.Net.Mobile" version="2.4.1" targetFramework="monoandroid80" />
</packages>
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
old mode 100755
new mode 100644
index 3d9b62d..20b9eea
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -462,7 +462,13 @@
//搴曠嚎
btnRow.AddBottomLine();
- var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
+ 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 鈻� 闂ㄩ攣鏃堕棿(闂ㄩ攣)_____________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
old mode 100755
new mode 100644
index 5e2a891..2beae28
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -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;
--
Gitblit v1.8.0