From 9523ea8fc874c27ad1369c076de59c00bbc5d470 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 15 十月 2024 16:06:11 +0800
Subject: [PATCH] 空调功能更新
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 8 -
HDL-ON_iOS/HDL-ON_iOS.csproj | 1
HDL-ON_iOS/Resources/BEBAS.ttf | 0
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 68 ++++++-----------
HDL_ON/DAL/Mqtt/MqttClient.cs | 2
HDL_ON/Entity/Enumerative/Command.cs | 6
NunitTest-Android/Resources/Resource.designer.cs | 2
HDL-ON_iOS/Info.plist | 1
HDL_ON/Entity/Function/Function.cs | 65 ++++++++++++++-
HDL-ON_Android/Resources/Resource.designer.cs | 2
HDL_ON/DAL/DriverLayer/Packet.cs | 9 +
HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | 19 ++++
HDL_ON/UI/UI1-Login/LoginPage.cs | 2
15 files changed, 117 insertions(+), 71 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 00041ac..963074b 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/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:versionName="2.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202410091">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202410151">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 45e7ad8..6537ae2 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -15,7 +15,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
public partial class Resource
{
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 6a28bf6..d2f1aae 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1850,6 +1850,7 @@
<BundleResource Include="Resources\Phone\Collection\TokenInvalidTipIcon.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
+ <BundleResource Include="Resources\BEBAS.ttf" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 5eb45c0..daf4681 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -98,6 +98,7 @@
<key>UIAppFonts</key>
<array>
<string>titilliumtext25l005.otf</string>
+ <string>BEBAS.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
diff --git a/HDL-ON_iOS/Resources/BEBAS.ttf b/HDL-ON_iOS/Resources/BEBAS.ttf
new file mode 100644
index 0000000..eaff486
--- /dev/null
+++ b/HDL-ON_iOS/Resources/BEBAS.ttf
Binary files differ
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index bc21d64..3dceeb3 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -611,7 +611,6 @@
case SPK.AcStandard:
case SPK.HvacAC:case SPK.HvacAcPanel:
var ac = new AC();
-
byte onoff = 0;
onoff = function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
byte mode = 0;
@@ -621,28 +620,34 @@
byte sanfan = 0;
byte temp = 16;
temp = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ byte coolTemp = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.CoolTemperatrue));
+ byte heatTemp = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.HeatTemperatrue));
+ byte autoTemp = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.AutoTemperatrue));
+ byte dehumiTemp = Convert.ToByte(function.GetAttrState(FunctionAttributeKey.DehumiTemperatrue));
foreach (var dic in commandDictionary)
{
switch (dic.Key)
{
case FunctionAttributeKey.OnOff:
onoff = dic.Value == "on" ? (byte)1 : (byte)0;
- //ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID,
- // new byte[] { 3, onoff, function.bus.LoopId });
break;
case "mode":
switch (dic.Value)
{
case "auto":
mode = 3;
+ temp = autoTemp;
break;
case "cool":
mode = 0;
+ temp = coolTemp;
break;
case "heat":
mode = 1;
+ temp = heatTemp;
break;
case "dry":
+ temp = dehumiTemp;
mode = 4;
break;
case "fan":
@@ -652,8 +657,6 @@
mode = 0;
break;
}
- //ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID,
- // new byte[] { 6, mode, function.bus.LoopId });
break;
case "fan":
switch (dic.Value)
@@ -674,8 +677,6 @@
fan = 0;
break;
}
- //ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID,
- // new byte[] { 5, fan, function.bus.LoopId });
break;
case FunctionAttributeKey.SetTemp:
try
@@ -686,28 +687,6 @@
{
temp = 16;
}
- //byte modeKey = 4;
- //switch (ac.GetModeIndex(function))
- //{
- // case 3:
- // modeKey = 8;
- // break;
- // case 0:
- // modeKey = 4;
- // break;
- // case 1:
- // modeKey = 7;
- // break;
- // case 4:
- // modeKey = 19;
- // break;
- // case 2:
- // modeKey = 2;
- // break;
- //}
-
- //ControlBytesSend(Command.InstructionPanelKey, function.bus.SubnetID, function.bus.DeviceID, new byte[] {
- // modeKey, temp, function.bus.LoopId });
break;
case FunctionAttributeKey.Swing:
//sanfan
@@ -717,22 +696,23 @@
break;
}
}
- /// 璁剧疆绌鸿皟妯″潡鍛戒护
- /// 1绌鸿皟鍙�(1-128)
- ///2娓╁害妯″紡(鎽勬皬Celsius:0锛屽崕姘廎ahrenheit:1)
- ///3鐜娓╁害 (鎽勬皬0-40锛屽崕姘�32-99)
- ///4鍒跺喎鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
- ///5鍒剁儹鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
- ///6鑷姩鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
- ///7闄ゆ箍鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
- ///8妞掔饥鍋堝浣裤伔楂? 楂�4bit妯″紡(0 鍒跺喎锛�1鍒剁儹锛�2閫氶) 浣�4bit椋庨��(0 鑷姩锛�1楂橀?椋庯紝3浣庨)
- ///9绌鸿皟寮�鍏� (1寮�0鍏�)
- ///10璁剧疆妯″紡 0 鍒跺喎1鍒剁儹锛�2閫氶锛�3鑷姩锛�4闄ゆ箍
- ///11璁剧疆椋庨�� 0 鑷姩锛�1楂橀2涓锛�3浣庨
- ///12宸ヤ綔妯℃帶鍒舵俯鑲氭幃鎽勬皬0-30锛屽崕姘�32-86)
- ///13鎵妯″紡锛氶珮4bit(瀹為檯鎵鐘舵�侊細0涓嶆壂椋庯紝1鎵)锛屼綆4bit(璁剧疆鎵妯″紡锛�0涓嶆壂椋庯紝1鎵)
+ switch (mode)
+ {
+ case 0:
+ coolTemp = temp;
+ break;
+ case 1:
+ heatTemp = temp;
+ break;
+ case 3:
+ autoTemp = temp;
+ break;
+ case 4:
+ dehumiTemp = temp;
+ break;
+ }
ControlBytesSend(Command.SetACMode, function.bus.SubnetID, function.bus.DeviceID, new byte[] { function.bus.LoopId,
- 0,0,0,0,0,0,0,onoff,mode,fan,temp,sanfan});
+ 0,0,coolTemp,heatTemp,autoTemp,dehumiTemp,0,onoff,mode,fan,temp,sanfan});
break;
case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
diff --git a/HDL_ON/DAL/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
index dc75315..2cf06d7 100644
--- a/HDL_ON/DAL/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -344,9 +344,9 @@
break;
case Command.SetACModeACK:
case Command.ReadACModeACK:
- foreach (var function in FunctionList.List.Functions)
+ foreach (var function in FunctionList.List.GetAcList())
{
- if (function.bus == null || function.spk != SPK.AcStandard)
+ if (function.bus == null)
{
continue;
}
@@ -355,9 +355,12 @@
function.bus.DeviceID == deviceID &&
function.bus.LoopId == receiveBytes[0])
{
- Console.WriteLine(function.GetBusId());
function.SetAttrState(FunctionAttributeKey.TempType, receiveBytes[1].ToString());
function.SetAttrState(FunctionAttributeKey.RoomTemp, receiveBytes[2].ToString());
+ function.SetAttrState(FunctionAttributeKey.CoolTemperatrue, receiveBytes[3].ToString());
+ function.SetAttrState(FunctionAttributeKey.HeatTemperatrue, receiveBytes[4].ToString());
+ function.SetAttrState(FunctionAttributeKey.AutoTemperatrue, receiveBytes[5].ToString());
+ function.SetAttrState(FunctionAttributeKey.DehumiTemperatrue, receiveBytes[6].ToString());
function.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[8] == 1 ? "on" : "off");
acFunction.SetMode(receiveBytes[9], function);
acFunction.SetFan(receiveBytes[10], function);
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 429c0a7..7113136 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -404,7 +404,7 @@
try
{
var topic = e.ApplicationMessage.Topic;
- MainPage.Log($"鏀跺埌mqtt涓婚:{topic}");
+ //MainPage.Log($"鏀跺埌mqtt涓婚:{topic}");
//涓�绔彛涓婚澶勭悊
if (DB_ResidenceData.Instance.GatewayType == 0 && !DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
{
diff --git a/HDL_ON/Entity/Enumerative/Command.cs b/HDL_ON/Entity/Enumerative/Command.cs
index 4b73b4d..2efdb13 100644
--- a/HDL_ON/Entity/Enumerative/Command.cs
+++ b/HDL_ON/Entity/Enumerative/Command.cs
@@ -1634,11 +1634,11 @@
///4鍒跺喎鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
///5鍒剁儹鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
///6鑷姩鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
- ///7闄ゆ箍鎺у埗闇叉櫞鎽勬皬0-30锛屽崕姘�32-86)
+ ///7闄ゆ箍鎺у埗娓╁害(鎽勬皬0-30锛屽崕姘�32-86)
///8妯″紡椋庨�熷疄浣夸綔澹�? 楂�4bit妯″紡(0 ?榫�?椋庯紝3鑷姩锛�4闄ゆ箍) 浣�4bit椋庨��(0 鑷姩锛�1楂橀锛�2锜�?椋�)
///9绌鸿皟寮�鍏� (1寮�0鍏�)
- ///10璁剧疆妯″紡 0 鍒跺喎锛�1杩緥?椋庯紝3鑷姩锛�4闄ゆ箍
- ///11璁剧疆椋庨�� 0 鑷姩锛�1楂橀锛�2涓壕?椋�
+ ///10璁剧疆妯″紡 0 鍒跺喎锛�1鍒剁儹锛�2閫氶锛�3鑷姩锛�4闄ゆ箍
+ ///11璁剧疆椋庨�� 0 鑷姩锛�1楂橀锛�2涓,3楂橀
///12宸ヤ綔妯″紡鎺у埗娓╁害 (鎽勬皬0-30锛屽崕姘�32-86)
///13鎵妯″紡锛�?it(瀹炲櫖菤缂卞埡?鎵锛�1鎵)锛屼綆4bit(璁剧疆鎵妯″紡锛�0绨氱壕?椋�)
/// 0x193B
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 5ae0598..13b00c1 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -145,20 +145,34 @@
/// <summary>
/// 璁剧疆灞炴�х姸鎬�
/// </summary>
- /// <param name="key"></param>
- /// <param name="value"></param>
+ /// <param name="setKey"></param>
+ /// <param name="setValues"></param>
/// <returns>淇敼缁撴灉</returns>
- public bool SetAttrState(string key, object value)
+ public bool SetAttrState(string setKey, object setValues)
{
- var attr = attributes.Find((s) => s.key == key);
+ var attr = attributes.Find((s) => s.key == setKey);
if (attr == null)
{
+ switch (setKey)
+ {
+ case FunctionAttributeKey.CoolTemperatrue:
+ case FunctionAttributeKey.HeatTemperatrue:
+ case FunctionAttributeKey.AutoTemperatrue:
+ case FunctionAttributeKey.DehumiTemperatrue:
+ attributes.Add(new FunctionAttributes()
+ {
+ key = setKey,
+ state = setValues.ToString(),
+ curValue = setValues.ToString(),
+ });
+ return true;
+ }
return false;
}
else
{
- attr.state = value.ToString();
- attr.curValue = value.ToString();
+ attr.state = setValues.ToString();
+ attr.curValue = setValues.ToString();
}
return true;
}
@@ -1294,7 +1308,45 @@
/// </summary>
public static class FunctionAttributeKey
{
+ #region 绌鸿皟bus灞炴��
+ /// <summary>
+ /// 鍒跺喎妯″紡娓╁害
+ /// </summary>
+ public const string CoolTemperatrue = "CoolTemperatrue";
+ /// <summary>
+ /// 鍒剁儹妯″紡娓╁害
+ /// </summary>
+ public const string HeatTemperatrue = "HeatTemperatrue";
+ /// <summary>
+ /// 鑷姩妯″紡娓╁害
+ /// </summary>
+ public const string AutoTemperatrue = "AutoTemperatrue";
+ /// <summary>
+ /// 闄ゆ箍妯″紡娓╁害
+ /// </summary>
+ public const string DehumiTemperatrue = "DehumiTemperatrue";
+ #endregion
+
+ #region 绌鸿皟bus灞炴��
+ /// <summary>
+ /// [4]鏅�氾細璁剧疆娓╁害(鎽勬皬0-100锛屽崕姘�32-212)/鍔熺巼鍊�(0-10) (1byte)
+ /// </summary>
+ public const string NormalTemperatrue = "NormalTemperatrue";
+ /// <summary>
+ /// [5]鐧藉ぉ锛氳缃俯搴�(鎽勬皬0-100锛屽崕姘�32-212)/鍔熺巼鍊�(0-10) (1byte)
+ /// </summary>
+ public const string DayTemperatrue = "DayTemperatrue";
+ /// <summary>
+ /// [6]澶滄櫄锛氳缃俯搴�(鎽勬皬0-100锛屽崕姘�32-212)/鍔熺巼鍊�(0-10) (1byte)
+ /// </summary>
+ public const string NightTemperatrue = "NightTemperatrue";
+ /// <summary>
+ /// [7]绂诲紑锛氳缃俯搴�(鎽勬皬0-100锛屽崕姘�32-212)/鍔熺巼鍊�(0-10) (1byte)
+ /// </summary>
+ public const string AwayTemperatrue = "AwayTemperatrue";
#region 涓夌浉绌哄紑灞炴��
+
+
/// <summary>
/// A鐩稿姛鐜�
/// </summary>
@@ -1365,6 +1417,7 @@
public const string ElectricityC = "electricity_c";
#endregion
+ #endregion
public const string _null = "";
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 2c67059..42f2ad1 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -307,7 +307,6 @@
//etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
//etAccount.Text = "marketing@australindo.co.id";
//etAccount.Text = "13922115008";//鍒樻��
- //etAccount.Text = "support7@hdlautomation.com";
etAccount.Text = "13336018868";
etAccount.Text = "649362315@qq.com";//钄℃窇濞�
//etAccount.Text = "18402017839";
@@ -319,6 +318,7 @@
//etAccount.Text = "13960905167";
//etAccount.Text = "iot-en-public@hdlchina.com.cn";
etAccount.Text = "13160677992";
+ etAccount.Text = "support7@hdlautomation.com";
}
else
{
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs
index 0069a00..c58ab0c 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs
@@ -20,7 +20,6 @@
}
//if (SPK.LightSpkList().Contains(function.spk))
//{
-
// {
// var localFunction = FunctionList.List.GetLightList().Find((obj) => obj.sid == function.sid);
// {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 2dc3048..f7b65d4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -998,16 +998,10 @@
if (device.trait_on_off.curValue.ToString() == "on")
{
btnSwitch.IsSelected = true;
- //setTempBar.IsOffline = false;
- //setTempBar.Enable = true;
- //setTempBar.ProgressBarColor = CSS_Color.MainColor;
}
else
{
btnSwitch.IsBold = false;
- //setTempBar.IsOffline = true;
- //setTempBar.Enable = false;
- //setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;
}
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, device.trait_on_off.curValue.ToString());
@@ -1093,7 +1087,7 @@
setTempBar.IsClickable = false;
}
- if (device.GetAttrState(FunctionAttributeKey.Mode) == "dry" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ if ( device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
setTempBar.IsOffline = true;
setTempBar.IsClickable = false;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index c4da2d5..fb7b707 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -143,7 +143,7 @@
var contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(74),
- Height = Application.GetRealHeight(Application.DesignHeight - 74),
+ Height = Application.GetRealHeight(Application.DesignHeight)- Application.GetRealHeight(74),
};
bodyView.AddChidren(contentView);
@@ -202,6 +202,7 @@
TextColor = CSS_Color.MainBackgroundColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
electricityGenerationView.AddChidren(pvGenerate_TodayValuesButton);
@@ -304,6 +305,7 @@
TextSize = 18,
TextAlignment = TextAlignment.TopRight,
IsBold = true,
+ FontName = "BEBAS",
};
#if __IOS__
pvLoad_TodayValuesButton.Y = Application.GetRealWidth(34);
@@ -463,6 +465,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 24,
IsBold = true,
+ FontName = "BEBAS",
};
powerGenerationView.AddChidren(pvPower_ValuesButton);
@@ -492,6 +495,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
pvEleGenerationInfoView.AddChidren(pvGeneration_TodayValuesButton);
@@ -521,6 +525,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
pvEleGenerationInfoView.AddChidren(pvGeneration_MonthValuesButton);
@@ -550,6 +555,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
pvEleGenerationInfoView.AddChidren(pvGeneration_YearValuesButton);
@@ -686,6 +692,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 24,
IsBold = true,
+ FontName = "BEBAS",
};
powerUsageView.AddChidren(loadElec_ValuesButton);
@@ -714,6 +721,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
electricityUsageStatusView.AddChidren(powerUsage_TodayValuesButton);
@@ -741,6 +749,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
electricityUsageStatusView.AddChidren(loadElec_MonthValuesButton);
@@ -769,6 +778,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
IsBold = true,
+ FontName = "BEBAS",
};
electricityUsageStatusView.AddChidren(powerUsage_YearValuesButton);
@@ -953,6 +963,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 24,
IsBold = true,
+ FontName = "BEBAS",
};
esRunStatus_ChargeValuesView.AddChidren(esRunStatus_ChargeValuesButton);
@@ -987,6 +998,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 24,
IsBold = true,
+ FontName = "BEBAS",
};
esRunStatus_DischargeValuesView.AddChidren(esRunStatus_DischargeValuesButton);
@@ -1031,7 +1043,7 @@
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(142),
+ Height = Application.GetRealWidth(142),//142
ScrollEnabled = false,
};
contentView.AddChidren(socialContributionView);
@@ -1066,6 +1078,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
+ FontName = "BEBAS",
};
socialContribution_Info1_ValuesButton.Width = socialContribution_Info1_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
socialContribution_InfoView_1.AddChidren(socialContribution_Info1_ValuesButton);
@@ -1135,6 +1148,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
+ FontName = "BEBAS",
};
socialContribution_Info2_ValuesButton.Width = socialContribution_Info2_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
socialContribution_InfoView_2.AddChidren(socialContribution_Info2_ValuesButton);
@@ -1204,6 +1218,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.BottomLeft,
IsBold = true,
+ FontName = "BEBAS",
};
socialContribution_Info3_ValuesButton.Width = socialContribution_Info3_ValuesButton.GetTextWidth() + Application.GetRealWidth(8);
socialContribution_InfoView_3.AddChidren(socialContribution_Info3_ValuesButton);
diff --git a/NunitTest-Android/Resources/Resource.designer.cs b/NunitTest-Android/Resources/Resource.designer.cs
index ae568d0..21a62c4 100644
--- a/NunitTest-Android/Resources/Resource.designer.cs
+++ b/NunitTest-Android/Resources/Resource.designer.cs
@@ -15,7 +15,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
public partial class Resource
{
--
Gitblit v1.8.0