离线数据，字体大小

wxr

2024-04-22 7a5dc2a6d15d14f70b64310c597a05cfe97208bd

离线数据，字体大小

 .vs/Santan-OnPro-Project/xs/UserPrefs.xml

@@ -1,4 +1,5 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MultiItemStartupConfigurations />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" relfile="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" line="831" column="1" />
@@ -7,44 +8,39 @@
      <Breakpoint file="/Users/kaede/Desktop/Projcect/Santan-OnPro-Project/HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" relfile="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" line="25" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MonoDevelop.Ide.ItemProperties.APP__Android PreferredExecutionTarget="Android.SelectDevice" Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MultiItemStartupConfigurations />
  <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.2.0" />
  <MonoDevelop.Ide.ItemProperties.APP__IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.EABE9DD8-354E-498A-AD42-8176E3FB2E15" Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs">
  <MonoDevelop.Ide.ItemProperties.APP__IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" Xamarin.HotReload.MonoInterpreterErrorInfoBar.APP__IOS.HideInfoBar="True" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/DB_ResidenceData.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="505" Column="1" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="839" Column="75" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="568" Column="87" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1252" Column="32" />
      <File FileName="HDL-ON_Android/SplashActivity.cs" Line="280" Column="42" />
      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1121" Column="48" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="224" Column="58" />
      <File FileName="HDL_ON/Common/R.cs" Line="243" Column="39" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" Line="62" Column="9" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
      <File FileName="HDL-ON_Android/SplashActivity.cs" />
      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
      <File FileName="HDL_ON/Common/R.cs" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/SeriesFunctionListPage.cs" Line="12" Column="40" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="879" Column="42" />
      <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="183" Column="15" />
      <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="70" Column="75" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="Santan-OnPro-Project" expanded="True">
          <Node name="Santan-OnPro-Project">
            <Node name="APP_Android" selected="True" />
            <Node name="HDL_ON">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True" />
                <Node name="Mqtt" expanded="True" />
              <Node name="Entity" expanded="True">
                <Node name="Enumerative" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="UI0-Stan" expanded="True">
                  <Node name="Logic" expanded="True" />
                </Node>
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2">
                  <Node name="2-Classification" expanded="True">
                    <Node name="SeriesFunctionListPage.cs" selected="True" />
                  </Node>
                <Node name="UI2" expanded="True">
                  <Node name="1-HomePage" expanded="True" />
                  <Node name="2-Classification" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="AddDevice" expanded="True">
                      <Node name="MiniRemoteControl" expanded="True" />
@@ -54,20 +50,11 @@
                </Node>
              </Node>
            </Node>
            <Node name="SiriIntents">
              <Node name="Server" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State>
          <Value>result</Value>
          <Value>mPushMesList</Value>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.APP__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.APP__Android.HideInfoBar="True" PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
</Properties>

 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="4.1" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401311">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1.0" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202404221">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="31" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--程序可以读取设备外部存储空间(内置SDcard和外置SDCard)的文件，我的文件等-->

 HDL_ON/Common/ApiUtlis.cs

@@ -6,6 +6,7 @@
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.Video;
using HDL_ON.UI.UI2.Intelligence.Automation;
using MyJar;
using Newtonsoft.Json;
using Shared;

@@ -77,7 +78,7 @@
        /// </summary>
        public void DownloadData()
        {
            if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
            if (MainPage.NoLoginMode)
            {
                DownloadDataComplete = true;
                return;
@@ -97,6 +98,57 @@

            var downloadDataThread = new System.Threading.Thread(() =>
            {
                try
                {//增加3秒云服务器连接检测，连不上服务器的时候不刷新数据
                        var dataList = new List<GlobalRegionListRes>();
                        var requestJson = HttpUtil.GetSignRequestJson(new GetRegionListObj() { regionMark = HttpUtil.RegionMark });
                    var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GlobalRegionList, requestJson, HttpUtil.GlobalRequestHttpsHost, "", 3);

                    if (revertObj == null || revertObj.Code != StateCode.SUCCESS)
                    {
                        DownloadDataComplete = true;
                        try
                        {
                            var spatialInfoDataBytes = FileUtlis.Files.ReadFile("SpatialInfoData");
                            if (spatialInfoDataBytes != null)
                            {
                                var spatialInfoDataString = System.Text.Encoding.UTF8.GetString(spatialInfoDataBytes);
                                if (spatialInfoDataString != null && !string.IsNullOrEmpty(spatialInfoDataString))
                                {
                                    var spatialInfoDataList = JsonConvert.DeserializeObject<List<SpatialInfo>>(spatialInfoDataString);
                                    SpatialInfo.CurrentSpatial.UpdateSpatialList(spatialInfoDataList);
                                }
                            }
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"{this.GetType()}:加载缓存房间数据异常:{ex.Message}");
                        }

                        try
                        {
                            var fileList = Common.FileUtlis.Files.ReadFiles();
                            foreach (var file in fileList)
                            {
                                FunctionList.List.IniFunctionList(file, true);
                            }
                            Room.CurrentSpatial.InitRoomListFunctions();
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"{this.GetType()}:加载缓存设备数据异常:{ex.Message}");
                        }

                        return;
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"Error：下载数据1：{ex.Message}");
                    DownloadDataComplete = true;
                    return;
                }

                MainPage.Log($"进入读取云端数据线程");
                //===================刷新Token=======================
                code = Ins.HttpRequest.RefreshToken();

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -370,7 +370,8 @@
                Text = room.floorName + room.roomName,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                IsBold = true,
            };
            roomView.AddChidren(btnFloorAndRoomName);