| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Application.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Other/JPush/JPushReceiver.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,40 +1,49 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs"> <Files> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="12" Column="60" IsPinned="True" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="135" Column="75" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/EditControl.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="132" Column="58" IsPinned="True" /> <File FileName="../../Application.cs" Line="16" Column="35" IsPinned="True" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="16" Column="13" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="237" Column="71" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/SetPir.cs" Line="3" Column="55" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="20" Column="23" /> <File FileName="HDL-ON_Android/Application.cs" Line="393" Column="33" /> <File FileName="../../Application.cs" Line="257" Column="45" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="183" Column="48" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="97" Column="10" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" Line="24" Column="12" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="527" Column="23" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="449" Column="22" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1339" Column="31" /> <File FileName="HDL-ON_Android/Application.cs" Line="365" Column="29" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="253" Column="72" /> <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="356" Column="53" /> <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="27" Column="22" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs" Line="17" Column="21" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="113" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="19" Column="1" /> <File FileName="HDL-ON_Android/Scan.cs" Line="14" Column="59" /> </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 name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="AddDevice" expanded="True" /> <Node name="AddFunction" expanded="True" /> <Node name="PirDevice" expanded="True"> <Node name="AddControl.cs" selected="True" /> <Node name="View" expanded="True" /> </Node> <Node name="MyQRCodePage.cs" selected="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Resources" expanded="True" /> <Node name="Other" expanded="True"> <Node name="JPush" expanded="True" /> </Node> </Node> </Node> </State> 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/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/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,17 +123,14 @@ } //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(); buttonObj.key = "key" + control.status.Count.ToString(); buttonObj.value = texts; PirSend.CodeStudy(control, buttonObj, (responsePackNew) => PirSend.CodeStudy(control.deviceId, buttonObj, (responsePackNew) => { if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "") { @@ -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, () => 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(); } }
@@ -150,7 +150,7 @@ /// 红外码学习 /// </summary> /// <returns></returns> public static void CodeStudy(Control control,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); @@ -160,7 +160,7 @@ job.Add("value", valuejArray); var jArray = new JArray { }; jArray.Add(job); var jObject = new JObject { { "homeId", HomeId }, { "deviceId", control.deviceId }, { "attributes", jArray } }; var jObject = new JObject { { "homeId", HomeId }, { "deviceId", deviceId }, { "attributes", jArray } }; ResponsePackNew responsePackNew = null; new System.Threading.Thread(() => { 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);
