From e28dca6aaa9cd0d16efb35b3525f4f18b1643dc9 Mon Sep 17 00:00:00 2001 From: snickersun Date: Fri, 4 Sep 2020 19:53:19 +0800 Subject: [PATCH] =?utf8?q?mqtt=20core=20=E6=BA=90=E7=A0=81=E5=8A=A0?= =?utf8?q?=E5=85=A5=E4=BB=A3=E7=A0=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 ++++++------------- .../support/utils/mqttConnection.java | 6 ++--- .../ic/protocols/protocol_mqtt_client.java | 4 ++-- .../se/wetcat/qatja/android/QatjaService.java | 5 +++-- app/version_code.properties | 4 ++-- core | 1 + dNSCache/build.gradle | 9 ++++---- dNSCache/dNSCache.iml | 2 +- 8 files changed, 24 insertions(+), 29 deletions(-) create mode 160000 core diff --git a/app/build.gradle b/app/build.gradle index 140dfff2..964a8d36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.application' //apply plugin: 'me.tatarka.retrolambda' + // APK 名称 static def getApkBaseName() { return "ICSer" @@ -59,10 +60,6 @@ android { // minifyEnabled true // useProguard false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } // 适用 gradle 3.0 及以上版本 android.applicationVariants.all { variant -> variant.outputs.all { @@ -73,15 +70,9 @@ android { } } } - lintOptions { - checkReleaseBuilds false - // Or, if you prefer, you can continue to check for errors in release builds, - // but continue the build even when errors are found: - abortOnError false - } - dexOptions { - incremental true - javaMaxHeapSize "4g" + compileOptions { + targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 } } // sourceSets.main { @@ -90,6 +81,8 @@ android { // } } dependencies { + implementation project(path: ':core') + implementation project(path: ':dNSCache') compileOnly files ('libs/frameworks-full-debug.jar') provided files ('libs/telephony_common-full-debug.jar') @@ -101,13 +94,12 @@ dependencies { implementation 'com.android.support:appcompat-v7:25.1.0' implementation 'com.github.ChestnutPlus:TestModules:v1.0.16' testCompile 'junit:junit:4.12' - implementation project(path: ':dNSCache') implementation 'com.android.support:recyclerview-v7:25.1.0' compile files ('libs/android-logging-log4j-1.0.3.jar','libs/ftp4j-1.7.2.jar','libs/log4j-1.2.17.jar','libs/okio-2.4.3.jar' ) compile files ('libs/mail.jar' ) compile files ('libs/activation.jar','libs/additionnal.jar' ) - implementation 'se.wetcat.qatja:core:1.0.4' +// implementation 'se.wetcat.qatja:core:1.0.4' // implementation "androidx.recyclerview:recyclerview:1.1.0 } diff --git a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java index 24e0fcee..84fbbc8b 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java @@ -66,10 +66,10 @@ public class mqttConnection implements Connection { } @Override - public void connect(String paramString, int paramInt){ + public void connect(String serverip, int serverport){ // mqtt_client.attemptConnectMqtt(paramString,"IC_"+mRuntime.IMEI(),paramInt); - ICLogger.i("mqttconnect " +paramString+" "+paramInt+" cycle "+mRuntime.getHeartBeatCycle()*60+" as "+"IC_"+mRuntime.IMEI()); - mqtt_client.configMqtt(paramString,paramInt, mRuntime.getHeartBeatCycle()*60,"IC_"+mRuntime.IMEI()); + ICLogger.i("mqttconnect " +serverip+" "+serverport+" cycle "+mRuntime.getHeartBeatCycle()*60+" as "+"IC_"+mRuntime.IMEI()); + mqtt_client.configMqtt(serverip,serverport, mRuntime.getHeartBeatCycle()*60,"IC_"+mRuntime.IMEI()); mqtt_client.connectservice(); // if(isServerconnected) mqtt_client.attemptConnectMqtt(); } diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java index c4d27f97..bc834c43 100644 --- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java +++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java @@ -170,7 +170,7 @@ public class protocol_mqtt_client { } private String mqttHost=""; private String devid=""; - private int mqtt_port=18083; + private int mqtt_port=8083; private int mqtt_cycle_seconds=600; public void configMqtt(String host,int port,int cycle_seconds,String idname){ mqttHost=host; @@ -184,7 +184,7 @@ public class protocol_mqtt_client { attemptConnectMqtt(mqttHost,mqtt_port,devid,mqtt_cycle_seconds); } public void attemptConnectMqtt(String host, int port,String identifier, int cycle_inSeconds) { - ICLogger.i("attemptConnectMqtt($host, $identifier)"); + ICLogger.i("attemptConnectMqtt("+host+", "+port+" "+identifier+" "+cycle_inSeconds); if (!(MQTTConnectionConstants.STATE_CONNECTING == mClient.getState() || MQTTConnectionConstants.STATE_CONNECTED == mClient.getState())) { try { diff --git a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java index deedd0a3..7e807135 100644 --- a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java +++ b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java @@ -298,6 +298,7 @@ public class QatjaService extends Service { if (protocolName != null) connect.setProtocolName(protocolName); + ICLogger.i(connect.toString()); sendMessage(connect, false); } @@ -640,7 +641,7 @@ public class QatjaService extends Service { */ public synchronized void connect() { if (DEBUG) - ICLogger.i( "connect to: " + host); + ICLogger.i( "mqtt connect to: " + host); cleanUp(); @@ -837,7 +838,7 @@ public class QatjaService extends Service { */ private synchronized void setState(int state) { if (DEBUG) - ICLogger.i("setState() " + (mState - CONSTANTS_BASE) + " -> " + (state- CONSTANTS_BASE)); + ICLogger.i("mqtt setState() " + (mState - CONSTANTS_BASE) + " -> " + (state- CONSTANTS_BASE)); if (mState != state) { mState = state; diff --git a/app/version_code.properties b/app/version_code.properties index 702d1cab..60eafa32 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Sat Aug 29 15:32:52 CST 2020 -VERSION_CODE=509 +#Tue Sep 01 11:24:02 CST 2020 +VERSION_CODE=510 diff --git a/core b/core new file mode 160000 index 00000000..b6b76d5e --- /dev/null +++ b/core @@ -0,0 +1 @@ +Subproject commit b6b76d5e81e7d87cfca5b1bd72c57d351461640c diff --git a/dNSCache/build.gradle b/dNSCache/build.gradle index f62c8889..cacb7575 100644 --- a/dNSCache/build.gradle +++ b/dNSCache/build.gradle @@ -26,10 +26,11 @@ android { // minifyEnabled true // useProguard false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } + + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml index fb85dbc3..4e8c3eb7 100644 --- a/dNSCache/dNSCache.iml +++ b/dNSCache/dNSCache.iml @@ -1,5 +1,5 @@ - + -- 2.17.1