23
wei
2020-12-24 237e3ec4ee42724d43767d46f9a5320b8130e783
23
6个文件已修改
82 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePage.cs 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/RoomPage.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,24 +1,27 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-000929D421E8802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/UserPage.cs">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI0-Public/PublicAssmebly.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="146" Column="57" />
      <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="117" Column="14" />
      <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="11" Column="1" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="62" Column="33" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="98" Column="45" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs" Line="15" Column="1" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="278" Column="57" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" Line="53" Column="12" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs" Line="13" Column="56" />
      <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="595" Column="17" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="Mqtt" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="1-HomePage" expanded="True" />
                  <Node name="2-Classification" expanded="True" />
                  <Node name="UserPage.cs" selected="True" />
                <Node name="UI0-Public" expanded="True">
                  <Node name="PublicAssmebly.cs" selected="True" />
                </Node>
              </Node>
            </Node>
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -52,6 +52,7 @@
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchLink>SdkOnly</MtouchLink>
        <CodesignProvision>ComHdlOnProDevelopment20201224-3</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -119,6 +119,7 @@
                {
                    this.EndHeaderRefreshing();
                    Common.ApiUtlis.Ins.DownloadData();
                    LoadContentView();
                };
                #region topView
@@ -314,9 +315,12 @@
                #endregion
                #region 功能场景切换
                bodyView.AddChidren(new Button() { Height = Application.GetRealHeight(20), BackgroundColor = 0x00000000 });
                changeView = new FrameLayout()
                {
                    Y = Application.GetRealHeight(20) + topView.Bottom,
                    //Y = Application.GetRealHeight(20) + topView.Bottom,
                    Gravity = Gravity.CenterHorizontal,
                    Width = Application.GetRealWidth(230),
                    Height = Application.GetRealHeight(62),
@@ -363,14 +367,29 @@
                #region ContextView
                contentView = new PageLayout()
                {
                    Y = changeView.Bottom,
                    //Y = changeView.Bottom,
                    Height = Application.GetRealHeight(310 + 30 + 10), //20为超出部分
                    IsShowPoint = false,
                };
                bodyView.AddChidren(contentView);
                functionViews = new List<FrameLayout>();
                LoadContentView();
                #endregion
            }
            catch (Exception ex)
            {
                MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
            }
        }
        /// <summary>
        /// 加载内容区域
        /// </summary>
        void LoadContentView()
        {
                if (!Common.ApiUtlis.Ins.DownloadDataComplete)
                {
                    var waitPage = new Loading();
@@ -379,13 +398,19 @@
                    new System.Threading.Thread(() =>
                    {
                    try
                    {
                        while (!Common.ApiUtlis.Ins.DownloadDataComplete)
                        {
                            System.Threading.Thread.Sleep(400);
                        }
                        Application.RunOnMainThread(() =>
                        {
                            if (contentView == null)
                            {
                                return;
                            }
                            contentView.RemoveAll();
                            deviceFunctionView = new VerticalScrolViewLayout();
                            contentView.AddChidren(deviceFunctionView);
                            LoadDeviceFunctionControlZone();
@@ -403,6 +428,11 @@
                            waitPage.Hide();
                        });
                    }
                    catch (Exception ex) {
                        MainPage.Log($"刷新主页异常:{ex.Message}");
                    }
                    finally { }
                    })
                    { IsBackground = true }.Start();
                }
@@ -424,12 +454,6 @@
                    GetUnreadPushMessages();
                    RegisterGetPushMessageAction();
                }
                #endregion
            }
            catch (Exception ex)
            {
                MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
            }
        }
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -43,9 +43,9 @@
                            continue;
                        }
                        var viewTag = scrolView.GetChildren(i).Tag.ToString();
                        if (viewTag == updataFunction.sid)
                        if (scrolView.GetChildren(i).Tag != null && viewTag == updataFunction.spk + updataFunction.sid)
                        {
                            if (scrolView.GetChildren(i).Tag != null && scrolView.GetChildren(i).Tag.ToString() == updataFunction.sid)
                            //if ( && scrolView.GetChildren(i).Tag.ToString() == updataFunction.sid)
                            {
                                var fcView = scrolView.GetChildren(i) as FrameLayout;
                                for (int j = 0; j < fcView.ChildrenCount; j++)
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -132,7 +132,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
@@ -148,7 +148,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -95,7 +95,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
@@ -111,7 +111,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);