2019.10.29-3

gxc

2019-10-29 52005ed57f3f7bc796fdd1a878e4f298a126f1e8

2019.10.29-3

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -2,22 +2,37 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/R.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1351" Column="26" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1135" Column="48" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
      <File FileName="Shared/Common/SceneUI.cs" />
      <File FileName="Shared/Common/ZigbeeColor.cs" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" />
      <File FileName="Shared/R.cs" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
      <File FileName="Shared/Common/Logic.cs" />
      <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" Line="484" Column="51" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="1" Column="1" />
      <File FileName="Shared/R.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True" selected="True" />
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
              <Node name="Resources" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Category" expanded="True" />
                  <Node name="Light" expanded="True" />
                  <Node name="Logic" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="UserView" expanded="True" />
              </Node>
              <Node name="R.cs" selected="True" />
            </Node>
          </Node>
        </State>
      </Pad>
@@ -26,7 +41,9 @@
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
    <BreakpointStore>
      <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs" relfile="Shared/Phone/Device/Light/LightControl.cs" line="190" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -652,7 +652,9 @@
13143=功能类型
13144=失败，请重试
13145=成功

13146=默认图库
13147=拍照
13148=我的相册


15000=密码长度为{0}个字符

 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs

@@ -463,16 +463,129 @@
                    return;
                }

                var localPic = new CategorySceneSelectImgByLocal();
                Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                localPic.Show();
                localPic.action = (imgPath) =>
                int selectRow_Height = 150;
                int selectRow_Width = 1034;
                var selectFL = new FrameLayout()
                {
                    IconPathType = 0;
                    backGround.UnSelectedImagePath = imgPath;
                    BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
                };
                AddChidren(selectFL);

                var itemFL = new FrameLayout()
                {
                    Y = Application.GetRealHeight(1276),
                    Height = Application.GetRealHeight(450),
                    Width = Application.GetRealWidth(selectRow_Width),
                    Gravity = Gravity.CenterHorizontal,
                    Radius = (uint)Application.GetRealHeight(17),
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
                };
                selectFL.AddChidren(itemFL);
                itemFL.Animate = Animate.DownToUp;

                var selectLocalPicture = new Button()
                {
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.LocalPicture,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                };
                itemFL.AddChidren(selectLocalPicture);
                var selectLocalLine = new Button()
                {
                    Y = selectLocalPicture.Bottom,
                    Height = 1,
                    BackgroundColor = ZigbeeColor.Current.GXCLineColor
                };
                itemFL.AddChidren(selectLocalLine);

                var selectPhotographBtn = new Button()
                {
                    Y = selectLocalLine.Bottom,
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.Photograph,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                };
                itemFL.AddChidren(selectPhotographBtn);
                var selectPhotographLine = new Button()
                {
                    Y = selectPhotographBtn.Bottom,
                    Height = 1,
                    BackgroundColor = ZigbeeColor.Current.GXCLineColor,
                };
                itemFL.AddChidren(selectPhotographLine);

                var selectAblumsBtn = new Button()
                {
                    Y = selectPhotographLine.Bottom,
                    Height = Application.GetRealHeight(selectRow_Height) - 1,
                    TextID = R.MyInternationalizationString.MyAblums,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
                };
                itemFL.AddChidren(selectAblumsBtn);

                var cancelBtn = new Button()
                {
                    Y = Application.GetRealHeight(1742),
                    Height = Application.GetRealHeight(selectRow_Height),
                    Width = Application.GetRealWidth(selectRow_Width),
                    Gravity = Gravity.CenterHorizontal,
                    TextID = R.MyInternationalizationString.Cancel,
                    TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    Radius = (uint)Application.GetRealHeight(17)
                };
                selectFL.AddChidren(cancelBtn);

                selectLocalPicture.MouseUpEventHandler += (send, ee) =>
                {
                    selectFL.RemoveFromParent();
                    var localPic = new CategorySceneSelectImgByLocal();
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    localPic.Show();
                    localPic.action = (imgPath) =>
                    {
                        IconPathType = 0;
                        backGround.UnSelectedImagePath = imgPath;
                    };
                };
                selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
                {
                    selectFL.RemoveFromParent();
                    var sceneView = new SelectScene();
                    UserView.HomePage.Instance.AddChidren(sceneView);
                    UserView.HomePage.Instance.PageIndex += 1;
                    sceneView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
                    sceneView.Show();
                    sceneView.selectedAction = (selectedScene) =>
                    {
                        sceneTargetDevicesList.Add(selectedScene);
                        RefreshTargetListView();
                    };

                };
                selectAblumsBtn.MouseUpEventHandler += (send, ee) =>
                {
                    selectFL.RemoveFromParent();
                    var delayTimeView = new SelectDelayTime();
                    UserView.HomePage.Instance.AddChidren(delayTimeView);
                    UserView.HomePage.Instance.PageIndex += 1;
                    delayTimeView.Show();
                    delayTimeView.selectedTimeAction = (second) =>
                    {
                        sceneTargetDevicesList.Add(second);
                        RefreshTargetListView();
                    };
                };

                cancelBtn.MouseUpEventHandler += (send, ee) =>
                {
                    selectFL.RemoveFromParent();
                };
                selectFL.MouseUpEventHandler += (send, ee) =>
                {
                    selectFL.RemoveFromParent();
                };
            };
            backGround.MouseUpEventHandler += backGroundIMGHander;

@@ -561,6 +674,7 @@
                    BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
                };
                selectFL.AddChidren(itemFL);
                itemFL.Animate = Animate.DownToUp;

                var selectedFunctionBtn = new Button()
                {
@@ -737,7 +851,8 @@
                            {

                            }
                            
                            modifySceneUI.IconPath = backGround.UnSelectedImagePath;

                            CommonPage.Loading.Start();
                            var memberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData>();
                            for (int i = 0; i < sceneTargetDevicesList.Count; i++)
@@ -835,6 +950,7 @@
                            {
                                if (modifyRoom != curRoom)
                                {
                                   
                                    modifyRoom.SceneUIList.Remove(modifySceneUI);
                                    modifyRoom.SceneUIFilePathList.Remove(modifySceneUI.FileName);
                                    curRoom.SceneUIList.Add(modifySceneUI);
@@ -969,7 +1085,5 @@
        }

        #endregion


    }
}

 ZigbeeApp/Shared/R.cs

@@ -999,7 +999,18 @@
        /// 成功
        /// </summary>
        public const int Success = 13145;

        /// <summary>
        /// 默认图库
        /// </summary>
        public const int LocalPicture = 13146;
        /// <summary>
        /// 拍照
        /// </summary>
        public const int Photograph = 13147;
        /// <summary>
        /// 我的相册
        /// </summary>
        public const int MyAblums = 13148;

        #endregion