From 3c39a9236955baeec02d9ea4d97b38282d0ea888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 五月 2023 16:56:10 +0800
Subject: [PATCH] 温度类型
---
HDL_ON/DAL/Server/NewApiRes.cs | 45 ----------------------
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 4 ++
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 10 +++--
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 8 ++--
HDL_ON/DAL/Server/HttpServerRequest.cs | 2 +
HDL_ON/UI/UI1-Login/LoginPage.cs | 2 +
6 files changed, 18 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index bb8c83c..ea5035b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1495,6 +1495,8 @@
/// </summary>
public void GetCityWeatherInfo(string lon, string lat)
{
+ if (lon == "0" || lat == "0")
+ return;
MainPage.cityInfo.lon = lon;
MainPage.cityInfo.lat = lat;
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 8447527..2d97f12 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1251,51 +1251,6 @@
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>
- /// 搴旂敤甯傚満鍚嶇О
- /// </summary>
- public string appMarket;
- /// <summary>
- /// app鍚嶇О
- /// </summary>
- public string appName;
- /// <summary>
- /// ios涓嬭浇鍦板潃
- /// </summary>
- public string iosUrl;
- /// <summary>
- /// 瀹夊崜涓嬭浇鍦板潃
- /// </summary>
- public string androidUrl;
- /// <summary>
- /// 鏄惁鏄己鍒舵洿鏂�
- /// </summary>
- public bool isEnforce;
- /// <summary>
- /// 鍙戝竷绯荤粺锛孖OS銆丄ndroid
- /// </summary>
- public string releaseSystem;
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string remark;
- /// <summary>
- /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
- /// </summary>
- public string updateDescription;
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- public string version;
- }
-
/// <summary>
/// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
/// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5ecb0a9..2bb99d6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -867,6 +867,7 @@
new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" },
new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 },
new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
},
};
fh.SaveFunctionFile();
@@ -1590,6 +1591,7 @@
new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
}
};
ac2.SaveFunctionFile();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 5d5edce..54d69c3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -230,7 +230,7 @@
/// </summary>
void OpenUrl()
{
- if (!string.IsNullOrEmpty(newAppVersion))
+ if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
{
HDLUtils.OpenUrl(newAppVersionUrl);
}
@@ -314,7 +314,7 @@
var newVersion = versionResult.version;
if (newVersion.CompareTo(MainPage.VersionString) > 0)
{
- newAppVersionUrl = versionResult.androidUrl;
+ newAppVersionUrl = versionResult.packageUrl;
return newVersion;
}
return "";
@@ -361,7 +361,7 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <returns>The https app version async.</returns>
- private AppVersionRes CheckAppVersion()
+ private AppVersionResNew CheckAppVersion()
{
try
{
@@ -373,7 +373,7 @@
return null;
}
- var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(result.Data.ToString());
+ var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(result.Data.ToString());
return responeData;
}
return null;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index c55d69b..1b55639 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -104,7 +104,7 @@
var temp = (int)Convert.ToDouble(setTempTemp);
if (temp <= 0)
{
- //榛樿鍊兼敼鎴�16,2022骞�06鏈�10鏃�10:03:19 鎴愮敨瑕佹眰鐨�
+ //榛樿鍊兼敼鎴�16
temp = 16;
device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
}
@@ -156,7 +156,7 @@
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
TextAlignment = TextAlignment.CenterLeft,
- Text = "掳C",
+ Text = acFunction.GetTempUnitString(device),
};
FrameWhiteCentet1.AddChidren(btnTempUint);
@@ -166,7 +166,7 @@
Y = btnTemp.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(30),
- Text = Language.StringByID(StringId.Indoor) + " 20掳C",
+ Text = Language.StringByID(StringId.Indoor) + " 20" + acFunction.GetTempUnitString(device),
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.TopCenter,
@@ -1035,7 +1035,9 @@
{
//device = FunctionList.List.Functions.Find((obj) => obj.sid == device.sid);
- btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " " + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
+ btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " "
+ + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")))
+ + acFunction.GetTempUnitString(device);
btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index a7e40b8..4094b80 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -204,6 +204,10 @@
Text = "掳C",
};
controlView.AddChidren(btnTempUint);
+ if (function.GetAttribute(FunctionAttributeKey.TempType) != null)
+ {
+ btnTempUint.Text = function.GetAttrState(FunctionAttributeKey.TempType);
+ }
btnIndoorTemp = new Button()
{
--
Gitblit v1.8.0