2019-11-26-1

WJC

2019-11-26 6b1c76ed25487f69f790da04f7465a2087a5bcf3

2019-11-26-1

 ZigbeeApp/.DS_Store

Binary files differ

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

@@ -2,44 +2,30 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Send.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="GateWay.Ios/AppDelegate.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="330" Column="46" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="91" Column="12" />
      <File FileName="Shared/Phone/UserView/HomePage.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="729" Column="45" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" />
      <File FileName="GateWay.Ios/MainViewController.cs" />
      <File FileName="Shared/R.cs" />
      <File FileName="Shared/Common/CommonPage.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="563" Column="67" />
      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1450" Column="54" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
      <File FileName="Shared/Common/Logic.cs" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="354" Column="76" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1805" Column="1" />
      <File FileName="GateWay.Ios/AppDelegate.cs" Line="79" Column="72" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Ios" expanded="True">
              <Node name="Resources" expanded="True" />
              <Node name="AppDelegate.cs" selected="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="Send.cs" selected="True" />
                  </Node>
                  <Node name="Logic" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Common" expanded="True" />
                  </Node>
                  <Node name="DoorLock" expanded="True" />
                </Node>
                <Node name="UserView" expanded="True" />
              </Node>
            </Node>
          </Node>

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

Binary files differ

 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -164,5 +164,7 @@
        <meta-data android:name="JPUSH_APPKEY" android:value="f4a3322fbc45e58d04c85191" />
        <!--  </>值来自开发者平台取得的AppKey-->
        <!-- 极光推送结束 -->
        <!-- 设置高德地图key -->
        <meta-data android:name="com.amap.api.v2.apikey" android:value="1f753413955012c9594c5df69eaa0aff" />
    </application>
</manifest>

 ZigbeeApp/GateWay.Ios/AppDelegate.cs

old mode 100755
new mode 100644
@@ -76,6 +76,7 @@
                }
            }
            AppCenter.Start("0ca801a2-742b-42fb-ba10-7ba4391371aa", typeof(Analytics), typeof(Crashes));
            GDMapKit.setGDApiKey("866fae25f336bc8d9a79b1d19267fffb");//高德地图key
            return true;
        }


 ZigbeeApp/Shared/Phone/Device/.DS_Store

Binary files differ

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

@@ -857,8 +857,8 @@
        public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
        {
            string s = null;
            var str = await WebClientAsync(0, CommonPage.RequestHttpsHost+"/App/GetHomePager");//不同区域域名前缀不一样
           // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
            var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//不同区域域名前缀不一样
                                                                                                 // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
            var jObject = JObject.Parse(str);
            if (jObject == null || jObject["StateCode"].ToString() != "Success")
            {
@@ -1071,5 +1071,6 @@
        /// </summary>
        public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
        #endregion

    }
}