From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
index 435a274..38fdbec 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
@@ -49,7 +49,7 @@
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.FunctionSetting));
//涓讳汉鍜岀鐞嗗憳鎵嶈兘鏇存敼
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
{
//鍒濆鍖栦腑閮ㄦ帶浠�(涓讳汉,绠＄悊鍛�)
this.InitMiddleFrameByAdmin();
@@ -100,7 +100,7 @@
};
//璁惧鎵�灞炵被鍨�
- var infoType = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
+ var infoType = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
var btnBelongType = new NormalViewControl(700, 62, true);
btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);
btnBelongType.Gravity = Gravity.CenterHorizontal;
@@ -111,7 +111,7 @@
//鍔熻兘鍚嶇О
string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
- string deviceName = LocalDevice.Current.GetDeviceEpointName(device);
+ string deviceName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
@@ -120,7 +120,7 @@
btnNote.AddBottomLine();
btnNote.txtInput.FinishInputEvent += () =>
{
- string oldName = LocalDevice.Current.GetDeviceEpointName(device);
+ string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
if (btnNote.Text == string.Empty)
{
btnNote.Text = oldName;
@@ -151,7 +151,7 @@
//鎵�灞炴ā鍧�
caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
- deviceName = Common.LocalDevice.Current.GetDeviceMacName(device);
+ deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(device);
var rowBelongModul = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
listview.AddChidren(rowBelongModul);
rowBelongModul.InitControl();
@@ -171,7 +171,7 @@
bodyFrameLayout.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += (sender, e) =>
{
- string oldName = LocalDevice.Current.GetDeviceEpointName(device);
+ string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
if (btnNote.Text.Trim() == string.Empty)
{
btnNote.Text = oldName;
@@ -213,7 +213,7 @@
btnPic.InitControl(device.DeviceAddr, device.DeviceEpoint);
//璁惧鎵�灞炵被鍨�
- var infoType = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
+ var infoType = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
var btnBelongType = new NormalViewControl(700, 62, true);
btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);
btnBelongType.Gravity = Gravity.CenterHorizontal;
@@ -224,7 +224,7 @@
//鍔熻兘鍚嶇О
string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
- string nameValue = LocalDevice.Current.GetDeviceEpointName(device);
+ string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
var btnNote = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
btnNote.UseClickStatu = false;
listview.AddChidren(btnNote);
@@ -248,7 +248,7 @@
//鎵�灞炴ā鍧�
caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
- nameValue = Common.LocalDevice.Current.GetDeviceMacName(device);
+ nameValue = HdlDeviceCommonLogic.Current.GetDeviceMacName(device);
var rowBelongModul = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
rowBelongModul.UseClickStatu = false;
listview.AddChidren(rowBelongModul);
@@ -319,7 +319,7 @@
{
//淇敼MAC鍚�
string deviceName = i_deviceName.Trim();
- var result = LocalDevice.Current.ReName(this.device, deviceName);
+ var result = HdlDeviceCommonLogic.Current.ReName(this.device, deviceName);
if (result == false)
{
return;
--
Gitblit v1.8.0