整理项目

Author: licheedev

README.md

@@ -1,5 +1,5 @@
 # Modbus4Android
-Modbus的Android实现，添加对Android串口（RTU）的支持，支持RxJava操作
+Modbus的Android实现，添加对Android串口（RTU）的支持
 
 [![](https://jitpack.io/v/licheedev/Modbus4Android.svg)](https://jitpack.io/#licheedev/Modbus4Android)
 
@@ -25,7 +25,7 @@ allprojects {
 }
 
   dependencies {
-	        implementation 'com.github.licheedev:Modbus4Android:2.0.2'
+	        implementation 'com.github.licheedev:Modbus4Android:3.0.0'
 }
 
 ```
@@ -127,6 +127,7 @@ ModbusConfig.setEnableDataLog(true, true);
 ```
 
 ### 功能码操作示例
+#### 普通用法
 ```java
 // 普通写法
 ModbusManager.get()
@@ -172,6 +173,51 @@ ModbusManager.get()
 
 其他功能码的用法，可以参考Demo的[MainActivity.java](https://github.com/licheedev/Modbus4Android/blob/master/app/src/main/java/com/licheedev/demo/MainActivity.java)
 
+#### RxJava用法（2.0，其他版本按需修改）
+复制[rxjava](https://github.com/licheedev/Modbus4Android/tree/master/app/src/main/java/com/licheedev/impl/rxjava)相关文件到自己的项目中
+
+```java
+// 修改实现方式
+//public class ModbusManager extends ModbusWorker {}
+public class ModbusManager extends RxModbusWorker {}
+
+// Rx写法
+ModbusManager.get()
+    .rxReadHoldingRegisters(mSalveId, mOffset, mAmount)
+    .observeOn(AndroidSchedulers.mainThread())
+    .compose(this.<ReadHoldingRegistersResponse>bindUntilEvent(ActivityEvent.DESTROY))
+    .subscribe(new ModbusObserver<ReadHoldingRegistersResponse>() {
+        @Override
+        public void onSuccess(
+            ReadHoldingRegistersResponse readHoldingRegistersResponse) {
+            byte[] data = readHoldingRegistersResponse.getData();
+            mTvConsole.append("F03读取：" + ByteUtil.bytes2HexStr(data) + "\n");
+        }
+
+        @Override
+        public void onFailure(Throwable tr) {
+            appendError("F03", tr);
+        }
+    });
+```
+
+#### Kotlin协程用法
+复制[ModbusWorkers.kt](https://github.com/licheedev/Modbus4Android/tree/master/app/src/main/java/com/licheedev/impl/kotlin/ModbusWorkers.kt)相关文件到自己的项目中
+```kotlin
+// 协程写法
+lifecycleScope.launch {
+    try {
+        val response =
+            ModbusManager.get().awaitReadHoldingRegisters(mSalveId, mOffset, mAmount)
+        val data: ByteArray = response.data
+        appendText("F03读取：" + ByteUtil.bytes2HexStr(data) + "\n")
+    } catch (e: Exception) {
+        appendError("F03", e)
+    }
+}
+```
+
+
 
 ## 截图
 ![F01](https://raw.githubusercontent.com/licheedev/Modbus4Android/master/imgs/01.png)

apk_download/app-debug.apk

@@ -1,53 +1,76 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.licheedev.modbusdebug"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // Butterknife requires Java 8.
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation project(':modbus4android')
-//    implementation 'com.github.licheedev:Modbus4Android:0.21'
+    //    implementation 'com.github.licheedev:Modbus4Android:0.21'
     // logplus
-    implementation 'com.github.licheedev.SomeLibrary:myutils:0.02'
+    implementation 'com.licheedev:logplus:1.0.1'
     // gson
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.10.1'
     // 下拉
     implementation 'com.github.arcadefire:nice-spinner:1.3.5'
     // 增强版RadioGroup
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
-    // rx
-    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
-    
     // 屏幕适配
-    implementation 'com.github.licheedev:AdaptScreen:1.0.0'
+    implementation 'com.github.licheedev.SmallestWidthDimens:sw_750:1.0.0'
 
-
     // 黄油刀
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.2.3'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
 
     // 菊花对话框
     implementation 'com.kaopiz:kprogresshud:1.2.0'
 
+    // rx全家桶
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
+    implementation 'com.trello.rxlifecycle2:rxlifecycle-android:2.2.2'
+    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
+
+    // kotlin 协程
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+
+    // kotlin相关
+    def lifecycle_version = "2.5.1"
+    // LiveData
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    // Lifecycles only (without ViewModel or LiveData)
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    // alternately - if using Java8, use the following instead of lifecycle-compiler
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 }

app/build.gradle

@@ -1,8 +1,8 @@
 package com.licheedev.modbus4android;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/androidTest/java/com/licheedev/modbus4android/ExampleInstrumentedTest.java

@@ -12,7 +12,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ChooseModeActivity">
+        <activity android:name=".ChooseModeActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 package com.licheedev.demo;
 
 import android.app.Application;
-import com.licheedev.adaptscreen.AdaptScreenEx;
 import com.licheedev.demo.base.PrefUtil;
 import com.serotonin.modbus4j.ModbusConfig;
 
@@ -13,8 +12,6 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         sInstance = this;
-        // 屏幕适配
-        AdaptScreenEx.init(this);
         PrefUtil.init(this);
 
         configModbus();

app/src/main/java/com/licheedev/demo/App.java

@@ -1,7 +1,7 @@
 package com.licheedev.demo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 import butterknife.BindView;

app/src/main/java/com/licheedev/demo/ChooseModeActivity.java

@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.IntDef;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -13,15 +12,16 @@
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
+import androidx.annotation.IntDef;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.licheedev.demo.base.BaseActivity;
 import com.licheedev.demo.base.ByteUtil;
 import com.licheedev.demo.modbus.DeviceConfig;
 import com.licheedev.demo.modbus.ModbusManager;
+import com.licheedev.impl.rxjava.ModbusObserver;
 import com.licheedev.modbus4android.ModbusCallback;
-import com.licheedev.modbus4android.ModbusObserver;
 import com.licheedev.modbus4android.ModbusParam;
 import com.licheedev.modbus4android.param.SerialParam;
 import com.licheedev.modbus4android.param.TcpParam;
@@ -481,6 +481,7 @@ private void trySend() {
     }
 
     private void appendError(String func, Throwable tr) {
+        LogPlus.e("出现异常",tr);
         appendText(func + "异常:\n" + tr + "\n");
     }
 
@@ -527,11 +528,13 @@ private void send02() {
                     new ModbusCallback<ReadDiscreteInputsResponse>() {
                         @Override
                         public void onSuccess(
-                            ReadDiscreteInputsResponse readDiscreteInputsResponse) {
+                            ReadDiscreteInputsResponse readDiscreteInputsResponse
+                        ) {
 
                             boolean[] sub =
                                 ArrayUtils.subarray(readDiscreteInputsResponse.getBooleanData(), 0,
-                                    amount);
+                                    amount
+                                );
                             appendText("F02读取：\n" + ArrayUtils.toString(sub) + "\n");
                         }
 
@@ -544,7 +547,8 @@ public void onFailure(Throwable tr) {
                         public void onFinally() {
 
                         }
-                    });
+                    }
+                );
         }
     }
 
@@ -582,7 +586,8 @@ private void send03() {
                 .subscribe(new ModbusObserver<ReadHoldingRegistersResponse>() {
                     @Override
                     public void onSuccess(
-                        ReadHoldingRegistersResponse readHoldingRegistersResponse) {
+                        ReadHoldingRegistersResponse readHoldingRegistersResponse
+                    ) {
                         byte[] data = readHoldingRegistersResponse.getData();
                         appendText("F03读取：\n" + ByteUtil.bytes2HexStr(data) + "\n");
                     }
@@ -604,7 +609,8 @@ private void send04() {
                     new ModbusCallback<ReadInputRegistersResponse>() {
                         @Override
                         public void onSuccess(
-                            ReadInputRegistersResponse readInputRegistersResponse) {
+                            ReadInputRegistersResponse readInputRegistersResponse
+                        ) {
                             byte[] data = readInputRegistersResponse.getData();
                             appendText("F04读取：\n" + ByteUtil.bytes2HexStr(data) + "\n");
                         }
@@ -618,7 +624,8 @@ public void onFailure(Throwable tr) {
                         public void onFinally() {
 
                         }
-                    });
+                    }
+                );
         }
     }
 
@@ -643,7 +650,8 @@ public void onFailure(Throwable tr) {
                         public void onFinally() {
 
                         }
-                    });
+                    }
+                );
         }
     }
 
@@ -667,7 +675,8 @@ public void onFailure(Throwable tr) {
                         public void onFinally() {
 
                         }
-                    });
+                    }
+                );
         }
     }
 
@@ -691,7 +700,8 @@ public void onFailure(Throwable tr) {
                         public void onFinally() {
 
                         }
-                    });
+                    }
+                );
         }
     }
 
@@ -717,7 +727,8 @@ public void onFailure(Throwable tr) {
                         public void onFinally() {
 
                         }
-                    });
+                    }
+                );
         }
     }