派生自 ~xm/HomeApp
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,20 +2,14 @@ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" /> <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Account/AccountLogin.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs"> <Files> <File FileName="Shared/R.cs" Line="809" Column="16" /> <File FileName="GateWay.Droid/Assets/Language.ini" /> <File FileName="Shared/Phone/Device/Category/Category.cs" /> <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" /> <File FileName="Shared/R.cs" Line="881" Column="38" /> <File FileName="GateWay.Droid/Assets/Language.ini" Line="691" Column="34" /> <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1918" Column="50" /> <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" Line="486" Column="78" /> <File FileName="Shared/Common/Device.cs" /> <File FileName="Shared/Phone/UserView/UserHomeView.cs" /> <File FileName="Shared/Phone/Device/AC/ACControl.cs" /> <File FileName="Shared/Phone/Device/CommonForm/LeftIconButtonRow.cs" /> <File FileName="Shared/Phone/Device/Category/SelectFloor.cs" /> <File FileName="Shared/Phone/UserView/SafetyShortcutControl.cs" /> <File FileName="Shared/Phone/Device/Category/SelectHouse.cs" /> <File FileName="Shared/Phone/Device/Account/AccountLogin.cs" Line="803" Column="14" /> <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -31,11 +25,13 @@ <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="AC" expanded="True" /> <Node name="Account" expanded="True"> <Node name="AccountLogin.cs" selected="True" /> <Node name="Account" expanded="True" /> <Node name="Category" expanded="True"> <Node name="Category.cs" selected="True" /> </Node> <Node name="Category" expanded="True" /> <Node name="CommonForm" expanded="True" /> <Node name="Curtain" expanded="True" /> <Node name="Room" expanded="True" /> </Node> <Node name="UserView" expanded="True" /> <Node name="ZigBee" expanded="True" /> @@ -50,9 +46,7 @@ <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs" relfile="Shared/Phone/Device/Account/AccountLogin.cs" line="798" column="1" /> </BreakpointStore> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -688,7 +688,7 @@ 11001=场景 11002=自动化 11010=没有功能 {\r\n} 请在个人中心中--设备管理处添加 11010=没有功能 {\r\n} 请在个人中心--设备管理处添加 11011=编辑 11012=设置功能 11013=信息编辑 ZigbeeApp/Shared/DLL/Android/Shared.Droid.dllBinary files differ
ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
@@ -318,7 +318,7 @@ { curRoom = rooms[index1][index2]; zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(floorIds[index1])} , {rooms[index1][index2].Name}"); }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor), }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongZone), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel)); } @@ -338,7 +338,7 @@ { curRoom = rs[index1]; zoneRow.SetTitle(rs[index1].Name); }, 0,Language.StringByID(R.MyInternationalizationString.BelongFloor), }, 0,Language.StringByID(R.MyInternationalizationString.BelongZone), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel)); } ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceIconSelectedIMGByLocal.cs
@@ -113,7 +113,10 @@ bodyFrameLayout.AddChidren(confirmBtn); confirmBtn.MouseUpEventHandler += (sender, e) => { if (tempIcon.ImageBtn != null) { action(tempIcon.ImageBtn.UnSelectedImagePath, tempIcon.ImageBtn.SelectedImagePath); } RemoveFromParent(); }; } ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutDeleteButton.cs
@@ -18,6 +18,7 @@ TextID = R.MyInternationalizationString.Delete; TextColor = ZigbeeColor.Current.GXCTextWhiteColor; TextAlignment = TextAlignment.Center; TextSize = 14; //Radius = CommonPage.BigFormRadius; } } ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs
@@ -18,6 +18,7 @@ TextID = R.MyInternationalizationString.Edit; TextColor = ZigbeeColor.Current.GXCTextWhiteColor; TextAlignment = TextAlignment.Center; TextSize = 14; //Radius = CommonPage.BigFormRadius; } } ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -64,6 +64,7 @@ Tag= scene }; AddChidren(sceneRowLayout); sceneRowLayout.SubViewWidth = Application.GetRealWidth(199); sceneImg = new ImageView() { @@ -74,7 +75,6 @@ Radius = (uint)Application.GetRealHeight(17) }; sceneRowLayout.AddChidren(sceneImg); //sceneImg.SetViewShadow(true); var leftFL = new FrameLayout { @@ -164,8 +164,10 @@ var delayBtn = new RowLayoutDeleteButton { TextID = R.MyInternationalizationString.Delay, Tag = scene.SceneDelayTime Tag = scene.SceneDelayTime, BackgroundColor=ZigbeeColor.Current.GXCTextSelectedColor, }; delayBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight); sceneRowLayout.AddLeftView(delayBtn); //编辑 var settingBtn = new Device.CommonForm.RowLayoutEditButton() @@ -173,12 +175,13 @@ TextID = R.MyInternationalizationString.Editor, Tag = scene.SceneDelayTime }; settingBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerTopLeft); //删除 var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton { Tag = scene }; deleteBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight); if (room.IsSharedRoom) {
@@ -4,7 +4,7 @@ namespace Shared.Phone.Device.CommonForm { public class SelectZone : FrameLayout public class SelectZone { public Action<Common.Room> ZoneAction; @@ -49,7 +49,7 @@ { curRoom = rooms[index1][index2]; ZoneAction?.Invoke(curRoom); RemoveFromParent(); //RemoveFromParent(); }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel)); @@ -70,8 +70,8 @@ { curRoom = rs[index1]; ZoneAction?.Invoke(curRoom); RemoveFromParent(); }, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor), //RemoveFromParent(); }, 0, Language.StringByID(R.MyInternationalizationString.AddTo), Language.StringByID(R.MyInternationalizationString.Confrim), Language.StringByID(R.MyInternationalizationString.Cancel)); } @@ -99,7 +99,7 @@ /// <param name="mouseEventArgs"></param> private void Close(object sender, MouseEventArgs mouseEventArgs) { RemoveFromParent(); //RemoveFromParent(); } /// <summary> @@ -109,8 +109,8 @@ /// <param name="mouseEventArgs"></param> private void Confrim_MouseEvent(object sender, MouseEventArgs mouseEventArgs) { ZoneAction?.Invoke(curRoom); RemoveFromParent(); //ZoneAction?.Invoke(curRoom); //RemoveFromParent(); } } } ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -88,6 +88,10 @@ /// ProgressBtnY /// </summary> int ProgressBtnY; /// <summary> /// ProgressBtnX /// </summary> int ProgressBtnX; #endregion @@ -383,7 +387,8 @@ Gravity = Gravity.CenterHorizontal, Text = device.CommonDevice.DeviceEpointName, TextColor = ZigbeeColor.Current.GXCTextBlackColor, TextSize = 15 TextSize = 15, IsBold=true }; itemView.AddChidren(deviceNameBtn); @@ -394,7 +399,8 @@ Height = Application.GetRealHeight(60), Gravity = Gravity.CenterHorizontal, TextColor = ZigbeeColor.Current.GXCTextGrayColor, Text = $"{Language.StringByID(R.MyInternationalizationString.Current)} {device.GetDeviceStatu()}" Text = $"{Language.StringByID(R.MyInternationalizationString.Current)} {device.GetDeviceStatu()}", TextSize = 10 }; itemView.AddChidren(StatuBtn); @@ -494,7 +500,8 @@ Height = Application.GetRealHeight(50), Text = room.Name, TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.GXCTextWhiteColor TextColor = ZigbeeColor.Current.GXCTextWhiteColor, TextSize = 12 }; itemView.AddChidren(roomName); } @@ -741,6 +748,7 @@ curtainSeekBar.Width = Application.GetRealWidth(570); curtainSeekBar.Height = Application.GetRealHeight(513); curtainSeekBar.Gravity = Gravity.CenterHorizontal; curtainSeekBar.IsProgressTextShow = false; curtainSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage; layout.AddChidren(curtainSeekBar); @@ -748,6 +756,29 @@ { (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainSeekBar.Progress); }; curtainSeekBar.OnStartTrackingTouchEvent += (sender, e) => { OnProgressButtonMoveForCurtain(curtainSeekBar.Progress); ProgressBtn.Visible = true; }; curtainSeekBar.OnStopTrackingTouchEvent += (sender, e) => { ProgressBtn.Visible = false; }; curtainSeekBar.OnProgressChangedEvent += (send2, e2) => { OnProgressButtonMoveForCurtain(e2); //判断是否300ms屏蔽 //if (curtainRollSeekBar.IsProgressChangeDelay()) return; //(device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress); }; InitProgressBtnForCurtain(layout); } } @@ -764,7 +795,10 @@ Height = Application.GetMinReal(104), UnSelectedImagePath = "Item/ProgressBubbles.png", Visible = false, Gravity = Gravity.CenterHorizontal Gravity = Gravity.CenterHorizontal, TextSize=14, IsBold=true, TextColor=ZigbeeColor.Current.GXCTextWhiteColor }; layout.AddChidren(ProgressBtn); } @@ -778,6 +812,37 @@ ProgressBtn.Text = mProgress + "%"; } /// <summary> /// 添加进度按钮 /// </summary> private void InitProgressBtnForCurtain(FrameLayout layout) { ProgressBtnX = curtainSeekBar.X - Application.GetMinReal(20); ProgressBtn = new Button() { X = ProgressBtnX, Y = curtainSeekBar.Y + curtainSeekBar.Height / 2 - Application.GetMinReal(180), Width = Application.GetMinReal(135), Height = Application.GetMinReal(104), UnSelectedImagePath = "Item/ProgressBubbles.png", Visible = false, TextSize = 14, IsBold = true, TextColor = ZigbeeColor.Current.GXCTextWhiteColor }; layout.AddChidren(ProgressBtn); } /// <summary> /// OnProgressButtonMove /// </summary> private void OnProgressButtonMoveForCurtain(int mProgress) { ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5); ProgressBtn.Text = mProgress + "%"; } #endregion #region ◆ 收藏到主页_______________________ ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -150,6 +150,10 @@ var roomScrolView = new VerticalScrolViewLayout { }; bodyFrameLayout.AddChidren(roomScrolView); var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId); if (roomList == null) { return; } for (int i = 0; i < roomList.Count+1; i++) { int xx = 43 + i % 2 * (20 + 487); ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -468,7 +468,7 @@ add.MouseUpEventHandler += (sender, e) => { var selectZone = new SelectZone(); AddChidren(selectZone); //AddChidren(selectZone); selectZone.Init(); selectZone.ZoneAction = (r) => { @@ -699,7 +699,7 @@ add.MouseUpEventHandler += (sender, e) => { var selectZone = new SelectZone(); CommonPage.Instance.AddChidren(selectZone); //CommonPage.Instance.AddChidren(selectZone); selectZone.Init(); selectZone.ZoneAction = (r) => { ZigbeeApp/Shared/R.cs
@@ -876,7 +876,7 @@ /// <summary> /// 没有功能 请在个人中心中--设备管理处添加 /// 没有功能 请在个人中心--设备管理处添加 /// </summary> public const int NoFunction = 11010; /// <summary>
