HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Common/HDLCommon.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/NewApiRes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Entity/DB_ResidenceData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
SiriIntents/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -563,6 +563,7 @@ 576=Open 577=Close 578=Mechanical Arm 579=Cancellation @@ -1790,6 +1791,7 @@ 576=阀门已关闭 577=阀门已打开 578=机械手 579=立即注销 @@ -2994,7 +2996,7 @@ 576=Открыть 577=Закрыть 578=Mechanical Arm 579=Cancellation 2532=Visitor Invitation Record @@ -4207,7 +4209,7 @@ 576=Abrir 577=Cerrar 578=Mechanical Arm 579=Cancellation 2532=Visitor Invitation Record 2533=Visitor management @@ -5404,7 +5406,7 @@ 575=Select Mode 576=Отворено 577=Затвори 579=Cancellation 1000=Влажност в стаята HDL-ON_iOS/Resources/Language.ini
@@ -560,7 +560,10 @@ 573=At home 574=Heating and dehumidification 575=Select Mode 576=Open 577=Close 578=Mechanical Arm 579=Cancellation @@ -1785,6 +1788,10 @@ 573=在家 574=制热除湿 575=选择模式 576=阀门已关闭 577=阀门已打开 578=机械手 579=立即注销 @@ -2986,7 +2993,10 @@ 573=At home 574=Heating and dehumidification 575=Select Mode 576=Открыть 577=Закрыть 578=Mechanical Arm 579=Cancellation 2532=Visitor Invitation Record @@ -3751,7 +3761,7 @@ 115=Electrodomésticos 116=Bloqueo inteligente 117=Calefacción 118=Abrir 118=Abrir 119=Refrigeración 120=Calefacción 121=Deshumidificar @@ -4196,9 +4206,10 @@ 573=At home 574=Heating and dehumidification 575=Select Mode 576=Abrir 577=Cerrar 578=Mechanical Arm 579=Cancellation 2532=Visitor Invitation Record 2533=Visitor management @@ -5393,7 +5404,9 @@ 573=At home 574=Heating and dehumidification 575=Select Mode 576=Отворено 577=Затвори 579=Cancellation 1000=Влажност в стаята @@ -5410,7 +5423,7 @@ 1011=Синхронизация 1012=Изберете скорост на вятъра 1013=степен 1014=1014=Моля, потвърдете дали филтърният елемент действително е бил нулиран и работете с оборудването съгласно инструкциите на {0}, за да пренастроите живота на филтърния елемент {0} 1014=Моля, потвърдете дали филтърният елемент действително е бил нулиран и работете с оборудването съгласно инструкциите на {0}, за да пренастроите живота на филтърния елемент {0} 1015=Ниска степен 1016=Средна степен 1017=Висока степен HDL_ON/Common/HDLCommon.cs
@@ -91,7 +91,7 @@ { if (revertObj.Data != null) { var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString()); var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString()); if (appVersionRes != null) { @@ -99,24 +99,25 @@ { UpdateType = appVersionRes.isEnforce ? 2 : 1, NewVersion = appVersionRes.version, NewVersionUrl = appVersionRes.androidUrl NewVersionUrl = appVersionRes.packageUrl }; #if __IOS__ mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl; #endif //解析更新内容详情 var reasonStrJson = GetReasonStrJson(appVersionRes.updateDescription); if (reasonStrJson != null) { if (Language.CurrentLanguage == "Chinese") { mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese; } else { mForceUpdateInfo.ReasonStr = reasonStrJson.English; } } //var reasonStrJson = GetReasonStrJson(appVersionRes.remark); //if (reasonStrJson != null) //{ // if (Language.CurrentLanguage == "Chinese") // { // mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese; // } // else // { // mForceUpdateInfo.ReasonStr = reasonStrJson.English; // } //} mForceUpdateInfo.ReasonStr = appVersionRes.remark; Application.RunOnMainThread(() => { HDL_ON/Common/R.cs
@@ -5,6 +5,10 @@ public static class StringId { /// <summary> /// 注销 /// </summary> public const int Cancellation = 579; /// <summary> /// 机械臂 /// </summary> public const int MechanicalArm = 578; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1354,18 +1354,52 @@ { var requestObj = new AppVersionCheckObj() { }; #if __IOS__ requestObj.releaseSystem = "IOS"; #else requestObj.releaseSystem = "Android"; #endif var requestJson = HttpUtil.GetSignRequestJson(requestObj); return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson); } #endregion #region 获取天气部分 #region 注销账号 /// <summary> /// 获取当前版本注销账号模式 /// </summary> /// <returns></returns> public ResponsePackNew GetUnregisterModel() { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("version", MainPage.VersionString); d.Add("appCode", "1588071238036582401"); #if __IOS__ d.Add("releaseSystem", "IOS"); #else d.Add("releaseSystem", "Android"); #endif var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetUnregisterModel, requestJson); } /// <summary> /// 注销账号 /// </summary> /// <returns></returns> public ResponsePackNew Unregister(string pwd) { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("userId", UserInfo.Current.ID); d.Add("pwd", pwd); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_Unregister, requestJson); } #endregion #region 获取天气部分 /// <summary> /// 获取指定经纬度的城市信息天气信息 /// </summary> @@ -1489,10 +1523,10 @@ //} #endregion #endregion #region 备份部分 #region 备份部分 ///// <summary> ///// 获取住宅备份列表 ///// </summary> @@ -1963,10 +1997,10 @@ } */ #endregion #endregion #region Kaede --设备功能—————————————————————————————————— #region Kaede --设备功能—————————————————————————————————— /// <summary> /// 获取设备列表 /// </summary> @@ -2246,9 +2280,9 @@ } #endregion #endregion #region Kaede --场景功能-------------------------- #region Kaede --场景功能-------------------------- /// <summary> /// 获取场景列表 /// 房间ID可空,默认查询住宅下所有房间 @@ -2380,9 +2414,9 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code; } #endregion #endregion #region Kaede --房间功能-------------------------- #region Kaede --房间功能-------------------------- /// <summary> /// 获取房间列表 /// </summary> @@ -2457,10 +2491,10 @@ return pack; } #endregion #endregion #region Kaede -- 安防接口____________________________ #region Kaede -- 安防接口____________________________ /// <summary> /// 获取安防列表 /// </summary> @@ -2624,10 +2658,10 @@ return pack; } #endregion #endregion #region Kaede --第三方品牌功能-------------------------- #region Kaede --第三方品牌功能-------------------------- /// <summary> /// 获取第三方品牌列表 /// </summary> @@ -2739,9 +2773,9 @@ return pack; } #endregion #endregion #region ■ 萤石云SDK相关接口_________________________ #region ■ 萤石云SDK相关接口_________________________ /// <summary> /// 河东获取萤石云子账号token的接口 /// 2021-07-07 新方案接口调整对接 @@ -2754,10 +2788,10 @@ var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson); } #endregion #endregion #region ■ 可视对讲_________________________ #region ■ 可视对讲_________________________ /// <summary> /// 检查住宅是否绑定丰林 /// </summary> @@ -2789,9 +2823,9 @@ } #endregion #endregion #region ■ 门锁相关____________________________ #region ■ 门锁相关____________________________ /// <summary> /// 获取门锁历史记录(按日期降序) @@ -2860,8 +2894,8 @@ return listSortLog; } #endregion #region ■ 音箱语言控制相关_________________________ #endregion #region ■ 音箱语言控制相关_________________________ /// <summary> /// 获取已授权的音箱列表 /// </summary> @@ -2925,7 +2959,7 @@ var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj); return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson); } #endregion #endregion /// <summary> /// 绑定source面板 @@ -2993,7 +3027,7 @@ #region 光伏储能 #region 光伏储能 /// <summary> /// 获取住宅下逆变器列表 /// </summary> @@ -3018,7 +3052,7 @@ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetInverter_StatisticsInfo, requestJson); return pack; } #endregion #endregion } } 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/DAL/Server/NewAPI.cs
@@ -348,13 +348,20 @@ /// <summary> /// 检测更新,是否需要强制更新 /// </summary> public const string API_POST_CheckAppVersion = "/smart-footstone/app/appVersion/check"; public const string API_POST_CheckAppVersion = "/basis-footstone/app/appVersion/check"; ///// <summary> ///// 查询APP最新版本 ///// </summary> //public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion"; #endregion /// <summary> /// 获取当前版本注销账号模式 /// </summary> public const string Api_Post_GetUnregisterModel = "/basis-footstone/app/appVersion/unregisterModel"; /// <summary> /// 注销账号 /// </summary> public const string Api_Post_Unregister = "/basis-footstone/member/unregister"; #region ■ -- 房间场景背景图片上传下载接口___________________________ HDL_ON/DAL/Server/NewApiRes.cs
@@ -585,7 +585,7 @@ /// <summary> /// 网关ID /// </summary> public string gatewayId =""; public string gatewayId = ""; /// <summary> /// 网关snID /// </summary> @@ -994,7 +994,7 @@ } #endregion #region 数据分享 @@ -1236,6 +1236,21 @@ /// /// </summary> [System.Serializable] public class AppVersionResNew { public string version; public string appName; public string appCode; public bool isEnforce; public string releaseSystem; public string packageUrl;//": "http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2022/11/51b8b0b2-0ebc-4632-a3b5-0be1e5d104e4.apk", public string remark; } /// <summary> /// /// </summary> [System.Serializable] public class AppVersionRes { /// <summary> HDL_ON/Entity/DB_ResidenceData.cs
@@ -54,11 +54,13 @@ } } [Newtonsoft.Json.JsonIgnore] private List<ShowFunction> showFunctions; /// <summary> /// 功能类型列表 /// </summary> [Newtonsoft.Json.JsonIgnore] public List<ShowFunction> functionTypeList { get HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -112,10 +112,10 @@ { #region 窗帘更新 var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff); if (onoffString == "stop") { return; } //if (onoffString == "stop") //{ // return; //} var percent = onoffString == "off" ? 0 : 100; if (updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent)) { HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -464,6 +464,14 @@ /// </summary> void CurtainFragment() { var onoffString = function.GetAttrState(FunctionAttributeKey.OnOff); var percent = onoffString == "off" ? 0 : 100; if (function.GetAttributes().Contains(FunctionAttributeKey.Percent)) { string percentString = function.GetAttrState(FunctionAttributeKey.Percent); int.TryParse(percentString, out percent); } #region Curtain var btnCurtainClose = new Button() { @@ -473,7 +481,7 @@ Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png", IsSelected = function.GetAttrState(FunctionAttributeKey.OnOff) == "off", IsSelected = percent == 0, Tag = function.sid + "_off" }; bodyDiv.AddChidren(btnCurtainClose); @@ -504,7 +512,7 @@ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png", Tag = function.sid + "_on", IsSelected = function.GetAttrState(FunctionAttributeKey.OnOff) == "on", IsSelected = percent != 0, }; bodyDiv.AddChidren(btnCurtainOpen); if (function.spk == SPK.CurtainRoller) HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
@@ -2,6 +2,7 @@ using Shared; using HDL_ON.UI.CSS; using Xamarin.Essentials; using HDL_ON.DAL.Server; namespace HDL_ON.UI { @@ -24,7 +25,277 @@ /// <summary> /// /// </summary> public void LoadPage() public void LoadPage() { var loading = new Loading(); this.AddChidren(loading); loading.Start(""); new System.Threading.Thread(() => { try { var pack = new HttpServerRequest().GetUnregisterModel(); if (pack.Code == StateCode.SUCCESS) { var data = Newtonsoft.Json.JsonConvert.DeserializeObject<UMode>(pack.Data.ToString()); Application.RunOnMainThread(() => { if (data != null) { if (data.model == "APP") { InitView_PreRelease(); } else { InitView_Release(); } } else { InitView_PreRelease(); } }); } else { Application.RunOnMainThread(() => { InitView_PreRelease(); }); } } catch { Application.RunOnMainThread(() => { InitView_PreRelease(); }); } finally { Application.RunOnMainThread(() => { if (loading != null) { loading.Hide(); loading.RemoveFromParent(); loading = null; } }); } }) { IsBackground = true }.Start(); } public void InitView_PreRelease() { new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount)).LoadTopView(CSS_Color.MainBackgroundColor); bodyView.BackgroundColor = CSS_Color.BackgroundColor; var textView = new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(64 + 16), Height = Application.GetRealHeight(90), Width = Application.GetRealWidth(343), Padding = new Padding(Application.GetRealWidth(16), Application.GetRealWidth(16), Application.GetRealWidth(16), Application.GetRealWidth(16)), IsMoreLines = true, TextSize = CSS_FontSize.TextFontSize, TextAlignment = TextAlignment.TopLeft, TextColor = CSS_Color.FirstLevelTitleColor, Radius = (uint)Application.GetRealHeight(14), BackgroundColor = 0x174484F4, }; if (Language.CurrentLanguage == "Chinese") { textView.Text = "*注销账户是不可恢复的操作,注销账户之后,您App所有账户数据(包括昵称、头像、二维码照片等)都会被删除,且无法再找回。"; } else { textView.Text = "*Account cancellation is an irreversible operation. After account cancellation, all account data (including nickname, avatar, QR code photo, etc.) of your app will be deleted and cannot be retrieved."; } bodyView.AddChidren(textView); #region 账号填写 var accountView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(132 + 50), Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(50), BackgroundColor = CSS_Color.MainBackgroundColor, Radius = (uint)Application.GetRealHeight(25), }; bodyView.AddChidren(accountView); var etAccount = new EditText() { X = Application.GetRealWidth(58), Width = Application.GetRealWidth(343 - 68), TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber), TextAlignment = TextAlignment.CenterLeft, }; accountView.AddChidren(etAccount); var btnAccountIcon = new Button() { X = Application.GetRealWidth(26), Gravity = Gravity.CenterVertical, Width = Application.GetMinRealAverage(20), Height = Application.GetMinRealAverage(20), UnSelectedImagePath = "LoginIcon/AccountIcon.png", }; accountView.AddChidren(btnAccountIcon); #endregion #region 密码填写 var passwordView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(211 + 40), Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(50), Radius = (uint)Application.GetRealHeight(25), BackgroundColor = CSS_Color.MainBackgroundColor, }; bodyView.AddChidren(passwordView); var btnPasswordIcon = new Button() { X = Application.GetRealWidth(26), Gravity = Gravity.CenterVertical, Width = Application.GetMinRealAverage(20), Height = Application.GetMinRealAverage(20), UnSelectedImagePath = "LoginIcon/PasswordIcon.png", }; passwordView.AddChidren(btnPasswordIcon); var etPassword = new EditText() { X = Application.GetRealWidth(58), Width = Application.GetRealWidth(343 - 68), TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, PlaceholderTextColor = CSS_Color.PromptingColor1, PlaceholderText = Language.StringByID(StringId.PlsEntryPassword), SecureTextEntry = true, TextAlignment = TextAlignment.CenterLeft, }; passwordView.AddChidren(etPassword); #endregion var btnLogin = new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(403), Width = Application.GetRealWidth(220), Height = Application.GetRealWidth(44), Radius = (uint)Application.GetRealWidth(22), SelectedBackgroundColor = CSS_Color.MainColor, BackgroundColor = CSS_Color.PromptingColor1, TextID = StringId.Cancellation, TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.MainBackgroundColor, TextAlignment = TextAlignment.Center, }; bodyView.AddChidren(btnLogin); string account = ""; etAccount.TextChangeEventHandler = (sender, e) => { account = etAccount.Text.Trim(); if (account.Length > 0 && etPassword.Text.Trim().Length > 0) { btnLogin.IsSelected = true; } else { btnLogin.IsSelected = false; } }; etPassword.TextChangeEventHandler += (sender, e) => { if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0) { btnLogin.IsSelected = true; } else { btnLogin.IsSelected = false; } }; btnLogin.MouseUpEventHandler = (sender,e) =>{ if (btnLogin.IsSelected) { var tipMsg = "*您当前正在注销账户,注销完成后,您在On Pro App的所有数据均会被删除,请谨慎操作。"; Action action = () => { var loading = new Loading(); this.AddChidren(loading); loading.Start(""); var pwd = etPassword.Text.Trim(); new System.Threading.Thread(() => { try { var pack = new HttpServerRequest().Unregister(pwd); Application.RunOnMainThread(() => { if (pack.Code == StateCode.SUCCESS) { //Action okAction = () => //{ HDLCommon.Current.Logout(); //}; //new ConfirmDialog().ShowDialog(StringId.Tip, StringId.IfConfirmLogout, okAction); } else { var tip = new Tip() { Text = pack.message, CloseTime = 3, Direction = AMPopTipDirection.None }; tip.Show(bodyView); } }); } catch { } finally { Application.RunOnMainThread(() => { if (loading != null) { loading.Hide(); loading.RemoveFromParent(); loading = null; } }); } }) { IsBackground = true }.Start(); }; new PublicAssmebly().TipOptionMsg(StringId.CancelAccount, tipMsg, action, 20); } }; } public void InitView_Release() { new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount)).LoadTopView(); @@ -206,4 +477,16 @@ } class UMode { public string appCode; public string version; public string releaseSystem; /// <summary> /// APP :用户在app上自助注销 /// APPLY : 用户发邮件给公司申请注销 /// </summary> public string model; } } SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,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>