From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
index 0a03bdf..435a274 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
@@ -104,7 +104,7 @@
var btnBelongType = new NormalViewControl(700, 62, true);
btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);
btnBelongType.Gravity = Gravity.CenterHorizontal;
- btnBelongType.TextID = infoType.BeloneTextId;
+ btnBelongType.Text = infoType.BeloneText;
btnBelongType.TextSize = 15;
btnBelongType.TextAlignment = TextAlignment.Center;
listBackControl.frameTable.AddChidren(btnBelongType);
@@ -113,6 +113,7 @@
string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
string deviceName = LocalDevice.Current.GetDeviceEpointName(device);
var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+ btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
btnNote.InitControl();
//鍒掔嚎
@@ -216,7 +217,7 @@
var btnBelongType = new NormalViewControl(700, 62, true);
btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);
btnBelongType.Gravity = Gravity.CenterHorizontal;
- btnBelongType.TextID = infoType.BeloneTextId;
+ btnBelongType.Text = infoType.BeloneText;
btnBelongType.TextSize = 15;
btnBelongType.TextAlignment = TextAlignment.Center;
listBackControl.frameTable.AddChidren(btnBelongType);
@@ -314,11 +315,11 @@
/// 璁惧閲嶅懡鍚�
/// </summary>
/// <param name="i_deviceName">deviceName.</param>
- private async void DeviceReName(string i_deviceName, bool closeForm)
+ private void DeviceReName(string i_deviceName, bool closeForm)
{
//淇敼MAC鍚�
string deviceName = i_deviceName.Trim();
- var result = await LocalDevice.Current.ReName(this.device, deviceName);
+ var result = LocalDevice.Current.ReName(this.device, deviceName);
if (result == false)
{
return;
--
Gitblit v1.8.0