parent: 20eaebc3 | 补丁 | 提交 | ignore whitespace
wxr
2022-01-23 d9ec9be857367028edaeffb6092b141664a81c45 
房间设备刷新
8个文件已修改
64 ■■■■■ 已修改文件
HDL-ON_Android/SplashActivity.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/Function/Function.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/RoomPage.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddQingpingSensorEnvirTipPage.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 HDL-ON_Android/SplashActivity.cs


@@ -28,10 +28,6 @@


                {


                    if (!OnAppConfig.Instance.FirstRunApp)


                    {


                        //初始化友盟sdk


                        Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");


                        //初始化友盟sdk config


                        Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");


                        ////打开baseActivity


                        Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);


                        StartActivityForResult(i, 1);


@@ -65,10 +61,6 @@


            }


            else


            {


                //初始化友盟sdk


                Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");


                //初始化友盟sdk config


                Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android","");


                ////打开baseActivity


                Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);


                StartActivityForResult(i, 1);


@@ -99,6 +91,10 @@




            };




            //初始化友盟sdk


            Com.Hdl.Umsdk.UmSdk.InitUmSdk(this, "61d565d9e0f9bb492bbc3d5a", "Android");


            //初始化友盟sdk config


            Com.Hdl.Umsdk.UmSdk.InitUMConfigure(this, "61d565d9e0f9bb492bbc3d5a", "Android", "");




        }






 HDL_ON/Entity/Function/Function.cs


@@ -556,6 +556,13 @@


                SaveFunctionFile();


                if (pack.Code == StateCode.SUCCESS)


                {


                    if (UI.RoomPage.bodyView != null)


                    {


                        Application.RunOnMainThread(() =>


                        {


                            UI.RoomPage.bodyView.ReLoadPage();


                        });


                    }


                }


                else


                {




 HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs


@@ -1,4 +1,6 @@


using System;


using Shared;




namespace HDL_ON.Entity


{


    /// <summary>


@@ -42,6 +44,22 @@


        /// 产品名称


        /// </summary>


        public string productName;


        public string productNameEn;




        public string ProductShowName


        {


            get


            {


                if(Language.CurrentLanguage == "Chinese")


                {


                    return productName;


                }


                else


                {


                    return productNameEn;


                }


            }


        }




        /// <summary>


        /// 产品厂商




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


@@ -12,7 +12,7 @@


        /// <summary>


        /// 当前窗体


        /// </summary>


        static FrameLayout bodyView;


        public static RoomPage bodyView;


        /// <summary>


        /// 功能列表集合显示区域


        /// </summary>


@@ -56,10 +56,13 @@


        /// <summary>


        /// 重载界面


        /// </summary>


        void ReLoadPage()


        public void ReLoadPage()


        {


            bodyView.RemoveAll();


            LoadPage();


            if (bodyView != null)


            {


                bodyView.RemoveAll();


                LoadPage();


            }


        }




        public void LoadPage()




 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddQingpingSensorEnvirTipPage.cs


@@ -29,11 +29,11 @@


            if (Language.CurrentLanguage == "Chinese")


            {


                //设置头部信息


                base.SetTitleText(Language.StringByID(StringId.Add) + device.productName);


                base.SetTitleText(Language.StringByID(StringId.Add) + device.ProductShowName);


            }


            else


            {


                base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.productName);


                base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.ProductShowName);


            }


            //这个界面的背景需要白色


            bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;




 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs


@@ -32,11 +32,11 @@


            if (Language.CurrentLanguage == "Chinese")


            {


                //设置头部信息


                base.SetTitleText(Language.StringByID(StringId.Add) + device.productName);


                base.SetTitleText(Language.StringByID(StringId.Add) + device.ProductShowName);


            }


            else


            {


                base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.productName);


                base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.ProductShowName);


            }


            //这个界面的背景需要白色


            bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;


@@ -160,7 +160,7 @@


                        try


                        {


                            var pm = new HttpServerRequest();


                            var pack = pm.IndependentRegister3TyDevcie(integratedDevice.spk, snCode,integratedDevice.productName,pairString);// Language.StringByID(StringId.SensorEnvironment)


                            var pack = pm.IndependentRegister3TyDevcie(integratedDevice.spk, snCode,integratedDevice.ProductShowName, pairString);// Language.StringByID(StringId.SensorEnvironment)


                            if (pack.Code == StateCode.SUCCESS)


                            {


                                //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());




 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs


@@ -31,11 +31,11 @@


            if (Language.CurrentLanguage == "Chinese")


            {


                //设置头部信息


                base.SetTitleText(Language.StringByID(StringId.Add) + device.productName);


                base.SetTitleText(Language.StringByID(StringId.Add) + device.ProductShowName);


            }


            else


            {


                base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.productName);


                base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.ProductShowName);


            }


            //这个界面的背景需要白色


            bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;




 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs


@@ -139,7 +139,7 @@


                    TextAlignment = TextAlignment.CenterLeft,


                    TextColor = CSS_Color.FirstLevelTitleColor,


                    TextSize = CSS_FontSize.TextFontSize,


                    Text = device.productName,


                    Text = device.ProductShowName,


                };


                row.AddChidren(btnName);