空调界面完善

wxr

2023-01-10 bff7d177c77523195575cca5ca550da4ae5270bd

空调界面完善

 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.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202212271">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202301091">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -113,6 +113,9 @@
        <Reference Include="HDL.Shared.IOS.ScanQRCode">
          <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS">
          <HintPath>..\DLL\Shared.IOS.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Newtonsoft.Json">
@@ -1602,10 +1605,6 @@
      <ProjectReference Include="..\SiriKit\SiriKit.csproj">
        <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
        <Name>SiriKit</Name>
      </ProjectReference>
      <ProjectReference Include="..\..\..\Downloads\Library\Shared.IOS\Shared.IOS.csproj">
        <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
        <Name>Shared.IOS</Name>
      </ProjectReference>
    </ItemGroup>
    <ItemGroup>

 HDL-ON_iOS/Info.plist

@@ -100,9 +100,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.6.202211251</string>
    <string>1.6.302301091</string>
    <key>CFBundleVersion</key>
    <string>1.6.211251</string>
    <string>1.6.301091</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>

 HDL_ON/Entity/FunctionList.cs

@@ -76,9 +76,12 @@
                _IpCamImou = Functions.FindAll((obj) => obj.spk == SPK.IpCam_Imou);
                if (_IpCamImou.Count > 0)
                {
#if __IOS__
#else
                    Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                    Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                    Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
#endif
                }
            }
            return _IpCamImou;
@@ -182,7 +185,7 @@
            //}
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
        }
        #region 家电列表 electricals
#region 家电列表 electricals
        /// <summary>
        /// 家电列表
        /// </summary>
@@ -200,7 +203,7 @@
        {
            return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
        }
        #endregion
#endregion

        /// <summary>
        /// 音乐列表
@@ -630,7 +633,7 @@
            { IsBackground = true }.Start();
        }

        #region 场景相关
#region 场景相关
        /// <summary>
        /// 添加场景
        /// </summary>
@@ -662,9 +665,9 @@
            }
            return revPack.Code;
        }
        #endregion
#endregion

        #region 收藏功能
#region 收藏功能
     
        /// <summary>
        /// 收藏场景
@@ -690,14 +693,14 @@
            return result;
        }

        #endregion 
#endregion


        #region 
#region 
       


        #endregion
#endregion
    }

}

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -233,6 +233,8 @@
                        doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IpCam_Imou:
#if __IOS__
#else
                        FunctionList.List.GetIpCamImouList();
                        if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
                        {
@@ -254,9 +256,7 @@
                                                new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
                                            });
                                        }
#if __ANDROID__
                                    Application.RunOnMainThread(() =>
                                        {
                                        Application.RunOnMainThread(() =>{
                                            try
                                            {
                                                Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
@@ -267,8 +267,7 @@

                                            }
                                        });
#endif
                                }
                                    }
                                    else
                                    {
                                        Application.RunOnMainThread(() =>
@@ -306,6 +305,7 @@

                            }
                        }
#endif
                        break;
                }
            };

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -186,7 +186,7 @@
                    //X = Application.GetRealWidth(16),
                    Y = btnResidenceName.Bottom,
                    Height = Application.GetRealWidth(14),
                    BackgroundColor = CSS_Color.LinkTipFail,
                    //BackgroundColor = CSS_Color.LinkTipFail,
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs

@@ -308,8 +308,12 @@
                        TextColor = CSS.CSS_Color.TextualColor,
                        TextSize = CSS.CSS_FontSize.TextFontSize,
                    };
                    if(Language.CurrentLanguage != "Chinese")
                    {
                        btnPre.Text = "Previous";
                    }
                    bottomOptionView.AddChidren(btnPre);
                    btnPre.MouseUpEventHandler = (sender, e) => {
                    btnPre.MouseUpEventHandler = (sender33, e33) => {
                        if (pageIndex < 1)
                        {
                            return;
@@ -330,8 +334,13 @@
                        TextColor = CSS.CSS_Color.TextualColor,
                        TextSize = CSS.CSS_FontSize.TextFontSize,
                    };
                    if(Language.CurrentLanguage != "Chinese")
                    {
                        btnNext.Text = "Next";
                    }

                    bottomOptionView.AddChidren(btnNext);
                    btnNext.MouseUpEventHandler = (sender, e) => {
                    btnNext.MouseUpEventHandler = (sender33, e33) => {
                        pageIndex++;
                        if (pageIndex > pageCount-1)
                        {
@@ -343,9 +352,9 @@
                    #endregion


                    searchTv.TextChangeEventHandler = (sender, e) => {
                    searchTv.TextChangeEventHandler = (sender33, e33) => {
                        new System.Threading.Thread(() => {
                            newlist = UserInfo.Current.regionList.FindAll((obj) => obj.homeName.Contains(e));
                            newlist = UserInfo.Current.regionList.FindAll((obj) => obj.homeName.Contains(e33));
                            pageCount = newlist.Count;
                            pageIndex = 0;
                            Application.RunOnMainThread(() => {

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs

@@ -970,12 +970,16 @@
                if (device.trait_on_off.curValue.ToString() == "on")
                {
                    btnSwitch.IsSelected = true;
                    setTempBar.IsOffline = false;
                    //setTempBar.IsOffline = false;
                    setTempBar.Enable = true;
                    setTempBar.ProgressBarColor = CSS_Color.MainColor;
                }
                else
                {
                    btnSwitch.IsBold = false;
                    setTempBar.IsOffline = true;
                    //setTempBar.IsOffline = true;
                    setTempBar.Enable = false;
                    setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;
                }
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, device.trait_on_off.curValue.ToString());
@@ -1031,7 +1035,9 @@
                    if (device.trait_on_off.curValue.ToString() == "on")
                    {
                        btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = true;
                        setTempBar.IsOffline = false;
                        setTempBar.Enable = true;
                        setTempBar.ProgressBarColor = CSS_Color.MainColor;

                        btnSwitch.IsSelected = true;
                        if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
                        {
@@ -1045,7 +1051,9 @@
                    else
                    {
                        btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = false;
                        setTempBar.IsOffline = true;
                        setTempBar.Enable = false;
                        setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;

                        btnSwitch.IsSelected = false;
                        setTempBar.IsClickable = false;
                    }