From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs | 71 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
index 5b1441d..20d377d 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
@@ -60,7 +60,7 @@
helpBtn.MouseUpEventHandler += (sernder, e) =>
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new TextDialog("缁戝畾鏅鸿兘闊崇鍒扮涓夋柟 APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
+ var dialogForm = new TextDialog("缁戝畾鏅鸿兘闊崇鍒扮涓夋柟 APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴PP");
dialogForm.SetTitleText("甯姪");
//鎸変笅纭鎸夐挳
@@ -68,6 +68,7 @@
{
//鐢婚潰鍏抽棴
dialogForm.CloseDialog();
+ OpenXiaoDuAPP();
};
};
}
@@ -122,8 +123,8 @@
this.CloseProgressBar();
});
});
- }
-
+ }
+
/// <summary>
/// 鑾峰彇闊崇鍒楄〃
/// </summary>
@@ -186,6 +187,14 @@
row.ImagePath = "SmartSound/Xiaodu.png";
row.Remark = remark;
+ }else if (smartSound.PlatfromName == "AISpeech")
+ {
+ string remark = "鎬濆繀椹�";
+ if (smartSound.Remark != null && smartSound.Remark.Trim() != "")
+ remark += "(" + smartSound.Remark + ")";
+
+ row.ImagePath = "SmartSound/Xiaodu.png";
+ row.Remark = remark;
}
row.InitControl();
@@ -227,18 +236,48 @@
}
}
+ private void OpenXiaoDuAPP()
+ {
+ bool bol = false;
+ try
+ {
+#if Android
+ bol = HDLUtils.OpenAppWithPackageName("com.baidu.duer.superapp");
+#else
+ bol=HDLUtils.OpenApp("xiaoduapp://");
+#endif
+
+ if (!bol)
+ {
+#if Android
+ HDLUtils.OpenUrl("market://details?id=com.baidu.duer.superapp");
+#else
+ HDLUtils.OpenUrl("https://apps.apple.com/cn/app/%E5%B0%8F%E5%BA%A6/id1437733193");
+#endif
+ }
+ }
+ catch (Exception e)
+ {
+ string error = e.Message;
+ bol = false;
+ }
+ }
+
/// <summary>
/// 瑙ｉ櫎缁戝畾寮圭獥
/// </summary>
private void ShowDelectDialog(SmartSoundInfo.SoundInfo smartSound)
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new TextDialog("瑙ｉ櫎缁戝畾闇�瑕佸埌绗笁鏂� APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
+ var dialogForm = new TextDialog("瑙ｉ櫎缁戝畾闇�瑕佸埌绗笁鏂� APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴PP");
dialogForm.SetTitleText("瑙ｉ櫎缁戝畾");
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += () =>
- {
+ {
+ OpenXiaoDuAPP();
+
+ /*
HdlThreadLogic.Current.RunThread(() =>
{
this.ShowProgressBar("鍒犻櫎鏈嶅姟鍣ㄨ褰�...");
@@ -253,27 +292,10 @@
{
//鐢婚潰鍏抽棴
dialogForm.CloseDialog();
- bool bol = false;
- try
- {
-#if Android
- bol = HDLUtils.OpenAppWithPackageName("com.baidu.duer.superapp");
-#else
- HDLUtils.OpenApp("xiaoduapp://");
-#endif
- }
- catch (Exception e)
- {
- string error = e.Message;
- bol = false;
- }
- if (!bol)
- {
- this.ShowMassage(ShowMsgType.Tip, "鎵撳紑APP澶辫触");
- }
+ OpenXiaoDuAPP();
iniView();
});
- });
+ });*/
};
}
/// <summary>
@@ -293,7 +315,6 @@
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += (async (textValue) =>
{
-
//鐢婚潰鍏抽棴
dialogForm.CloseDialog();
--
Gitblit v1.8.0