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/SmartSpeaker/SmartSpeakerListPage.cs | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
index c704948..4b29afa 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
@@ -35,7 +35,6 @@
/// 鎬濆繀椹�=AISpeech
-
/// <summary>
///
/// </summary>
@@ -46,7 +45,7 @@
}
/// <summary>
- ///
+ /// 鍔犺浇瑙嗗浘
/// </summary>
public void LoadPage()
{
@@ -61,8 +60,6 @@
};
bodyView.AddChidren(bodyScrolView);
-
- //AddEmptyTipView();
LoadSmartSpeakertListView(bodyScrolView);
}
@@ -385,7 +382,7 @@
/// <param name="btnName"></param>
void RenameAlexaRemark(string newName, SpeakerInfo speakerInfo, Button btnName)
{
-
+ //鏄剧ずloading鍔ㄧ敾鏁堟灉
var waitPage = new Loading();
bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -445,10 +442,21 @@
/// <param name="platformName"></param>
/// <returns></returns>
string GetSpeakerTypeString(string platformName){
+ //1.platformName鍒ょ┖
+ if (string.IsNullOrEmpty(platformName))
+ {
+ return "";
+ }
+ //2.鍏堣祴浜戠杩斿洖鐨勯粯璁ゅ��
var name = platformName;
if (platformName == SpeakerType.DuerOS.ToString())
{
- name = "灏忓害";
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ name = "灏忓害";
+ }
+ //2.1褰撳墠璇█涓嶆槸涓枃鐨勮瘽锛岀洿鎺ョ瓑浜庝簯绔繑鍥炵殑platformName闊崇绫诲瀷
+
}
else if (platformName == SpeakerType.Google.ToString()){
name = "Google Home";
@@ -463,11 +471,19 @@
}
else if (platformName == SpeakerType.Aligenie.ToString())
{
- name = "澶╃尗绮剧伒";
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ name = "澶╃尗绮剧伒";
+ }
+ //2.1褰撳墠璇█涓嶆槸涓枃鐨勮瘽锛岀洿鎺ョ瓑浜庝簯绔繑鍥炵殑platformName闊崇绫诲瀷
}
else if (platformName == SpeakerType.AISpeech.ToString())
{
- name = "鎬濆繀椹�";
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ name = "鎬濆繀椹�";
+ }
+ //2.1褰撳墠璇█涓嶆槸涓枃鐨勮瘽锛岀洿鎺ョ瓑浜庝簯绔繑鍥炵殑platformName 鑻辨枃闊崇绫诲瀷
}
return name;
@@ -542,9 +558,8 @@
}
-
/// <summary>
- ///
+ /// 璺宠浆椤甸潰
/// </summary>
void GotoPage(SpeakerInfo speakerInfo)
{
--
Gitblit v1.8.0