| .vs/Santan-OnPro-Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/Santan-OnPro-Project/xs/UserPrefs.xml
@@ -1,30 +1,7 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" relfile="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" line="25" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" relfile="HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" line="117" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" line="100" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="549" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="565" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" line="167" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="350" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" line="85" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="610" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3558" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="729" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" line="607" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2983" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3442" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3472" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" /> <MonoDevelop.Ide.ItemProperties.APP__Android PreferredExecutionTarget="Android.3TG0221602005112" Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" /> <MonoDevelop.Ide.ItemProperties.APP__IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.42525798-FD1A-478E-89EB-FD4A5C2176ED" Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" /> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs"> <Files> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="1" Column="1" /> <File FileName="HDL_ON/Common/HDLCommon.cs" /> <File FileName="HDL_ON/DAL/Server/NewAPI.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" /> @@ -42,25 +19,15 @@ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Constant.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" Line="638" Column="36" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockAudioSetupPage.cs" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="Santan-OnPro-Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True" /> <Node name="FuntionControlView" expanded="True"> <Node name="VideoDoorLock" expanded="True"> <Node name="VideoDoorlockAudioSetupPage.cs" selected="True" /> </Node> </Node> </Node> </Node> </Node> <Node name="APP_Android" selected="True" /> </Node> </State> </Pad> @@ -68,5 +35,27 @@ </MonoDevelop.Ide.Workbench> <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" /> <MultiItemStartupConfigurations /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" relfile="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" line="25" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" relfile="HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs" line="117" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" line="100" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="549" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="565" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" line="167" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="350" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs" line="85" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="610" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3558" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="729" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs" line="607" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3442" column="1" /> <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="3472" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.ItemProperties.APP__IOS Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.B7AA04D1-BAF6-4C17-BB5A-55A547855CF8" /> <MonoDevelop.Ide.ItemProperties.APP__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" /> </Properties> 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:versionName="4.2.0" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202405121"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.0" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202406171"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--程序可以读取设备外部存储空间(内置SDcard和外置SDCard)的文件，我的文件等--> HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
@@ -72,17 +72,17 @@ }; faceUnlockView.AddChidren(btnFaceUnlockTipText); //var btnFaceUnlockSwitchIcon = new Button() //{ // X = Application.GetRealWidth(322), // Y = Application.GetRealHeight(8), // Width = Application.GetMinRealAverage(36), // Height = Application.GetMinRealAverage(36), // UnSelectedImagePath = "Public/Switch_2.png", // SelectedImagePath = "Public/SwitchOn_2.png", // IsSelected = faceUnlockSwitch, //}; //faceUnlockView.AddChidren(btnFaceUnlockSwitchIcon); var btnFaceUnlockSwitchIcon = new Button() { X = Application.GetRealWidth(322), Y = Application.GetRealHeight(8), Width = Application.GetMinRealAverage(36), Height = Application.GetMinRealAverage(36), UnSelectedImagePath = "Public/Switch_2.png", SelectedImagePath = "Public/SwitchOn_2.png", IsSelected = faceUnlockSwitch, }; faceUnlockView.AddChidren(btnFaceUnlockSwitchIcon); @@ -105,119 +105,120 @@ contentView.AddChidren(view); //btnFaceUnlockSwitchIcon.MouseUpEventHandler = (sender, e) => //{ // waitPage.Start(""); // bool changeState = false; // if (!btnFaceUnlockSwitchIcon.IsSelected) // { // btnFaceUnlockSwitchIcon.IsSelected = true; // changeState = true; // } // new System.Threading.Thread(() => // { // try // { // var pack = ApiUtlis.Ins.HttpRequest.SetFaceUnlockCfg(device.deviceId, changeState, faceUnlockSetup.mode); // if (pack != null && pack.Code == StateCode.SUCCESS) // { // Application.RunOnMainThread(() => // { // //更新界面 // faceUnlockSetup.enabled = btnFaceUnlockSwitchIcon.IsSelected = changeState; // loadSubView(view, faceUnlockSetup); // }); // } // else // { // //失败提示 // Application.RunOnMainThread(() => // { // if (!string.IsNullOrEmpty(pack.message)) // { // if (string.IsNullOrEmpty(pack.message)) // { // pack.message = Language.StringByID(StringId.OperationFailed); // } // var tip = new Tip() // { // MaxWidth = Application.GetRealWidth(300), // Text = $"{pack.message}({pack.Code})", // CloseTime = 3, // Direction = AMPopTipDirection.None // }; // tip.Show(MainPage.BaseView); // } // }); // } // } // catch (Exception ex) // { // MainPage.Log($"btnFaceUnlockSwitchIcon error : {ex.Message}"); // } // finally // { // Application.RunOnMainThread(() => // { // waitPage.Hide(); // }); // } // }) // { IsBackground = true }.Start(); //}; btnFaceUnlockSwitchIcon.MouseUpEventHandler = (sender, e) => { waitPage.Start(""); bool changeState = false; if (!btnFaceUnlockSwitchIcon.IsSelected) { btnFaceUnlockSwitchIcon.IsSelected = true; changeState = true; } new System.Threading.Thread(() => { try { var pack = ApiUtlis.Ins.HttpRequest.SetFaceUnlockCfg(device.deviceId, changeState, faceUnlockSetup.mode); if (pack != null && pack.Code == StateCode.SUCCESS) { Application.RunOnMainThread(() => { //更新界面 faceUnlockSetup.enabled = btnFaceUnlockSwitchIcon.IsSelected = changeState; loadSubView(view, faceUnlockSetup); }); } else { //失败提示 Application.RunOnMainThread(() => { if (!string.IsNullOrEmpty(pack.message)) { if (string.IsNullOrEmpty(pack.message)) { pack.message = Language.StringByID(StringId.OperationFailed); } var tip = new Tip() { MaxWidth = Application.GetRealWidth(300), Text = $"{pack.message}({pack.Code})", CloseTime = 3, Direction = AMPopTipDirection.None }; tip.Show(MainPage.BaseView); } }); } } catch (Exception ex) { MainPage.Log($"btnFaceUnlockSwitchIcon error : {ex.Message}"); } finally { Application.RunOnMainThread(() => { waitPage.Hide(); }); } }) { IsBackground = true }.Start(); }; //new System.Threading.Thread(() => { // try // { // var pack = ApiUtlis.Ins.HttpRequest.GetFaceUnlockCfg(device.deviceId); // if (pack != null && pack.Code == StateCode.SUCCESS) // { // Application.RunOnMainThread(() => // { // //更新界面 // faceUnlockSetup = Newtonsoft.Json.JsonConvert.DeserializeObject<FaceUnlockSetupObj>(pack.Data.ToString()); // btnFaceUnlockSwitchIcon.IsSelected = faceUnlockSetup.enabled; // loadSubView(view, faceUnlockSetup); // }); // } // else // { // //失败提示 // Application.RunOnMainThread(() => // { // if (!string.IsNullOrEmpty(pack.message)) // { // if (string.IsNullOrEmpty(pack.message)) // { // pack.message = Language.StringByID(StringId.OperationFailed); // } // var tip = new Tip() // { // MaxWidth = Application.GetRealWidth(300), // Text = $"{pack.message}({pack.Code})", // CloseTime = 3, // Direction = AMPopTipDirection.None // }; // tip.Show(MainPage.BaseView); // } // }); // } // } // catch (Exception ex) // { // MainPage.Log($"UnlockSettingPage error : {ex.Message}"); // } // finally // { // Application.RunOnMainThread(() => // { // waitPage.Hide(); // }); // } new System.Threading.Thread(() => { try { var pack = ApiUtlis.Ins.HttpRequest.GetFaceUnlockCfg(device.deviceId); if (pack != null && pack.Code == StateCode.SUCCESS) { Application.RunOnMainThread(() => { //更新界面 faceUnlockSetup = Newtonsoft.Json.JsonConvert.DeserializeObject<FaceUnlockSetupObj>(pack.Data.ToString()); btnFaceUnlockSwitchIcon.IsSelected = faceUnlockSetup.enabled; loadSubView(view, faceUnlockSetup); }); } else { //失败提示 Application.RunOnMainThread(() => { if (!string.IsNullOrEmpty(pack.message)) { if (string.IsNullOrEmpty(pack.message)) { pack.message = Language.StringByID(StringId.OperationFailed); } var tip = new Tip() { MaxWidth = Application.GetRealWidth(300), Text = $"{pack.message}({pack.Code})", CloseTime = 3, Direction = AMPopTipDirection.None }; tip.Show(MainPage.BaseView); } }); } } catch (Exception ex) { MainPage.Log($"UnlockSettingPage error : {ex.Message}"); } finally { Application.RunOnMainThread(() => { waitPage.Hide(); }); } //}) //{ IsBackground = true }.Start(); }) { IsBackground = true }.Start(); }
