自动化

wxr

2024-10-09 10a8665dd780036fdbba24659b8aff19f509735c

自动化

修改自动化时间服务条件，允许开始时间大于结束时间（跨夜）

 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和外置SDCard)的文件，我的文件等-->

 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>

 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 密码登录-控件加载

 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();