Merge branch 'WJC' into temp-wxr

wxr

2021-03-24 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c

Merge branch 'WJC' into temp-wxr

 HDL-ON_Android/Application.cs

@@ -28,7 +28,7 @@
            application.StartActivity(intent);
            Android.OS.Process.KillProcess(Android.OS.Process.MyPid());
        }
        

        public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
        public override void OnCreate()
        {
@@ -46,6 +46,8 @@
            initAll();

        }



        /// <summary>
        /// 所有初始化全部在这个方法实现
@@ -135,6 +137,7 @@
            {
                checkSomeInfo();


            };
            BaseActivity.OnDestroyAction += (activity) =>
            {
@@ -174,9 +177,10 @@
        /// <param name="activity"></param>
        void GetJPushRegistrationID(BaseActivity activity)
        {
          

            try
            {

                //保存获取的极光服务器上的注册ID到本地文件
                var tokenID = JPushInterface.GetRegistrationID(activity);
                Console.WriteLine("RegistrationID:  " + tokenID);
@@ -366,7 +370,7 @@
            //进入后台mqtt正在连接重置状态
            HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
           

        }

        /// <summary>

 HDL-ON_Android/Assets/Language.ini

@@ -1387,10 +1387,14 @@
6071=修改名字
6072=确认删除
6073=取消
6074=遥控器不能超过10个？
6074=遥控器不能超过10个
6075=遥控器所属区域:
6076=编辑信息
6077=版本升级
6078=系统维护中~请稍后再试~
6079=获取数据失败




6015=在线

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -98,7 +98,6 @@
        public override void OnRegister(Context context, string p1)
        {
            base.OnRegister(context, p1);

            Utlis.WriteLine("JPushOnRegister: " + p1);
        }

@@ -112,8 +111,6 @@
        //{
        //    try
        //    {
               

        //        if (JPushMessageInfo.Extras.Contains("Offline") == true)
        //        {
        //            Shared.Application.RunOnMainThread(() =>
@@ -141,7 +138,7 @@
        //}

        /// <summary>
        /// 打开消息显示界面
        /// 打开消息显示界面.010000
        /// </summary>
        /// <param name="context"></param>
        /// <param name="notificationMessage"></param>

 HDL-ON_iOS/Resources/Language.ini

@@ -1387,10 +1387,12 @@
6071=修改名字
6072=确认删除
6073=取消
6074=遥控器不能超过10个？
6074=遥控器不能超过10个
6075=遥控器所属区域:
6076=编辑信息
6077=版本升级
6078=系统维护中~请稍后再试~
6079=获取数据失败

6015=在线
6016=离线

 HDL_ON/Common/R.cs

@@ -868,6 +868,8 @@
        public const int yaokongqiquyu = 6075;
        public const int bianjixinxi = 6076;
        public const int banbenshengji = 6077;
        public const int xitongweihuzhong = 6078;
        public const int huoqushujushibao = 6079;




 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs

@@ -12,6 +12,7 @@
        }
        public void Show(Control control)
        {
           
            #region 界面布局
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
            PirDevice.View.TopView topView = new View.TopView();
@@ -122,10 +123,7 @@
                }
                //new引导界面
                View.ReplicationView replication = new View.ReplicationView();
               // MainPage.BasePageView.AddChidren(replication);
                replication.Show(this);
               // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


                //添加数据对象
                Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
@@ -191,5 +189,7 @@
            };

        }

      
    }
}

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs

@@ -8,6 +8,7 @@
{
    public class Method
    {
       
        /// <summary>
        /// 红外宝程序主入口
        /// </summary>
@@ -15,7 +16,6 @@
        /// <param name="function"></param>
        public void MainView(FrameLayout frame, Entity.Function function,Action action)
        {

            Pir pirDevice = new Pir();
            if (function != null)
            {//数据转换
@@ -23,6 +23,7 @@
                pirDevice.deviceId = function.deviceId;
                pirDevice.sid = function.sid;
                pirDevice.online = function.online;
                pirDevice.versions = function.versions;
            }
            Pir.currPir = pirDevice;
            GetControlList(frame, () =>
@@ -501,7 +502,7 @@
            }
            else if (text == "读取红外宝列表失败")
            {
                str = "读取红外宝列表失败"; //Language.StringByID(StringId.delFail);
                str = Language.StringByID(StringId.huoqushujushibao);
            }
            else
            {
@@ -519,19 +520,19 @@
                            break;
                        case "10807":
                            {
                                str = "红外宝下遥控器超过最大(10个)数量限制";// Language.StringByID(StringId.gatewayNotOnline);
                                str = Language.StringByID(StringId.bunengchaoguo10);


                            }
                            break;
                        case "2":
                            {
                                str = "系统维护中~请稍后再试~";
                                str = Language.StringByID(StringId.xitongweihuzhong);
                            }
                            break;
                        default:
                            {
                                str ="获取数据失败" ;// Language.StringByID(StringId.saveFail);
                                str = Language.StringByID(StringId.huoqushujushibao);
                            }
                            break;


 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs

@@ -32,9 +32,8 @@
            this.AddChidren(topView.FLayoutView());
            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
            {
                BackAction();
                BackAction = null;
                this.RemoveFromParent();
               
                RemoveFromParent();
            };

            FrameLayout middFLayout = new FrameLayout();
@@ -519,7 +518,15 @@
                }
            }, id, "品牌列表");
        }

        /// <summary>
        /// 移除界面
        /// </summary>
        public override void RemoveFromParent()
        {
            BackAction();
            BackAction = null;
            base.RemoveFromParent();
        }

    }


 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs

@@ -150,7 +150,7 @@
        /// 红外码学习
        /// </summary>
        /// <returns></returns>
        public static void CodeStudy(string deviceId,AttributesStatus buttonObj,Action<ResponsePackNew> action)
        public static void CodeStudy(string deviceId, AttributesStatus buttonObj,Action<ResponsePackNew> action)
        {
            var job = new JObject { };
            job.Add("key", buttonObj.key);

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs

@@ -12,16 +12,17 @@
        {
            Tag = "PirMain";
        }

        Action backAction;
        public void Show(Action action)
        {
            backAction = action;
            #region 界面布局
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
            Intelligence.Automation.LogicView.TopView topView = new Intelligence.Automation.LogicView.TopView();
            this.AddChidren(topView.FLayoutView());
            topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
            {
                action();
                //action();
                RemoveFromParent();
            };
            topView.topNameBtn.TextID = StringId.setlogic;
@@ -46,10 +47,16 @@
            banbenshengjiFL.btnText.Text = Language.StringByID(StringId.banbenshengji);
            banbenshengjiFL.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
            viewLayout.AddChidren(banbenshengjiFL.FLayoutView());

            var versions = Pir.currPir.versions.Find((c)=>c.module== "fw_version");
            if (versions == null)
            {
                versions = new Entity.VersionInfo();
            }
            ///版本号:v1.3.5
            FrameLayout50 banbenhaoFLayout = new FrameLayout50();
            banbenhaoFLayout.btnNextIcon.Visible = false;
            banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":v1.3.5";
            banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
            banbenhaoFLayout.frameLayout.Y = banbenshengjiFL.frameLayout.Bottom;
            viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
            //删除
@@ -129,6 +136,13 @@
            #endregion

        }

        /// <summary>
        /// 移除界面
        /// </summary>
        public override void RemoveFromParent()
        {
            backAction();
            base.RemoveFromParent();
        }
    }
}

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs

@@ -13,7 +13,7 @@
        /// <param name="buttonList">数据列表</param>
        /// <param name="action">回调</param>
        /// <param name="line">表示多少行</param>
        /// <param name="line">表示一行加载多少个按钮</param>
        /// <param name="sum">表示一行加载多少个按钮</param>
        public void AddButton(FrameLayout buttonFLayout, List<string> buttonList, Action<string> action, int line = 7, int sum = 3)
        {
            VerticalScrolViewLayout vv = new VerticalScrolViewLayout();

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs

@@ -47,28 +47,12 @@
            IsBold = true,
        };


        /// <summary>
        /// 版本号
        /// </summary>
        public Button versionBtn = new Button
        {
            Y = Application.GetRealHeight(40),
            X = Application.GetRealWidth(72),
            Width = Application.GetRealWidth(120),
            Height = Application.GetRealHeight(17),
            Text = "版本号v1.3.5",
            TextAlignment = TextAlignment.CenterLeft,
            TextSize = TextSize.text12,
            TextColor = CSS.CSS_Color.textCancelColor,
        };

        /// <summary>
        /// 当前个数
        /// </summary>
        public Button geBtn = new Button
        {
            Y = Application.GetRealHeight(59),
            Y = Application.GetRealHeight(40),
            X = Application.GetRealWidth(72),
            Width = Application.GetRealWidth(120),
            Height = Application.GetRealHeight(17),
@@ -83,7 +67,7 @@
        /// </summary>
        public Button sumBtn = new Button
        {
            Y = Application.GetRealHeight(59),
            Y = Application.GetRealHeight(40),
            Width = Application.GetRealWidth(50),
            Height = Application.GetRealHeight(17),
            Text = "/10",
@@ -159,7 +143,6 @@
            devfLayout.Height = Application.GetRealHeight(92 + (50 * i));
            devfLayout.AddChidren(priequipmentBtn);
            devfLayout.AddChidren(deviceNameBtn);
            devfLayout.AddChidren(versionBtn);
            devfLayout.AddChidren(geBtn);
            geBtn.Width = geBtn.GetTextWidth();
            devfLayout.AddChidren(sumBtn);