From 42fad29b1e280b512452f5552d1e9ce98474252e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 09:40:14 +0800
Subject: [PATCH] 2021-05-17 1.在阿廖分支基础上增加iOS乐橙可视对讲功能，目前呼叫还有一点问题，偶尔会闪退，目前还没定位到原因
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
old mode 100755
new mode 100644
index cb68d38..1dfd44f
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -65,13 +65,12 @@
public Button mergeBtn = new Button
{
TextID=StringId.merge,
- X = Application.GetRealWidth(214 + 33),
+ X = Language.CurrentLanguage == "Chinese" ? Application.GetRealWidth(214 + 33): Application.GetRealWidth(214 + 28),
Y = Application.GetRealHeight(18 + 4),
- Width = Application.GetRealWidth(24+3+5),
+ Width = Language.CurrentLanguage == "Chinese" ? Application.GetRealWidth(24+3+5) : Application.GetRealWidth(24 + 3 + 15),
Height = Application.GetRealHeight(17),
TextColor = MusicColor.TextColor,
- TextSize=TextSize.Text12,
-
+ TextSize= Language.CurrentLanguage == "Chinese" ? TextSize.Text12 :CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
};
/// <summary>
///鏀惰棌鍥炬爣
--
Gitblit v1.8.0