From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs
index 1de6417..24ad65d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs
@@ -59,9 +59,9 @@
};
divTopTitle.AddChidren(btnTitle);
- DriverLayer.Control.ins.reportIp = device.ip_address;
- DriverLayer.Control.ins.ChangeCommunicationMode(DriverLayer.CommunicationMode.tcp_local_client);
- DriverLayer.Control.ins.myTcpClient.ReceiveEvent = ReceiveEvent;
+ DriverLayer.Control.Ins.reportIp = device.ip_address;
+ //DriverLayer.Control.ins.OpenTcpClent();
+ DriverLayer.Control.Ins.myTcpClient.ReceiveEvent = ReceiveEvent;
contentView = new VerticalRefreshLayout()
{
@@ -84,8 +84,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -180,7 +180,7 @@
var sendJson = JsonConvert.SerializeObject(sendingObject);
var sendBytes = System.Text.Encoding.ASCII.GetBytes(sendJson);
- DriverLayer.Control.ins.myTcpClient.SendMessage(sendBytes);
+ DriverLayer.Control.Ins.myTcpClient.SendMessage(sendBytes);
}
/// <summary>
--
Gitblit v1.8.0