Merge branch 'master' of snicker.com.cn:icsupport

diff --cc app/src/main/java/com/ic/protocol/LocationClient.java
Simple merge

diff --cc app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
Simple merge

diff --cc app/version_code.properties
index 5cc6ea1,d40b7b4..bd0b1ea
--- 1/app/version_code.properties
--- 2/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,2 +1,2 @@@
 -#Thu Jan 16 18:40:41 CST 2020\r
 +#Sun Jan 19 16:03:14 CST 2020\r
- VERSION_CODE=328\r
+ VERSION_CODE=340\r