2020-5-21-1

陈嘉乐

2020-05-21 2fc1b7cbf8ae63ebc4b92fde4203317b7f3e0f33

2020-5-21-1

最新代码，请合并

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

@@ -1,12 +1,31 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/OneLogic.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="190" Column="41" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="323" Column="92" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1066" Column="38" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="77" Column="60" />
      <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="16" Column="16" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" selected="True" />
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="OneLogic.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>

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

Binary files differ

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -41,6 +41,7 @@
    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

    <DebugSymbols>true</DebugSymbols>


 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020051902" android:installLocation="auto" android:versionName="1.0.20051902">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="27" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020051904" android:installLocation="auto" android:versionName="1.0.20051904">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
    <permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <!--8.0权限-->

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs

old mode 100755
new mode 100644
@@ -66,6 +66,7 @@
            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                TimeView();
               
            };
            functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -13,13 +13,14 @@
        /// <summary>
        /// 其它界面跳进来的入口
        /// </summary>
        public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null) 
        public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null) 
        {
            /// 0.正常自动化;1.门锁自动化;2.Sone门锁;
            switch (intvalue)
            {
                case 0:
                    {

                        //new一个新逻辑对象；
                        //新增正常自动化入口
                        Common.Logic.CurrentLogic = new Common.Logic();
@@ -60,7 +61,7 @@
                        doorLockLogicList.Show();
                    }
                    break;
              

            }

        }

 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs

@@ -38,7 +38,7 @@
        /// <summary>
        /// 时间戳
        /// </summary>
        public int timeLong = 0;
        public long timeLong = 0;
        public async void Show()
        {

@@ -81,7 +81,7 @@
                        //进来更新一次值
                        logicId = logic.LogicId;
                        timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]) / 3600;
                        timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
                        timeLong = long.Parse(logic.Conditions[0]["TriggerTime"]);

                    }
                    catch { }
@@ -549,6 +549,7 @@
            {
                if (!SkipView.ExistLogic(logic, Send.CurrentDoorLock))
                {
                    ///不是该门锁自动化就不显示出来;
                    continue;
                }
                #region  自动化布局View
@@ -708,15 +709,22 @@
                };

            }
        }

      
        public DateTime GetLocalTime(int unixTimeStamp)
        /// <summary>
        /// 时间戳转换成时间格式
        /// </summary>
        /// <param name="unixTimeStamp">时间戳</param>
        /// <returns></returns>
        public DateTime GetLocalTime(long unixTimeStamp)
        {
            DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
            long lTime = long.Parse(unixTimeStamp + "0000000");
            TimeSpan toNow = new TimeSpan(lTime);
            DateTime dtResult = dtStart.Add(toNow);
            return dtResult;
            //DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
            //long lTime = long.Parse(unixTimeStamp + "0000000");
            //TimeSpan toNow = new TimeSpan(lTime);
            //DateTime dtResult = dtStart.Add(toNow);
            //return dtResult;

            System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
            return startTime.AddMilliseconds(unixTimeStamp);

        }
    }
}