| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/1-HomePage/HomePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,32 +1,40 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs"> <Files> <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="282" Column="39" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="489" Column="57" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs" Line="61" Column="14" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1603" Column="7" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="2184" Column="17" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="286" Column="28" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="489" Column="60" /> <File FileName="HDL_ON/Common/R.cs" Line="22" Column="26" /> <File FileName="HDL_ON/Entity/Function/Sensor.cs" Line="201" Column="73" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="567" Column="62" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="482" Column="14" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="313" Column="51" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="1" Column="1" /> </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="DAL" expanded="True"> <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> <Node name="Server" expanded="True"> <Node name="HttpUtil.cs" selected="True" /> </Node> </Node> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="FaceManagement" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="1ContorlPage" expanded="True" /> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" selected="True" /> <Node name="HDL-ON_iOS" expanded="True" /> </Node> </State> </Pad> @@ -57,7 +65,8 @@ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="224" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="466" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="523" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" line="279" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="314" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="312" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/Assets/Language.ini
@@ -488,7 +488,12 @@ 500=Add alarm target 501=Security alarm: {0} is triggered. 502=Clear the security alarm? 503=Exceeding standard 504=Secondary standard 505=Class I standard 506=Face input succeeded 507=Face input failed 508=Formaldehyde 1000=Room Humidity 1001=V-chip @@ -1594,6 +1599,12 @@ 500=添加告警目标 501=安防报警：{0}被触发。 502=是否解除安防警报？ 503=超标 504=二级 505=一级 506=人脸录入成功 507=人脸录入失败 508=甲醛 1000=室内湿度 1001=童锁 @@ -2085,7 +2096,6 @@ 7148=撤防 7149=手动 7150=智能 9000=请使用新的手机账号登录APP HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108271" android:versionName="1.2.202108271" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108273" android:versionName="1.2.202108273" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" /> <!-- 乐橙可视对讲需要的权限 --> <!--<uses-permission android:name="android.permission.INTERNET" />--> <!--网络访问--> HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_iOS/Resources/Language.ini
@@ -488,7 +488,12 @@ 500=Add alarm target 501=Security alarm: {0} is triggered. 502=Clear the security alarm? 503=Exceeding standard 504=Secondary standard 505=Class I standard 506=Face input succeeded 507=Face input failed 508=Formaldehyde 1000=Room Humidity 1001=V-chip @@ -1594,6 +1599,12 @@ 500=添加告警目标 501=安防报警：{0}被触发。 502=是否解除安防警报？ 503=超标 504=二级 505=一级 506=人脸录入成功 507=人脸录入失败 508=甲醛 1000=室内湿度 1001=童锁 HDL_ON/Common/ApiUtlis.cs
@@ -277,19 +277,11 @@ UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken; } else if (video.interphoneType == InterphoneType.HDL.ToString()) { isInterphoneType_HDL = true; } else if(video.interphoneType == InterphoneType.HDL.ToString()) { DB_ResidenceData.Instance.SupportFacePass = true; DB_ResidenceData.Instance.SaveResidenceData(); DB_ResidenceData.Instance.SaveResidenceData(); } } } //======================安防==================== GetSecurityList(); //======================SIP账号==================== //======================获取Sip账号并且初始化SDK可视对讲设备列表==================== //如果检测线程没启动，才继续下面操作 因为App有可能刚启动马上收到推送了，然后才执行到这里 @@ -307,7 +299,10 @@ HDLLinphone.Current.LogoutAllAccount(); } } //======================安防==================== GetSecurityList(); } catch (Exception ex) { HDL_ON/Common/R.cs
@@ -4,7 +4,18 @@ { public static class StringId { /// <summary> /// 甲醛 /// </summary> public const int Formaldehyde = 508; /// <summary> /// 人脸录入失败 /// </summary> public const int FaceInputFailed = 507; /// <summary> /// 人脸录入成功 /// </summary> public const int FaceInputSucceeded = 506; /// <summary> /// 一级建筑标准 /// </summary> @@ -12,7 +23,7 @@ /// <summary> /// 二级建筑标准 /// </summary> public const int SecondaryBuildingStandard = 506; public const int SecondaryBuildingStandard = 504; /// <summary> /// 超标 /// </summary> HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -549,16 +549,16 @@ // }, //}); FunctionList.List.Functions.Add(new Function() { spk = SPK.AirFreshStandard, name = "测试新风", attributes = new List<FunctionAttributes>() { new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } }, }, }); //FunctionList.List.Functions.Add(new Function() //{ // spk = SPK.AirFreshStandard, // name = "测试新风", // attributes = new List<FunctionAttributes>() // { // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, // new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } }, // }, //}); //FunctionList.List.Functions.Add(new Function() //{ HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -713,9 +713,9 @@ case "tvoc": { list = new List<string> { Language.StringByID(StringId.zhengchang)+ ":0~399PPB", Language.StringByID(StringId.chaobiao)+ ":400~699PPB", Language.StringByID(StringId.yanzhong)+":>700PPB", Language.StringByID(StringId.zhengchang)+ ":0~399mg/m3", Language.StringByID(StringId.chaobiao)+ ":400~699mg/m3", Language.StringByID(StringId.yanzhong)+":>700mg/m3", }; } break; @@ -727,7 +727,6 @@ }; } break; } return list; } @@ -986,15 +985,15 @@ if (intValue >=1 && intValue <= 3) { text = Language.StringByID(StringId.zhengchang) + ":0~399PPB"; text = Language.StringByID(StringId.zhengchang) + ":0~399mg/m3"; } else if (intValue >=4 && intValue<=6) { text = Language.StringByID(StringId.chaobiao) + ":400~699PPB"; text = Language.StringByID(StringId.chaobiao) + ":400~699mg/m3"; } else if (intValue >= 7 && intValue <= 9) { text = Language.StringByID(StringId.yanzhong) + ":>700PPB"; text = Language.StringByID(StringId.yanzhong) + ":>700mg/m3"; } } break; @@ -1055,15 +1054,15 @@ break; case "tvoc": { if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB") if (text == Language.StringByID(StringId.zhengchang) + ":0~399mg/m3") { value = "2"; } else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB") else if (text == Language.StringByID(StringId.chaobiao) + ":400~699mg/m3") { value = "5"; } else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB") else if (text == Language.StringByID(StringId.yanzhong) + ":>700mg/m3") { value = "8"; } HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -467,14 +467,14 @@ { if (imageSource == 1) { CropImage.SelectPicture((imagePath) => CropImage.TakePicture((imagePath) => { CropImageCallBack(imagePath, 2, imageName); }, imageName, 4, 6); } else { CropImage.TakePicture((imagePath) => CropImage.SelectPicture((imagePath) => { CropImageCallBack(imagePath, 1,imageName); }, imageName, 4, 6); HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs
@@ -55,14 +55,14 @@ }; contentView.AddChidren(btnResultText); if(isSuccess) { btnResultText.TextID = StringId.FaceInputSucceeded; } else { btnResultText.TextID = StringId.FaceInputFailed; } var btnSetFaceId = new Button() { HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -381,6 +381,10 @@ imagePath = "FunctionIcon/EnvirSensor/TempBg.png"; iconPath = "FunctionIcon/EnvirSensor/TempIcon.png"; break; case SPK.SensorHcho: imagePath = "FunctionIcon/EnvirSensor/HchoBg.png"; iconPath = "FunctionIcon/EnvirSensor/HchoIcon.png"; break; } sensorView.BackgroundImagePath = imagePath; @@ -431,12 +435,13 @@ Width = Application.GetRealWidth(100), Height = Application.GetRealWidth(32), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextColor = sensorTemp.GetLevelColorList(sensor.spk)[sensorTemp.GetCurLevel(sensor) - 1], TextSize = CSS_FontSize.SubheadingFontSize, TextID = levelTextList[sensorTemp.GetCurLevel(sensor) - 1], Tag = "SensorLevel", }; sensorView.AddChidren(btnLevel); btnLevel.MouseUpEventHandler = (sender, e) => { #region @@ -523,7 +528,7 @@ btnTitle.Text = Language.StringByID(StringId.Temp) + "(°C)"; break; case SPK.SensorTVOC: btnTitle.Text = "TVOC(PPM)"; btnTitle.Text = "TVOC(mg/m3)"; break; case SPK.SensorCO2: btnTitle.Text = "CO2(PPM)"; @@ -531,6 +536,9 @@ case SPK.SensorHumidity: btnTitle.Text = Language.StringByID(StringId.Humidity) + "(%)"; break; case SPK.SensorHcho: btnTitle.Text = Language.StringByID(StringId.Formaldehyde) +"(mg/m3)"; break; } FrameLayout subTitleView = new FrameLayout()
