From 83d461b4f0417aa768b21bd410d68e34bdc11957 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 28 十月 2022 13:27:24 +0800
Subject: [PATCH] 俄文更新,设备离线功能隐藏

---
 HDL-ON_Android/Properties/AndroidManifest.xml        |    2 +-
 HDL-ON_iOS/Info.plist                                |    4 ++--
 HDL-ON_iOS/Resources/Language.ini                    |    2 +-
 HDL-ON_Android/Assets/Language.ini                   |    2 +-
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |    2 +-
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs |    4 ++++
 HDL_ON/UI/UI1-Login/LoginPage.cs                     |    6 +++---
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 81d7318..f8cbefa 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -2959,7 +2959,7 @@
 545=Alarm data statistics
 546=Laboratory mode
 547=Alarm function
-548=Indoor
+548=孝械泻. 褌械屑锌-褉邪
 549=Surface temperature
 550=Temperature calibration
 551=Humidity calibration
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 9b039ae..67844c0 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202210271">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202210281">
 	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
 	<!--鍙嬬洘-->
 	<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index dc75a60..ed71fc1 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.202210271</string>
+	<string>1.6.202210281</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.210271</string>
+	<string>1.6.210281</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Use geographic location to provide services such as weather</string>
 	<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 81d7318..f8cbefa 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -2959,7 +2959,7 @@
 545=Alarm data statistics
 546=Laboratory mode
 547=Alarm function
-548=Indoor
+548=孝械泻. 褌械屑锌-褉邪
 549=Surface temperature
 550=Temperature calibration
 551=Humidity calibration
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 47320de..22ff68e 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -218,7 +218,7 @@
                     etAccount.Text = "18244942707";
                     etAccount.Text = "tf@smarttech.com.ua";
                     etAccount.Text = "13288623489";
-                    etAccount.Text = "13535293836";
+                    etAccount.Text = "455740454@qq.com";
                 }
                 else
                 {
@@ -252,9 +252,9 @@
                 }
                 b = !b;
                 etPassword.Text = "123456";
-                if(etAccount.Text == "13535293836")
+                if(etAccount.Text == "455740454@qq.com")
                 {
-                    etPassword.Text = "shan1987";
+                    etPassword.Text = "a123456";
                 }
                 //etPassword.Text = "Hdl85521566";
                 btnLogin.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 68485bc..ac508a3 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1346,7 +1346,7 @@
                     {
                         lz = "en";
                     }
-                    string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}&language={lz}";
+                    string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}";
                     Inverter.Ins.ShowWebviewFormUrl(url);
 
                     Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 3887a17..3c86be0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -257,6 +257,10 @@
                 {
                     btnExit.Text = "閫�鍑�";
                 }
+                //else if (Language.CurrentLanguage == "russian")
+                //{
+                //    btnExit.Text = "胁褘褏芯写";
+                //}
                 else
                 {
                     btnExit.Text = "Exit";

--
Gitblit v1.8.0