From 10a8665dd780036fdbba24659b8aff19f509735c Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 09 十月 2024 13:55:28 +0800
Subject: [PATCH] 自动化
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 12 ++++++------
HDL_ON/UI/MainPage.cs | 2 +-
HDL_ON/UI/UI1-Login/LoginPage.cs | 14 ++++++++++----
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index f1fe39c..00041ac 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="2.7.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202409303">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202410091">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 80c010f..560fc60 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.7.0";
+ public static string VersionString = "2.7.1";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 8a3e320..653ae3e 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -314,9 +314,11 @@
//etAccount.Text = "13414984501";//鍚存檽鑱�
etAccount.Text = "13682244600";
etAccount.Text = "pjh@hdlchina.com.cn";
- etAccount.Text = "13580507523";
- etAccount.Text = "18475593023";
+ etAccount.Text = "13580507523";//Test
+ etAccount.Text = "18475593023";//Online
//etAccount.Text = "13960905167";
+ //etAccount.Text = "iot-en-public@hdlchina.com.cn";
+ etAccount.Text = "13912920288";
}
else
{
@@ -331,7 +333,7 @@
//etAccount.Text = "support5@hdlchina.com.cn";
//etAccount.Text = "551775569@qq.com";//wcf
etAccount.Text = "15626203746";
-
+
}
//etAccount.Text = "13580507523";
b = !b;
@@ -364,6 +366,10 @@
{
etPassword.Text = "a123456";
}
+ else if (etAccount.Text == "iot-en-public@hdlchina.com.cn") {
+ etPassword.Text = "a123456";
+ }
+
btnLogin.IsSelected = true;
};
#endif
@@ -530,8 +536,8 @@
PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
SecureTextEntry = true,
TextAlignment = TextAlignment.CenterLeft,
-
};
+ //etPassword.Text = "tt040526";
passwordView.AddChidren(etPassword);
#region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index a7845f1..9147b14 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -250,12 +250,12 @@
new LogicView.TipPopView().TipBox(StringId.tip, StringId.unlikeTime);
return;
}
- if (int.Parse(btnStartTimeText.Tag.ToString()) > int.Parse(btnEndTimeText.Tag.ToString()))
- {
- //鎻愮ず锛氬紑濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
- new LogicView.TipPopView().TipBox(StringId.tip, StringId.startTimeLessThanEndTime);
- return;
- }
+ //if (int.Parse(btnStartTimeText.Tag.ToString()) > int.Parse(btnEndTimeText.Tag.ToString()))
+ //{
+ // //鎻愮ず锛氬紑濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+ // new LogicView.TipPopView().TipBox(StringId.tip, StringId.startTimeLessThanEndTime);
+ // return;
+ //}
Input inputTime = new Input();
inputTime.sid = LogicMethod.Current.NewSid();
--
Gitblit v1.8.0