wxr
2022-09-27 47769b2c2554d2b0f37237c1658044bd3a5bb6f7
光伏更新
38个文件已删除
10个文件已修改
185 ■■■■■ 已修改文件
HDL-ON_Android/Assets/h5/static/js/chunk-vendors.62a46973.js 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.07f79ca2.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.12e3fcbf.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.16008a1b.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.331ce8ab.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.4a0472a0.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.96c7223a.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.9882f04f.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/index.be443243.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.0feb267f.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.3041b8b8.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.40c28fbd.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.66eb9118.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.931f9b30.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.963cb1b0.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.9f0b60c5.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index.b5a49bc4.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index~pages-inverter-index.651aaa25.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-index-index~pages-inverter-index.cac3b1d6.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-inverter-index.3b3b0fdd.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/pages-inverter-index.46fb47af.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/chunk-vendors.62a46973.js 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/index.07f79ca2.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/index.331ce8ab.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/index.4a0472a0.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/index.96c7223a.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/index.9882f04f.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/index.be443243.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.0feb267f.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.40c28fbd.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.931f9b30.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.963cb1b0.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.9f0b60c5.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.b5a49bc4.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index~pages-inverter-index.651aaa25.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-index-index~pages-inverter-index.cac3b1d6.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-inverter-index.3b3b0fdd.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/h5/static/js/pages-inverter-index.46fb47af.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/DriverLayer/Control.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/Function/InverterInfo.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePage.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/h5/static/js/chunk-vendors.62a46973.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.07f79ca2.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.12e3fcbf.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.16008a1b.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.331ce8ab.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.4a0472a0.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.96c7223a.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.9882f04f.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/index.be443243.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.0feb267f.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.3041b8b8.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.40c28fbd.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.66eb9118.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.931f9b30.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.963cb1b0.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.9f0b60c5.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index.b5a49bc4.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index~pages-inverter-index.651aaa25.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-index-index~pages-inverter-index.cac3b1d6.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-inverter-index.3b3b0fdd.js
File was deleted
HDL-ON_Android/Assets/h5/static/js/pages-inverter-index.46fb47af.js
File was deleted
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.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202209261">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202209271">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    public partial class Resource
    {
        
HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.6.102209261</string>
    <string>1.6.102209271</string>
    <key>CFBundleVersion</key>
    <string>1.6.109261</string>
    <string>1.6.109271</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>
HDL-ON_iOS/Resources/h5/static/js/chunk-vendors.62a46973.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/index.07f79ca2.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/index.331ce8ab.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/index.4a0472a0.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/index.96c7223a.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/index.9882f04f.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/index.be443243.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.0feb267f.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.40c28fbd.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.931f9b30.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.963cb1b0.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.9f0b60c5.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index.b5a49bc4.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index~pages-inverter-index.651aaa25.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-index-index~pages-inverter-index.cac3b1d6.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-inverter-index.3b3b0fdd.js
File was deleted
HDL-ON_iOS/Resources/h5/static/js/pages-inverter-index.46fb47af.js
File was deleted
HDL_ON/DAL/DriverLayer/Control.cs
@@ -1488,7 +1488,9 @@
                                //wjc
                                break;
                            case SPK.Inverter:
                                MainPage.Log("逆变器数据更新");
                                var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };
                                //var dd = Newtonsoft.Json.JsonConvert.SerializeObject(status);
                                Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                                break;
                        }
HDL_ON/Entity/Function/InverterInfo.cs
@@ -58,6 +58,11 @@
            _h5Page.LoadFileUrl(showPageUrl);
        }
        /// <summary>
        /// h5界面的页面索引
        /// </summary>
        public string PageIndex = "1";
    }
    /// <summary>
HDL_ON/UI/MainPage.cs
@@ -262,6 +262,7 @@
            BaseView.AddChidren(BtnBackIcon);
            backView.MouseMoveEventHandler = (sender, e) =>
            {
                if (BasePageView.ChildrenCount <= 1)
                {
                    return;
@@ -291,6 +292,26 @@
            };
            backView.MouseUpEventHandler = (sender, e) =>
            {
                if (Inverter.Ins.H5Page.Parent != null)
                {
                    if (Inverter.Ins.PageIndex != "1")
                    {
                        Inverter.Ins.PageIndex = "1";
                        var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        MainPage.Log($"up{e.X}");
                        StartX = 0;
                        BtnBackIcon.X = -Application.GetRealWidth(100);
                        return;
                    }
                    else
                    {
                        Inverter.Ins.PageIndex = "1";
                    }
                }
                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -305,6 +326,25 @@
            };
            backView.MouseUpOutsideEventHandler = (sender, e) =>
            {
                if (Inverter.Ins.H5Page.Parent != null)
                {
                    if (Inverter.Ins.PageIndex != "1")
                    {
                        Inverter.Ins.PageIndex = "1";
                        var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        MainPage.Log($"up{e.X}");
                        StartX = 0;
                        BtnBackIcon.X = -Application.GetRealWidth(100);
                        return;
                    }
                    else
                    {
                        Inverter.Ins.PageIndex = "1";
                    }
                }
                MainPage.Log($"up{e.X}");
                StartX = 0;
                BtnBackIcon.X = -Application.GetRealWidth(100);
HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -251,7 +251,7 @@
                    //etAccount.Text = "s.savinov@hdlautomation.ru";
                }
                b = !b;
                etPassword.Text = "qunhui105113";
                etPassword.Text = "123456";
                if(etAccount.Text == "13418062953")
                {
                    etPassword.Text = "a123456";
HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1296,14 +1296,17 @@
            view.AddChidren(btnAcstPower);
            btnAcstPower.MouseUpEventHandler = (sender, e) => {
                btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
                string onoff = btnAcstPower.IsSelected ? "on" : "off";
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, onoff);
                foreach(var temp in FunctionList.List.GetAcstParentList())
                new System.Threading.Thread(() =>
                {
                    Control.Ins.SendWriteCommand(temp, d);
                }
                    string onoff = btnAcstPower.IsSelected ? "on" : "off";
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, onoff);
                    foreach (var temp in FunctionList.List.GetAcstParentList())
                    {
                        Control.Ins.SendWriteCommand(temp, d);
                    }
                })
                { IsBackground = true }.Start();
            };
           
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
@@ -831,7 +831,7 @@
                new System.Threading.Thread(() => {
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add("onoff", btnPowerControl.IsSelected ? "on" : "off");
                    d.Add(FunctionAttributeKey.OnOff, btnPowerControl.IsSelected ? "on" : "off");
                    Control.Ins.SendWriteCommand(function, d);
                })
                { IsBackground = true }.Start();
@@ -1116,7 +1116,7 @@
                X = btnSubTempIcon.Right,
                Y = Application.GetRealHeight(45 + 11),
                Height = Application.GetRealHeight(14),
                Width = Application.GetRealWidth(22),
                Width = Application.GetRealWidth(35),
                TextColor = 0xFF1b3035,
                TextSize = 10,
                Text = sub.GetAttrState(AcstSub_AttrEnum.room_temp.ToString()) + "°C",
@@ -1139,7 +1139,7 @@
                X = btnSubHumidityIcon.Right,
                Y = Application.GetRealHeight(45 + 11),
                Height = Application.GetRealHeight(14),
                Width = Application.GetRealWidth(22),
                Width = Application.GetRealWidth(35),
                TextColor = 0xFF1b3053,
                TextSize = 10,
                Text = sub.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString()) + "%",
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
@@ -34,16 +34,19 @@
                bodyView.btnTempValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_temp.ToString());
                bodyView.btnHumiValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString());
                bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
                bodyView.tempBar.Progress = Convert.ToInt32(temp.GetAttrState(FunctionAttributeKey.SetTemp)) + 16;
                int progress = 0;
                int.TryParse(temp.GetAttrState(FunctionAttributeKey.SetTemp), out progress);
                bodyView.tempBar.Progress = progress + 16;
                if(temp.trait_on_off.curValue.ToString() == "on")
                {
                    bodyView.btnPowerControl.IsSelected = true;
                    bodyView.tempBar.IsOffline = false;
                    bodyView.tempBar.Enable = false;
                }
                else
                {
                    bodyView.btnPowerControl.IsSelected = false;
                    bodyView.tempBar.IsOffline = true;
                    bodyView.tempBar.Enable = true;
                }
            });
@@ -223,6 +226,10 @@
            };
            contentView.AddChidren(btnMinValuesText);
            int progress = 0;
            int.TryParse(function.GetAttrState(FunctionAttributeKey.SetTemp),out progress);
            tempBar = new DiyImageSeekBar()
            {
                Gravity = Gravity.CenterHorizontal,
@@ -234,7 +241,7 @@
                ThumbImageHeight = Application.GetRealHeight(51),
                ProgressBarColor = function.trait_on_off.curValue.ToString() == "on" ? curColor : CSS_Color.DividingLineColor,
                MaxValue = 14,
                Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp)) + 16,
                Progress = progress + 16,
                SeekBarPadding = Application.GetRealWidth(20),
                IsProgressTextShow = false,
                ProgressChangeDelayTime = 0,
@@ -288,7 +295,7 @@
                new System.Threading.Thread(() => {
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add("onoff", btnPowerControl.IsSelected ? "on" : "off");
                    d.Add(FunctionAttributeKey.OnOff, btnPowerControl.IsSelected ? "on" : "off");
                    Control.Ins.SendWriteCommand(function, d);
                })
                { IsBackground = true }.Start();