refactor

Giftedcat · Jun 15, 2020 · 88bf291 · 88bf291
1 parent 8ae71a7
commit 88bf291
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 23 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/SerialPortLibrary/src/main/cpp/SerialPort.c b/SerialPortLibrary/src/main/cpp/SerialPort.c
@@ -73,7 +73,7 @@ static speed_t getBaudrate(jint baudrate)
  * Method:    open
  * Signature: (Ljava/lang/String;II)Ljava/io/FileDescriptor;
  */
-JNIEXPORT jobject JNICALL Java_com_kongqw_serialportlibrary_SerialPort_open
+JNIEXPORT jobject JNICALL Java_com_giftedcat_serialportlibrary_SerialPort_open
   (JNIEnv *env, jclass thiz, jstring path, jint baudrate, jint flags)
 {
 	int fd;
@@ -149,7 +149,7 @@ JNIEXPORT jobject JNICALL Java_com_kongqw_serialportlibrary_SerialPort_open
  * Method:    close
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_kongqw_serialportlibrary_SerialPort_close
+JNIEXPORT void JNICALL Java_com_giftedcat_serialportlibrary_SerialPort_close
   (JNIEnv *env, jobject thiz)
 {
 	jclass SerialPortClass = (*env)->GetObjectClass(env, thiz);

diff --git a/SerialPortLibrary/src/main/cpp/SerialPort.h b/SerialPortLibrary/src/main/cpp/SerialPort.h
diff --git a/.../com/kongqw/serialportlibrary/Device.java → ...m/giftedcat/serialportlibrary/Device.java b/.../com/kongqw/serialportlibrary/Device.java → ...m/giftedcat/serialportlibrary/Device.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary;
+package com.giftedcat.serialportlibrary;
 
 import java.io.File;
 import java.io.Serializable;

diff --git a/.../com/kongqw/serialportlibrary/Driver.java → ...m/giftedcat/serialportlibrary/Driver.java b/.../com/kongqw/serialportlibrary/Driver.java → ...m/giftedcat/serialportlibrary/Driver.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary;
+package com.giftedcat.serialportlibrary;
 
 import android.util.Log;
 

diff --git a/.../kongqw/serialportlibrary/SerialPort.java → ...ftedcat/serialportlibrary/SerialPort.java b/.../kongqw/serialportlibrary/SerialPort.java → ...ftedcat/serialportlibrary/SerialPort.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary;
+package com.giftedcat.serialportlibrary;
 
 import java.io.File;
 import java.io.FileDescriptor;

diff --git a/...w/serialportlibrary/SerialPortFinder.java → ...t/serialportlibrary/SerialPortFinder.java b/...w/serialportlibrary/SerialPortFinder.java → ...t/serialportlibrary/SerialPortFinder.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary;
+package com.giftedcat.serialportlibrary;
 
 import android.util.Log;
 

diff --git a/.../serialportlibrary/SerialPortManager.java → .../serialportlibrary/SerialPortManager.java b/.../serialportlibrary/SerialPortManager.java → .../serialportlibrary/SerialPortManager.java
@@ -1,14 +1,14 @@
-package com.kongqw.serialportlibrary;
+package com.giftedcat.serialportlibrary;
 
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
 import android.util.Log;
 
-import com.kongqw.serialportlibrary.listener.OnOpenSerialPortListener;
-import com.kongqw.serialportlibrary.listener.OnSerialPortDataListener;
-import com.kongqw.serialportlibrary.thread.SerialPortReadThread;
-import com.kongqw.serialportlibrary.utils.DataUtil;
+import com.giftedcat.serialportlibrary.listener.OnOpenSerialPortListener;
+import com.giftedcat.serialportlibrary.listener.OnSerialPortDataListener;
+import com.giftedcat.serialportlibrary.thread.SerialPortReadThread;
+import com.giftedcat.serialportlibrary.utils.DataUtil;
 
 import java.io.File;
 import java.io.FileDescriptor;

diff --git a/...ry/listener/OnOpenSerialPortListener.java → ...ry/listener/OnOpenSerialPortListener.java b/...ry/listener/OnOpenSerialPortListener.java → ...ry/listener/OnOpenSerialPortListener.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary.listener;
+package com.giftedcat.serialportlibrary.listener;
 
 import java.io.File;
 

diff --git a/...ry/listener/OnSerialPortDataListener.java → ...ry/listener/OnSerialPortDataListener.java b/...ry/listener/OnSerialPortDataListener.java → ...ry/listener/OnSerialPortDataListener.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary.listener;
+package com.giftedcat.serialportlibrary.listener;
 
 /**
  * Created by Kongqw on 2017/11/14.

diff --git a/...tlibrary/thread/SerialPortReadThread.java → ...tlibrary/thread/SerialPortReadThread.java b/...tlibrary/thread/SerialPortReadThread.java → ...tlibrary/thread/SerialPortReadThread.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary.thread;
+package com.giftedcat.serialportlibrary.thread;
 
 import android.util.Log;
 

diff --git a/...gqw/serialportlibrary/utils/DataUtil.java → ...cat/serialportlibrary/utils/DataUtil.java b/...gqw/serialportlibrary/utils/DataUtil.java → ...cat/serialportlibrary/utils/DataUtil.java
@@ -1,4 +1,4 @@
-package com.kongqw.serialportlibrary.utils;
+package com.giftedcat.serialportlibrary.utils;
 
 /**
  * @author giftedcat

diff --git a/app/src/main/java/com/giftedcat/serialport/service/SerialInteractiveService.java b/app/src/main/java/com/giftedcat/serialport/service/SerialInteractiveService.java
@@ -11,8 +11,8 @@
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.kongqw.serialportlibrary.SerialPortManager;
-import com.kongqw.serialportlibrary.listener.OnSerialPortDataListener;
+import com.giftedcat.serialportlibrary.SerialPortManager;
+import com.giftedcat.serialportlibrary.listener.OnSerialPortDataListener;
 
 import java.io.File;
 
@@ -41,14 +41,14 @@ public class SerialInteractiveService extends Service {
     public void onCreate() {
         super.onCreate();
 
-        mSerialPortManager1 = new SerialPortManager(new File("/dev/ttyS0"), 9600)
+        mSerialPortManager1 = new SerialPortManager(new File("/dev/ttyS3"), 9600)
                 .setOnSerialPortDataListener(new OnSerialPortDataListener() {
                     @Override
                     public void onDataReceived(byte[] bytes) {
                         sendMessageToClient(101, new String(bytes));
                     }
                 });
-        mSerialPortManager2 = new SerialPortManager(new File("/dev/ttyS1"), 9600)
+        mSerialPortManager2 = new SerialPortManager(new File("/dev/ttyS2"), 9600)
                 .setOnSerialPortDataListener(new OnSerialPortDataListener() {
                     @Override
                     public void onDataReceived(byte[] bytes) {