| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/Utlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control_Udp.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/Function/Function.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/UserPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,43 +1,33 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/R.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs"> <Files> <File FileName="HDL-ON_iOS/BlueWifi.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs" Line="60" Column="54" /> <File FileName="HDL_ON/Common/R.cs" Line="7" Column="20" /> <File FileName="HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs" Line="123" Column="77" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/MainPage.cs" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="180" Column="51" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="214" Column="62" /> <File FileName="HDL_ON/Entity/FunctionList.cs" Line="42" Column="40" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="245" Column="35" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="328" Column="86" /> <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="138" Column="55" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/AcControlPage.cs" Line="487" Column="1" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="464" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="45" Column="59" /> <File FileName="HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs" Line="72" Column="96" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="186" Column="40" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="468" Column="87" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True"> <Node name="R.cs" selected="True" /> </Node> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> <Node name="DriverLayer" expanded="True"> <Node name="Control.cs" selected="True" /> </Node> <Node name="Mqtt" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI0-Stan" expanded="True"> <Node name="Controls" expanded="True"> <Node name="BottomControls" expanded="True" /> </Node> <Node name="Logic" expanded="True" /> </Node> <Node name="UI2" expanded="True"> <Node name="FuntionControlView" expanded="True"> @@ -47,24 +37,10 @@ </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True"> <Node name="Phone" expanded="True"> <Node name="FunctionIcon" expanded="True"> <Node name="AC" expanded="True" /> </Node> </Node> </Node> <Node name="Properties" expanded="True" /> <Node name="Resources" expanded="True" /> <Node name="Assets" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="Phone" expanded="True"> <Node name="FunctionIcon" expanded="True"> <Node name="AC" expanded="True" /> </Node> </Node> </Node> <Node name="Resources" expanded="True" /> </Node> </Node> </State> @@ -80,7 +56,10 @@ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" line="186" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="469" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> HDL-ON_Android/Assets/Language.ini
@@ -411,7 +411,11 @@ 426=Air dry time 427=Disinfect time 428=Anion Time 429=H 430=Min 431=You are currently adding any platform devices to 432=Other platform equipment is supported by third party service provider 433=Water valve 1002=Anion @@ -1089,6 +1093,11 @@ 426=风干时间 427=消毒时间 428=负离子时间 429=小时 430=分钟 431=你当前还为添加任何平台设备 432=其他平台设备均由第三方服务商提供支持 433=水阀 1000=室内湿度 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:versionCode="202103081" android:versionName="1.1.202103081" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103091" android:versionName="1.1.202103091" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" /> <!-- 定位权限--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> HDL-ON_iOS/Info.plist
@@ -102,9 +102,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.1.202103081</string> <string>1.1.202103092</string> <key>CFBundleVersion</key> <string>202103081</string> <string>202103092</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/Common/Utlis.cs
@@ -273,7 +273,7 @@ } /// <summary> /// /// 时间戳转时间字符串 /// </summary> /// <param name="unixTimeStamp"></param> /// <param name="format"></param> HDL_ON/DAL/DriverLayer/Control.cs
@@ -50,15 +50,15 @@ return _msg_id++; } } /// <summary> /// 获取13位时间戳 /// </summary> /// <returns></returns> public string Get_TimeStamp() { long t = DateTime.Now.Ticks / 10000; return t.ToString(); } ///// <summary> ///// 获取13位时间戳 ///// </summary> ///// <returns></returns> //public string Get_TimeStamp() //{ // long t = DateTime.Now.Ticks / 10000; // return t.ToString(); //} /// <summary> /// 是否搜索本地网关成功 @@ -602,7 +602,7 @@ } } MainPage.Log($"局域网信息: {receiveObj.Topic}"); //MainPage.Log($"局域网信息: {receiveObj.Topic}"); //验证有效数据长度 @@ -623,7 +623,7 @@ var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString()); if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC) { MainPage.Log("本地搜索网关成功"); //MainPage.Log("本地搜索网关成功"); Ins.IsSearchLocalGatewaySuccessful = true; Ins.GatewayOnline_Local = true; if (!string.IsNullOrEmpty(device.gatewayId)) @@ -689,6 +689,7 @@ MainPage.Log($"A协议更新状态:{revString}"); foreach (var attr in updateTemp.status) { localFunction.time_stamp = temp.time_stamp; localFunction.SetAttrState(attr.key, attr.value); }
@@ -957,7 +957,7 @@ { try { var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 100000).ToString() } }; var sendJob = new JObject { { "id", Control.Ins.msg_id.ToString() }, { "time_stamp", Utlis.GetTimestamp ()} }; var bodyString = JsonConvert.SerializeObject(sendJob); var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString); HDL_ON/Entity/Function/Function.cs
@@ -65,6 +65,22 @@ #region 优化区域 2021-02-25 /// <summary> /// 更新的最后时间 /// </summary> public string time_stamp = "1615261019796"; public string GeteTime() { try { DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 当地时区 return startTime.AddMilliseconds(Convert.ToDouble(time_stamp)).ToString("s"); } catch { return DateTime.MinValue.ToString("s"); } } /// <summary> /// 获取属性列表 /// </summary> /// <returns></returns> @@ -512,7 +528,7 @@ { var sendDataObj = new AlinkFunctionStatusObj(); sendDataObj.id = Control.Ins.msg_id.ToString(); sendDataObj.time_stamp = Control.Ins.Get_TimeStamp(); sendDataObj.time_stamp = Utlis.GetTimestamp(); var acd = new AlinkStatusData(); HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.1.0308"; public static string VersionString = "1.1.0309"; ///// <summary> ///// 客户端类型 ///// </summary> @@ -53,6 +53,14 @@ /// 是否进入后台 /// </summary> public static bool IsEnterBackground = false; /// <summary> /// 当前分页索引 /// 0:收藏 /// 1:分类 /// 2:智能 /// 3:个人 /// </summary> public static int CurPageIndex = 9999; ///// <summary> ///// 公司代码 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -26,7 +26,7 @@ /// </summary> public static void RefreshFunctionView() { if (bodyView != null) if (bodyView != null && MainPage.CurPageIndex==0) { bodyView.LoadDeviceFunctionControlZone(); } HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -405,6 +405,7 @@ { lightingView.SetViewStatus(lightTemp.state == "on"); } Console.WriteLine($"时间戳：{device.time_stamp} 时间：{device.GeteTime()} 烘干:{hotDryTemp.state} 风干:{windDryTemp.state} 消毒:{disinfectTemp.state} 灯光状态：{lightTemp.state}"); #endregion #region 修改时间 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
@@ -48,6 +48,12 @@ this.InitFrameWhiteContent1(); //刷新界面状态 this.RefreshFormStatu(); //读取状态 new System.Threading.Thread(() => { Control.Ins.ReadFunctionsInfo(new List<string>() { device.deviceId}); }) { IsBackground = true }.Start(); } /// <summary> @@ -187,7 +193,7 @@ { btnControlTip.TextID = StringId.ControllerNotOn; } this.btnSwitch.IsSelected = this.btnPictrue.IsSelected = onoffStatu.value.ToString() == "on"; this.btnSwitch.IsSelected = this.btnPictrue.IsSelected = onoffStatu.state.ToString() == "on"; } if (timeStatu != null) { @@ -252,8 +258,8 @@ private void SetControlTime() { var timeControl = new BottomTimeSelectControl(); timeControl.RowCount = 3; timeControl.InitControl(0,0,162); timeControl.RowCount = 5; timeControl.InitControl(0,0); timeControl.FinishEvent = (type,hours,min) => { if (type == 1)//0:取消；1:确定 { HDL_ON/UI/UI2/UserPage.cs
@@ -86,14 +86,6 @@ #endregion #endregion /// <summary> /// 当前动画效果 /// 0:收藏 /// 1:分类 /// 2:智能 /// 3:个人 /// </summary> int CurAnimationEffect = 0; public void LoadPage() { @@ -307,9 +299,9 @@ /// <summary> /// 切换到收藏界面 /// </summary> void ChooseCollection(bool qiangzhishuaxin = false) void ChooseCollection() { if (CurAnimationEffect == 0 || qiangzhishuaxin) if (MainPage.CurPageIndex == 0) { return; } @@ -337,10 +329,10 @@ distance /= total; new System.Threading.Thread(() => { int index = 0; CurAnimationEffect = 0; MainPage.CurPageIndex = 0; while (index < total+1) { if (CurAnimationEffect != 0) if (MainPage.CurPageIndex != 0) { break; } @@ -391,7 +383,7 @@ /// </summary> void ChooseClassification() { if (CurAnimationEffect == 1) if (MainPage.CurPageIndex == 1) { return; } @@ -413,15 +405,15 @@ distance /= total; new System.Threading.Thread(() => { if (CurAnimationEffect == 1) if (MainPage.CurPageIndex == 1) { return; } CurAnimationEffect = 1; MainPage.CurPageIndex = 1; int index = 0; while (index < total+1) { if (CurAnimationEffect != 1) if (MainPage.CurPageIndex != 1) { break; } @@ -482,7 +474,7 @@ /// </summary> void ChooseIntellectualization() { if (CurAnimationEffect == 2) if (MainPage.CurPageIndex == 2) { return; } @@ -503,15 +495,15 @@ } distance /= total; new System.Threading.Thread(() => { if (CurAnimationEffect == 2) if (MainPage.CurPageIndex == 2) { return; } CurAnimationEffect = 2; MainPage.CurPageIndex = 2; int index = 0; while (index < total+1) { if(CurAnimationEffect!=2) if(MainPage.CurPageIndex!=2) { break; } @@ -579,7 +571,7 @@ return; } #endif if (CurAnimationEffect == 3) if (MainPage.CurPageIndex == 3) { return; } @@ -605,11 +597,11 @@ } distance /= total; new System.Threading.Thread(() => { CurAnimationEffect = 3; MainPage.CurPageIndex = 3; int index = 0; while (index < total+1) { if (CurAnimationEffect != 3) if (MainPage.CurPageIndex != 3) { break; }
