Merge branch 'mqtt_test' of server-git:incartech/protocol_srv into mqtt_test

diff --cc app/release/output.json
index f27aa14,619a3d8..bca992c
--- 1/app/release/output.json
--- 2/app/release/output.json
+++ b/app/release/output.json
@@@ -1,1 -1,1 +1,1 @@@
- [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":880,"versionName":"2106301429","enabled":true,"outputFile":"ICSer_V880_2106301429_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V880_2106301429_release.apk","properties":{}}]
 -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":880,"versionName":"2106291941","enabled":true,"outputFile":"ICSer_V880_2106291941_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V880_2106291941_release.apk","properties":{}}]
++[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":880,"versionName":"2106301429","enabled":true,"outputFile":"ICSer_V880_2106301429_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V880_2106301429_release.apk","properties":{}}]

diff --cc app/src/main/AndroidManifest.xml
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/CoreService.java
Simple merge

diff --cc app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index 9d18c3a,623ec87..98f6549
--- 1/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
--- 2/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@@ -16,10 -16,12 +16,13 @@@ import com.enqualcomm.support.utils.DBH
  import com.enqualcomm.support.utils.DnsUtil;
  import com.enqualcomm.support.utils.ICLogger;
  import com.enqualcomm.support.utils.LanguageUtils;
 +import com.enqualcomm.support.utils.TimeUtil;
  import com.ic.fzd.weather.IFZDWeatherCallback;
+ import com.ic.s123.IS123WeatherCallback;
+ import com.ic.s123.S123WeatherInfo;
  
  import java.io.File;
+ import java.util.List;
  
  public class Runtime {
      private boolean debugflag = false;

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

diff --cc app/version_code.properties
index 0b2e303,f652d3b..413bcf1
--- 1/app/version_code.properties
--- 2/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,5 -1,2 +1,2 @@@
 -#Tue Jun 29 19:41:46 CST 2021\r
 -VERSION_CODE=880
 +#Wed Jun 30 14:29:27 CST 2021\r
- >>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db\r
 +VERSION_CODE=880\r
- <<<<<<<=HEAD\r
- =\=\=\=\=\=\=\r

diff --cc local.properties
index 538a779,f3b2061..553ff13
--- 1/local.properties
--- 2/local.properties
+++ b/local.properties
@@@ -4,8 -4,5 +4,4 @@@
  # Location of the SDK. This is only used by Gradle.\r
  # For customization when using a Version Control System, please read the\r
  # header note.\r
- #Tue Jun 29 22:28:38 CST 2021\r
- >>>>>>>=bac6231c4f7e5884c23cfac5feb384cddb497355\r
- sdk.dir=D\:\\Android\\Sdk\r
- <<<<<<<=HEAD\r
- =\=\=\=\=\=\=\r
 -#Tue Jun 29 20:13:18 CST 2021\r
+ sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r