From 6b1c76ed25487f69f790da04f7465a2087a5bcf3 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 26 十一月 2019 17:58:15 +0800
Subject: [PATCH] 2019-11-26-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 5 +++--
ZigbeeApp/GateWay.Ios/AppDelegate.cs | 1 +
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 32 +++++++++-----------------------
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2 ++
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/.DS_Store | 0
ZigbeeApp/Shared/Phone/Device/.DS_Store | 0
7 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/.DS_Store b/ZigbeeApp/.DS_Store
index 221289e..e7e6909 100644
--- a/ZigbeeApp/.DS_Store
+++ b/ZigbeeApp/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index b369432..030da2f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/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>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 0d61e44..059df3e 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 58ce255..2c8e8ab 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Ios/AppDelegate.cs b/ZigbeeApp/GateWay.Ios/AppDelegate.cs
old mode 100755
new mode 100644
index 21a52c7..c22056e
--- a/ZigbeeApp/GateWay.Ios/AppDelegate.cs
+++ b/ZigbeeApp/GateWay.Ios/AppDelegate.cs
@@ -76,6 +76,7 @@
}
}
AppCenter.Start("0ca801a2-742b-42fb-ba10-7ba4391371aa", typeof(Analytics), typeof(Crashes));
+ GDMapKit.setGDApiKey("866fae25f336bc8d9a79b1d19267fffb");//楂樺痉鍦板浘key
return true;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/.DS_Store b/ZigbeeApp/Shared/Phone/Device/.DS_Store
index 811ef76..51ead7a 100644
--- a/ZigbeeApp/Shared/Phone/Device/.DS_Store
+++ b/ZigbeeApp/Shared/Phone/Device/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index f6f67b8..15ca0f0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/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
+
}
}
--
Gitblit v1.8.0