From 5f1fdf638033a87980b84689fb6f29f70cf68c6e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:15:35 +0800
Subject: [PATCH] Merge branch 'wxr6' into MergeFL

---
 HDL-ON_Android/LeChengVideoActivity.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index 71cb5b4..9020958 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -108,7 +108,7 @@
             mPlayWindow = new LCOpenSDK_PlayWindow();
             mPlayWindow.InitPlayWindow(this, flWindowContent, 0, true);
 
-            //if (Location == 1)
+            if (Location == 1)
                 URL = "openapi.easy4ip.com:443";
         }
 
@@ -267,7 +267,7 @@
                         CurtActivity.StopTalk();
                         CurtActivity.RunOnUiThread(() =>
                         {
-                            Toast.MakeText(CurtActivity, "鎵撳紑瀵硅澶辫触", ToastLength.Short).Show();
+                            Toast.MakeText(CurtActivity, Resource.String.talk_open_failed, ToastLength.Short).Show();
                         });
                     }
                     else

--
Gitblit v1.8.0