.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,14 +1,20 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Resources/Language.ini"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs"> <Files> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="20" Column="89" IsPinned="True" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="95" IsPinned="True" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="23" Column="55" /> <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="340" Column="35" /> <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="657" Column="42" /> <File FileName="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" Line="75" Column="1" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="47" Column="1" /> <File FileName="HDL_ON/UI/MainPage.cs" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" /> <File FileName="HDL-ON_Android/Assets/Language.ini" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs" /> <File FileName="HDL_ON/Common/R.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttInfoConfig.cs" /> <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="610" Column="44" /> <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs" Line="354" Column="44" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -19,14 +25,12 @@ <Node name="Server" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI1-Login" expanded="True"> <Node name="ForgetPasswordPage.cs" selected="True" /> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="Language.ini" selected="True" /> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True" /> </Node> </State> </Pad> @@ -38,16 +42,14 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1857" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="119" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="678" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="697" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/Assets/Language.ini
@@ -20,7 +20,7 @@ 19=The phone number is incorrect. Please re-enter. 20=The password and confirmation you typed do not match. Please re-enter your password. 21=The password format does not comply with the requirements, please enter again. 22=The user has existed, you can sign in directly. 22=The user has existed, yo24-hour defenseu can sign in directly. 23=Incorrect verification code, please re-enter. 24=Incorrect account number, please enter the correct email address. 25=Email address @@ -74,7 +74,7 @@ 73=Floor Management 74=Room Management 75=Administrator migration 76=Administrator privilege migration 76=Privilege Migration 77=Debugging privilege 78=The administrator is migrated to other user. 79=All of the data for the residence is migrated to new user. @@ -188,8 +188,8 @@ 187=Fan 188=Socket 189=Level 190=Channel 191=Volume 190=Chl 191=Vol 192=TV 193=The room has existed, fail to change. 194=Environment @@ -412,7 +412,7 @@ 427=Disinfect time 428=Anion Time 429=Real time power consumption: {0}kw 429=H 430=Min 431=You are currently adding any platform devices to @@ -423,10 +423,43 @@ 436=Added Devices 437=Device List 438=humidity:{0}% air:{1} wind:{2} 1000=Indoor Humidity 439=Real time power consumption: {0} kw 440=Next step 441=Please select all areas of capture status 442=Generate Scene 443=Custom deployment 444=SecurityCenter 445=House Defense 446=At Home Defense 447=Vacation Defense 448=Fixed deployment 449=*Undo defense does not affect 450=Disaster defense 451=24-hour defense 452=Burglar alarm 453=Alarm mute 454=Deployment information 455=The name can not be blank. 456=Canvas 457=Energy consumption 458=Date 459=Real time energy consumption 460=Energy consumption of this month 461=Outdoor/Indoor 462=You haven't added any devices yet ' 463=Please input the SN code of the device 464=Can start using Zhaoguan millimeter wave 465=Delete device 466=STB 467=Projector 468=Someone fell 469=Someone's in ' 470=Under protection 471=Millimeter wave sensor 1000=Room Humidity 1001=V-chip 1002=Anion 1003=Sterilization @@ -514,7 +547,11 @@ 1084=1st Gear 1085=2nd Gear 1086=3rd Gear 4000=Video intercom 4001=Call record 4002=*Cloud photos are only kept for 30 days @@ -530,7 +567,11 @@ 4012=The configuration parameters are abnormal! 4013=Access Control QR Code 4014=Temporary password 5000=Music 5001=Group 5002=Setting @@ -579,8 +620,7 @@ 5045=General volume 5046=Adjust volume 5047="QQ music" has not installed in your cell phone, please proceed in App center. 6000=normal 6001=Device status 6002=pcs @@ -674,7 +714,54 @@ 6092=The device does not exist 6093=The device is not online 6094=The gateway device does not exist 7108=Leak/No Leak 7109=Leak 7110=No leak 7111=Water leaking/no water leaking 7112=Water leaking 7113=No water leaking 7114=Someone/Nobody 7115=Someone 7116=Nobody 7117=Open/Close 7118=On 7119=Close 7120=Anti-dismantling function 7121=Online 7122=Not online 7123=Air quality 7124=Excellent 7125=Good 7126=Poor 7127=Send notification 7128=Notification content 7129=(within 100 characters) 7130=Account selection 7131=App push 7132=Automation 7133=Executed 6000=Rename 6001=Please enter a name 6002=Xiaodu 6003=aispeech 6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP" 6005=Unbind 6006=Smart speaker 6007=Control content 6008=Failed to upload data 6009=Failed to configure data 6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker." 6011=Modification of remarks is unsuccessful! 6012=Do you want to unbind? 6013=Unbinding... 6014=transfer to third-party APP 6015=Add speakers 7000=Create automation 7001=Edit automation 7002=If @@ -783,35 +870,7 @@ 7105=Light pollution: 75 ~ 115ug/m3 7106=Moderate pollution: 115 ~ 150ug/m3 7107=Heavy pollution: > 150ug/m3 7108=Leak/No Leak 7109=Leak 7110=No leak 7111=Water leaking/no water leaking 7112=Water leaking 7113=No water leaking 7114=Someone/Nobody 7115=Someone 7116=Nobody 7117=Open/Close 7118=On 7119=Close 7120=Anti-dismantling function 7121=Online 7122=Not online 7123=Air quality 7124=Excellent 7125=Good 7126=Poor 7127=Send notification 7128=Notification content 7129=(within 100 characters) 7130=Account selection 7131=App push 7132=Automation 7133=Executed 7134=Target State 7135=Tumble 9000=Please sign in with new cell phone number. 9001=Please sign in with new email address. 9002=New cell phone number is revised. @@ -853,7 +912,7 @@ 9038=(Frequently Asked Questions) 9039=Share and function 9040=Alerts 9041=System info. 9041=System info 9042=Information Center 9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately. 9044=Successfully uploaded @@ -877,7 +936,12 @@ 9061=Find your password by clicking on "Forgot Password", or try again in {0} minute. 9062=Check 9063=You still have {0} times. 9064=Smart speaker 9065=Data management 9066=Remarks 9067=Remarks cannot be blank. 9068=Do you want to unbind? 10000=Invalid password, please log in again. 10001=Fail to request server, please try again later. 10002=System maintaining, please try again later. @@ -912,9 +976,9 @@ 10031=The device should not be blank. 10032=The user does not have permission. 10033=The device does not exist. [Chinese] 1=登录 2=手机号登录 @@ -1242,7 +1306,7 @@ 324=场景延时 325=延时设置 326=延时 327=捕获场景 327=捕捉场景 328=电影场景 329=普通 330=自动模式 @@ -1306,7 +1370,7 @@ 406=会客 407=阅读 408=确认添加 409=功能品牌 410=你当前还未添加任何平台设备 411=其他平台设备均由第三方服务商提供支持 @@ -1338,7 +1402,40 @@ 437=设备列表 438=湿度:{0}% 空气:{1} 风速:{2}级 439=实时功耗: {0}kW 440=下一步 441=请选择捕捉状态的区域 442=生成场景 443=自定义布防 444=安防中心 445=全宅布防 446=在家布防 447=假期布防 448=固定布防 449=*不受撤防影响 450=灾害报警 451=24小时不撤防 452=防盗报警 453=报警静音 454=布防信息 455=名称不能为空。 456=画布 457=能耗 458=日期 459=实时能耗 460=本月能耗 461=室外/室内 462=您当前还未添加任何设备 463=请输入设备机上的sn码 464=可以开始使用兆观毫米波了 465=删除设备 466=机顶盒 467=投影仪 468=有人跌倒 469=有人进入 470=防护中 471=毫米波传感器 1000=室内湿度 1001=童锁 1002=负离子 @@ -1426,9 +1523,8 @@ 1084=风速1档 1085=风速2档 1086=风速3档 4000=可视对讲 4001=通话记录 4002=*云端照片只保留30天 @@ -1444,8 +1540,7 @@ 4012=配置参数有异常! 4013=门禁二维码 4014=临时密码 5000=音乐 5001=组合 5002=设置 @@ -1494,8 +1589,8 @@ 5045=总音量 5046=调节音量 5047=你手机暂未安装"QQ音乐"{\r\n}请前往手机商场安装 6000=正常 6001=设备状态 6002=个 @@ -1589,9 +1684,9 @@ 6092=设备不存在 6093=设备不在线 6094=网关设备不存在 7000=新建自动化 7001=编辑自动化 7002=如果 @@ -1726,10 +1821,7 @@ 7131=App推送 7132=自动化 7133=已执行 7134=目标状态 7135=跌倒 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP 9002=登录手机修改完成 @@ -1794,7 +1886,12 @@ 9061=请通过忘记密码找回密码或{0}分钟后重试. 9062=查看 9063=还有{0}次机会。 9064=智能音箱 9065=数据管理 9066=备注 9067=备注不能为空 9068=是否解除绑定？ 10000=无效登录密钥，请重新登录！ 10001=请求服务器失败，请稍后再试！ 10002=系统维护中,请稍后再试! @@ -1828,4 +1925,4 @@ 10030=没有远程控制权限 10031=设备不能为空 10032=用户没有设备的权限 10033=设备不存在 10033=设备不存在 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="202106062" android:versionName="1.2.202106062" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202106063" android:versionName="1.2.202106063" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" /> <!-- 可视对讲权限--> <uses-permission android:name="android.permission.CAMERA" /> HDL-ON_iOS/Info.plist
@@ -104,9 +104,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.2.202106062</string> <string>1.2.202106063</string> <key>CFBundleVersion</key> <string>1.2.06062</string> <string>1.2.06063</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/Language.ini
@@ -20,7 +20,7 @@ 19=The phone number is incorrect. Please re-enter. 20=The password and confirmation you typed do not match. Please re-enter your password. 21=The password format does not comply with the requirements, please enter again. 22=The user has existed, you can sign in directly. 22=The user has existed, yo24-hour defenseu can sign in directly. 23=Incorrect verification code, please re-enter. 24=Incorrect account number, please enter the correct email address. 25=Email address @@ -74,7 +74,7 @@ 73=Floor Management 74=Room Management 75=Administrator migration 76=Administrator privilege migration 76=Privilege Migration 77=Debugging privilege 78=The administrator is migrated to other user. 79=All of the data for the residence is migrated to new user. @@ -188,8 +188,8 @@ 187=Fan 188=Socket 189=Level 190=Channel 191=Volume 190=Chl 191=Vol 192=TV 193=The room has existed, fail to change. 194=Environment @@ -412,7 +412,7 @@ 427=Disinfect time 428=Anion Time 429=Real time power consumption: {0}kw 429=H 430=Min 431=You are currently adding any platform devices to @@ -423,10 +423,43 @@ 436=Added Devices 437=Device List 438=humidity:{0}% air:{1} wind:{2} 1000=Indoor Humidity 439=Real time power consumption: {0} kw 440=Next step 441=Please select all areas of capture status 442=Generate Scene 443=Custom deployment 444=SecurityCenter 445=House Defense 446=At Home Defense 447=Vacation Defense 448=Fixed deployment 449=*Undo defense does not affect 450=Disaster defense 451=24-hour defense 452=Burglar alarm 453=Alarm mute 454=Deployment information 455=The name can not be blank. 456=Canvas 457=Energy consumption 458=Date 459=Real time energy consumption 460=Energy consumption of this month 461=Outdoor/Indoor 462=You haven't added any devices yet ' 463=Please input the SN code of the device 464=Can start using Zhaoguan millimeter wave 465=Delete device 466=STB 467=Projector 468=Someone fell 469=Someone's in ' 470=Under protection 471=Millimeter wave sensor 1000=Room Humidity 1001=V-chip 1002=Anion 1003=Sterilization @@ -514,7 +547,11 @@ 1084=1st Gear 1085=2nd Gear 1086=3rd Gear 4000=Video intercom 4001=Call record 4002=*Cloud photos are only kept for 30 days @@ -530,7 +567,11 @@ 4012=The configuration parameters are abnormal! 4013=Access Control QR Code 4014=Temporary password 5000=Music 5001=Group 5002=Setting @@ -579,8 +620,7 @@ 5045=General volume 5046=Adjust volume 5047="QQ music" has not installed in your cell phone, please proceed in App center. 6000=normal 6001=Device status 6002=pcs @@ -674,7 +714,54 @@ 6092=The device does not exist 6093=The device is not online 6094=The gateway device does not exist 7108=Leak/No Leak 7109=Leak 7110=No leak 7111=Water leaking/no water leaking 7112=Water leaking 7113=No water leaking 7114=Someone/Nobody 7115=Someone 7116=Nobody 7117=Open/Close 7118=On 7119=Close 7120=Anti-dismantling function 7121=Online 7122=Not online 7123=Air quality 7124=Excellent 7125=Good 7126=Poor 7127=Send notification 7128=Notification content 7129=(within 100 characters) 7130=Account selection 7131=App push 7132=Automation 7133=Executed 6000=Rename 6001=Please enter a name 6002=Xiaodu 6003=aispeech 6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP" 6005=Unbind 6006=Smart speaker 6007=Control content 6008=Failed to upload data 6009=Failed to configure data 6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker." 6011=Modification of remarks is unsuccessful! 6012=Do you want to unbind? 6013=Unbinding... 6014=transfer to third-party APP 6015=Add speakers 7000=Create automation 7001=Edit automation 7002=If @@ -783,35 +870,7 @@ 7105=Light pollution: 75 ~ 115ug/m3 7106=Moderate pollution: 115 ~ 150ug/m3 7107=Heavy pollution: > 150ug/m3 7108=Leak/No Leak 7109=Leak 7110=No leak 7111=Water leaking/no water leaking 7112=Water leaking 7113=No water leaking 7114=Someone/Nobody 7115=Someone 7116=Nobody 7117=Open/Close 7118=On 7119=Close 7120=Anti-dismantling function 7121=Online 7122=Not online 7123=Air quality 7124=Excellent 7125=Good 7126=Poor 7127=Send notification 7128=Notification content 7129=(within 100 characters) 7130=Account selection 7131=App push 7132=Automation 7133=Executed 7134=Target State 7135=Tumble 9000=Please sign in with new cell phone number. 9001=Please sign in with new email address. 9002=New cell phone number is revised. @@ -853,7 +912,7 @@ 9038=(Frequently Asked Questions) 9039=Share and function 9040=Alerts 9041=System info. 9041=System info 9042=Information Center 9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately. 9044=Successfully uploaded @@ -877,7 +936,12 @@ 9061=Find your password by clicking on "Forgot Password", or try again in {0} minute. 9062=Check 9063=You still have {0} times. 9064=Smart speaker 9065=Data management 9066=Remarks 9067=Remarks cannot be blank. 9068=Do you want to unbind? 10000=Invalid password, please log in again. 10001=Fail to request server, please try again later. 10002=System maintaining, please try again later. @@ -912,9 +976,9 @@ 10031=The device should not be blank. 10032=The user does not have permission. 10033=The device does not exist. [Chinese] 1=登录 2=手机号登录 @@ -1242,7 +1306,7 @@ 324=场景延时 325=延时设置 326=延时 327=捕获场景 327=捕捉场景 328=电影场景 329=普通 330=自动模式 @@ -1306,7 +1370,7 @@ 406=会客 407=阅读 408=确认添加 409=功能品牌 410=你当前还未添加任何平台设备 411=其他平台设备均由第三方服务商提供支持 @@ -1338,7 +1402,40 @@ 437=设备列表 438=湿度:{0}% 空气:{1} 风速:{2}级 439=实时功耗: {0}kW 440=下一步 441=请选择捕捉状态的区域 442=生成场景 443=自定义布防 444=安防中心 445=全宅布防 446=在家布防 447=假期布防 448=固定布防 449=*不受撤防影响 450=灾害报警 451=24小时不撤防 452=防盗报警 453=报警静音 454=布防信息 455=名称不能为空。 456=画布 457=能耗 458=日期 459=实时能耗 460=本月能耗 461=室外/室内 462=您当前还未添加任何设备 463=请输入设备机上的sn码 464=可以开始使用兆观毫米波了 465=删除设备 466=机顶盒 467=投影仪 468=有人跌倒 469=有人进入 470=防护中 471=毫米波传感器 1000=室内湿度 1001=童锁 1002=负离子 @@ -1426,9 +1523,8 @@ 1084=风速1档 1085=风速2档 1086=风速3档 4000=可视对讲 4001=通话记录 4002=*云端照片只保留30天 @@ -1444,8 +1540,7 @@ 4012=配置参数有异常! 4013=门禁二维码 4014=临时密码 5000=音乐 5001=组合 5002=设置 @@ -1494,8 +1589,8 @@ 5045=总音量 5046=调节音量 5047=你手机暂未安装"QQ音乐"{\r\n}请前往手机商场安装 6000=正常 6001=设备状态 6002=个 @@ -1589,9 +1684,9 @@ 6092=设备不存在 6093=设备不在线 6094=网关设备不存在 7000=新建自动化 7001=编辑自动化 7002=如果 @@ -1726,9 +1821,7 @@ 7131=App推送 7132=自动化 7133=已执行 7134=目标状态 7135=跌倒 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP 9002=登录手机修改完成 @@ -1793,7 +1886,12 @@ 9061=请通过忘记密码找回密码或{0}分钟后重试. 9062=查看 9063=还有{0}次机会。 9064=智能音箱 9065=数据管理 9066=备注 9067=备注不能为空 9068=是否解除绑定？ 10000=无效登录密钥，请重新登录！ 10001=请求服务器失败，请稍后再试！ 10002=系统维护中,请稍后再试! @@ -1827,4 +1925,4 @@ 10030=没有远程控制权限 10031=设备不能为空 10032=用户没有设备的权限 10033=设备不存在 10033=设备不存在 HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -204,6 +204,7 @@ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up", QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce }; #region 数据更新推送主题 //appHomeRefresh：住宅数据刷新通知 var appHomeRefresh = new MqttTopicFilter() @@ -223,6 +224,13 @@ Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up", QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce }; //网关密钥更新通知 var mqttkeyChange = new MqttTopicFilter() { Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change", QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce }; #endregion @@ -230,7 +238,7 @@ var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] { pirStatus,pirStudy, appDeviceRefresh,appHomeRefresh,appRoomRefresh, topicFilterPush2, topicAlinkStatus }); topicFilterPush2, topicAlinkStatus ,mqttkeyChange}); if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0) { isSubscribeSuccess = true; @@ -415,6 +423,17 @@ MainPage.Log($"读取云端设备数据失败:Code:{deviceResult.Code}; Msg:{deviceResult.message}"); } } //网关密钥变化 else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change") { var pm = new HttpServerRequest(); pm.GetHomeGatewayList(); MainPage.Log($"网关密钥变更"); MainPage.Log($"旧密钥：{mqttEncryptKey}"); mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey; MainPage.Log($"新密钥：{mqttEncryptKey}"); } #endregion //A网关设备状态-包含涂鸦设备 else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send") @@ -675,7 +694,7 @@ { if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态 //测试账号，不挤下线 switch (UserInfo.Current.AccountString) switch (UserInfo.Current.userMobileInfo) { case "13415629083": case "18316120654": HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1851,12 +1851,13 @@ /// <param name="productPlatform"></param> /// <param name="productBrand"></param> /// <returns></returns> public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId) public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName) { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("spk", spk); d.Add("extDevId", extDevId); d.Add("name", deviceName); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson); HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -350,6 +350,7 @@ TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode), IsNumberKeyboardType = true }; verificationCodeView.AddChidren(etVerificationCode);
@@ -607,6 +607,7 @@ TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode), IsNumberKeyboardType = true }; verificationCodeView.AddChidren(etVerificationCode);
@@ -115,16 +115,17 @@ try { var pm = new HttpServerRequest(); var pack = pm.IndependentRegister3TyDevcie(SPK.SenesorMegahealth, snCode); var pack = pm.IndependentRegister3TyDevcie(SPK.SenesorMegahealth, snCode,Language.StringByID(StringId.SenesorMillimeterWave)); if (pack.Code == StateCode.SUCCESS) { var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString()); //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString()); Application.RunOnMainThread(() => { waitPage.Hide(); var tipDialog = new OperationResultDisPalyPage(); tipDialog.LoadPage(true, Language.StringByID(StringId.AddSuccess), "", Language.StringByID(StringId.CanStartUsingZhaoguanMillimeterWave), Language.StringByID(StringId.Next)); tipDialog.Show(); AddDeviceEvent?.Invoke(new Function()); this.CloseForm(); }); } HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs
@@ -87,11 +87,28 @@ btnDel.MouseUpEventHandler = (sender, e) => { var pack = PirSend.DeleteDevice(function.deviceId); if(pack.Code == StateCode.SUCCESS) if (pack.Code == StateCode.SUCCESS) { DelDeviceEvent?.Invoke(); this.CloseForm(); }else var mes = ""; if (Language.CurrentLanguage == "Chinese") { mes = "设备删除成功。"; } else { mes = "Device deleted successfully."; } var tip = new Tip() { Text = mes, CloseTime = 2, Direction = AMPopTipDirection.None }; tip.Show(MainPage.BaseView); } else { IMessageCommon.Current.ShowErrorInfoAlter(pack.Code); } HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -151,6 +151,7 @@ form1.AddForm(device); form1.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); this.RemoveFromParent(); }; break; }
