2023年09月07日18:06:35

mac

2023-09-07 a5e01931bd780ba648fe02bf9bcb0d478d5ac892

2023年09月07日18:06:35

修复海信bug,搞好ios环境；

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -55,7 +55,7 @@
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <MtouchDebug>true</MtouchDebug>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchLink>SdkOnly</MtouchLink>
        <MtouchLink>None</MtouchLink>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -70,11 +70,12 @@
        <WarningLevel>4</WarningLevel>
        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <MtouchLink>SdkOnly</MtouchLink>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
    </PropertyGroup>
    <ItemGroup>
        <Reference Include="System" />

 HDL_ON/Entity/FunctionList.cs

@@ -228,7 +228,7 @@
        /// </summary>
        public List<Function> GetElectricals()
        {
            var spkList = SPK.ElectricalSpkList();
        var spkList = SPK.ElectricalSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
    

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

@@ -717,9 +717,9 @@

                        functionCount = FunctionList.List.GetElectricals().Count;
                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.spk!=SPK.ElectricalTvHisense&&obj.trait_on_off.curValue.ToString() == "on").Count;
#if DEBUG
                        functionCount = 1;
#endif
//#if DEBUG
//                        functionCount = 1;
//#endif
                        #endregion
                        break;
                    case ShowFunction.EnergyMonitoring:
@@ -834,8 +834,10 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    IsMoreLines = true,
                };
                functionView.AddChidren(btnName); 
                functionView.AddChidren(btnName);

                //不需要显示设备开状态数量;
                Button btnFunctionCount=null;
                if (item != ShowFunction.Aks
                    && item != ShowFunction.VideoDoorLock
                    && item != ShowFunction.Environmental
@@ -849,7 +851,7 @@
                    && item != ShowFunction.Acst && item != ShowFunction.IpCam
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
                    btnFunctionCount = new Button()
                    {
                        X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
                        Y = btnName.Bottom,
@@ -1249,10 +1251,16 @@
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {
                        
                        var skipView = new FunctionPage();
                        MainPage.BasePageView.AddChidren(skipView);
                        skipView.LoadPage(functionPageTitleId);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        skipView.DelAction += () =>
                        {
                            functionContentView?.RemoveFromParent();
                            this.RefreshFunctionView();
                        };
                    };
                }
                index++;
@@ -1783,6 +1791,18 @@
        {

        }
#endregion
        #endregion

        /// <summary>
        /// 更新底部界面
        /// </summary>
        void UpdateBottomView()
        {
            Application.RunOnMainThread(() =>
            {
                functionContentView?.RemoveFromParent();
                this.RefreshFunctionView();
            });
        }
    }
}

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

@@ -30,6 +30,7 @@
        List<Function> functionList;
        int titleId;

        public Action DelAction;
        public FunctionPage()
        {
            bodyView = this;
@@ -185,7 +186,9 @@
            }
            else if (titleId == StringId.Electric)
            {
               
                functionList.AddRange(FunctionList.List.GetElectricals());

            }
            else if (titleId == StringId.EnvironmentalScience)
            {
@@ -320,6 +323,7 @@
                                    functionListView.RemoveAll();
                                    showList.Remove(function);//先移除
                                    ShowFunctionRow(showList,isAppend);
                                    this.DelAction?.Invoke();

                                };
                                var functionDiv = new FunctionControlZone(function, deviceDelAction) 

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs

@@ -14,7 +14,7 @@
        {
            this.Width = Application.GetRealWidth(width);
            this.Height = Application.GetRealWidth(height);
            this.Radius = (uint)Application.GetRealHeight(cornerValue);
            this.Radius = (uint)Application.GetRealWidth(cornerValue);
            this.BackgroundColor = MusicColor.ViewColor;
            this.Gravity = Gravity.CenterHorizontal;
        }
@@ -97,7 +97,7 @@
            Gravity=Gravity.Center,
            Width = Application.GetRealWidth(76),
            Height = Application.GetRealWidth(76),
            Radius = (uint)Application.GetRealHeight(38),
            Radius = (uint)Application.GetRealWidth(38),
            BackgroundColor = MusicColor.WhiteColor,


@@ -107,7 +107,7 @@
            Gravity = Gravity.Center,
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            Radius = (uint)Application.GetRealHeight(14),
            Radius = (uint)Application.GetRealWidth(14),
            BackgroundColor = 0xff1B2D4D,
            SelectedBackgroundColor = MusicColor.SelectedColor,
            Name = "确定"

 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs

@@ -431,7 +431,7 @@
            yinliangFL.Y = Application.GetRealHeight(260);
            yinliangFL.X = shouyeFL.X;
            yinliangFL.BackgroundColor = 0xffF2F3F7;
            yinliangFL.Radius = (uint)Application.GetRealHeight(34);
            yinliangFL.Radius = (uint)Application.GetRealWidth(34);

            btn_jia = new Button
            {
@@ -723,8 +723,10 @@
            this.IsMoreLines = true;
            this.BackgroundColor = 0xffECEDEE;
            this.SelectedBackgroundColor = 0xFFF2F3F7;
            this.Radius = (uint)Application.GetRealHeight(30);
            this.Radius = (uint)Application.GetRealHeight(19);
            this.Padding = new Padding(0,0,0,0);
        }


        /// <summary>
        /// 事件监听方法
@@ -781,6 +783,7 @@
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextSize = TextSize.Text16,
            TextID = StringId.kongzhi,
            Padding = new Padding(0, 0, 0, 0),
            IsBold = true,
        };

@@ -814,7 +817,8 @@
            TextColor = MusicColor.TextColor,
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextSize = TextSize.Text16,
            Text = "信号源",
            TextID =StringId.xinhaoyuan,
            Padding=new Padding(0,0,0,0),
            IsBold = true,
        };


 SiriIntents/SiriIntents.csproj

@@ -37,7 +37,7 @@
    <DefineConstants></DefineConstants>

    <ErrorReport>prompt</ErrorReport>

    <WarningLevel>4</WarningLevel>

    <CodesignKey>iPhone Distribution</CodesignKey>

    <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>

    <MtouchUseLlvm>true</MtouchUseLlvm>

    <MtouchFloat32>true</MtouchFloat32>

    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

@@ -45,6 +45,7 @@
    <MtouchArch>ARM64</MtouchArch>

    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <CodesignProvision>OnProSiri230729-1-Dev</CodesignProvision>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">

    <DebugType>pdbonly</DebugType>


 SiriIntentsUI/SiriIntentsUI.csproj

@@ -38,7 +38,7 @@
    <DefineConstants></DefineConstants>

    <ErrorReport>prompt</ErrorReport>

    <WarningLevel>4</WarningLevel>

    <CodesignKey>iPhone Distribution</CodesignKey>

    <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>

    <MtouchUseLlvm>true</MtouchUseLlvm>

    <MtouchFloat32>true</MtouchFloat32>

    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

@@ -47,6 +47,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

    <CodesignProvision>OnProSiriUI230729-1-Dev</CodesignProvision>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">

    <DebugType>pdbonly</DebugType>