Skip to content

huangzhicong / SmartCanteen

Go to a project
Commit a40aa31b by pye52
Options

更换为厂商最新的so库

parent 6cd22534
Showing with 8 additions and 195 deletions
app/src/main/java/android_serialport_api/SerialPort.java deleted 100644 → 0
package android_serialport_api;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
/**
* Google官方代码
* 此类的作用为，JNI的调用，用来加载.so文件的
* 获取串口输入输出流
*/
public class SerialPort {
private static final String TAG = "SerialPort";
public static SerialPort build(File device, int baudrate, int flags) {
/* Check access permission */
if (!device.canRead() || !device.canWrite()) {
try {
/* Missing read/write permission, trying to chmod the file */
Process su;
su = Runtime.getRuntime().exec("/system/bin/su");
String cmd = "chmod 666 " + device.getAbsolutePath() + "\n" + "exit\n";
su.getOutputStream().write(cmd.getBytes());
if ((su.waitFor() != 0) || !device.canRead() || !device.canWrite()) {
return null;
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
System.out.println(device.getAbsolutePath() + "==============================");
FileDescriptor fd = open(device.getAbsolutePath(), baudrate, flags);
if (fd == null) return null;
return new SerialPort(fd);
}
/*
* Do not remove or rename the field mFd: it is used by native method
* close();
*/
private FileDescriptor mFd;
private FileInputStream mFileInputStream;
private FileOutputStream mFileOutputStream;
private SerialPort(FileDescriptor fd) {
mFd = fd;
mFileInputStream = new FileInputStream(mFd);
mFileOutputStream = new FileOutputStream(mFd);
}
// Getters and setters
public InputStream getInputStream() {
return mFileInputStream;
}
public OutputStream getOutputStream() {
return mFileOutputStream;
}
// JNI
private native static FileDescriptor open(String path, int baudrate, int flags);
public native void close();
static {
System.out.println("==============================");
System.loadLibrary("serial_port");
System.out.println("********************************");
}
}
app/src/main/java/android_serialport_api/SerialPortFinder.java deleted 100644 → 0
package android_serialport_api;
import android.util.Log;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
import java.util.Iterator;
import java.util.Vector;
/**
* Google官方代码
* 此类的作用为，寻找得到有效的串口的物理地址。
* 如果你本身就知道串口的地址如：ttyS1、ttyS2，那么这个类就可以不用了。
*
*/
public class SerialPortFinder {
public class Driver {
public Driver(String name, String root) {
mDriverName = name;
mDeviceRoot = root;
}
private String mDriverName;
private String mDeviceRoot;
Vector<File> mDevices = null;
public Vector<File> getDevices() {
if (mDevices == null) {
mDevices = new Vector<File>();
File dev = new File("/dev");
File[] files = dev.listFiles();
int i;
for (i=0; i<files.length; i++) {
if (files[i].getAbsolutePath().startsWith(mDeviceRoot)) {
Log.d(TAG, "Found new device: " + files[i]);
mDevices.add(files[i]);
}
}
}
return mDevices;
}
public String getName() {
return mDriverName;
}
}
private static final String TAG = "SerialPort";
private Vector<Driver> mDrivers = null;
Vector<Driver> getDrivers() throws IOException {
if (mDrivers == null) {
mDrivers = new Vector<Driver>();
LineNumberReader r = new LineNumberReader(new FileReader("/proc/tty/drivers"));
String l;
while((l = r.readLine()) != null) {
// Issue 3:
// Since driver name may contain spaces, we do not extract driver name with split()
String drivername = l.substring(0, 0x15).trim();
String[] w = l.split(" +");
if ((w.length >= 5) && (w[w.length-1].equals("serial"))) {
Log.d(TAG, "Found new driver " + drivername + " on " + w[w.length-4]);
mDrivers.add(new Driver(drivername, w[w.length-4]));
}
}
r.close();
}
return mDrivers;
}
public String[] getAllDevices() {
Vector<String> devices = new Vector<String>();
// Parse each driver
Iterator<Driver> itdriv;
try {
itdriv = getDrivers().iterator();
while(itdriv.hasNext()) {
Driver driver = itdriv.next();
Iterator<File> itdev = driver.getDevices().iterator();
while(itdev.hasNext()) {
String device = itdev.next().getName();
String value = String.format("%s (%s)", device, driver.getName());
devices.add(value);
}
}
} catch (IOException e) {
e.printStackTrace();
}
return devices.toArray(new String[devices.size()]);
}
public String[] getAllDevicesPath() {
Vector<String> devices = new Vector<String>();
// Parse each driver
Iterator<Driver> itdriv;
try {
itdriv = getDrivers().iterator();
while(itdriv.hasNext()) {
Driver driver = itdriv.next();
Iterator<File> itdev = driver.getDevices().iterator();
while(itdev.hasNext()) {
String device = itdev.next().getAbsolutePath();
devices.add(device);
}
}
} catch (IOException e) {
e.printStackTrace();
}
return devices.toArray(new String[devices.size()]);
}
}
app/src/main/java/com/bgycc/smartcanteen/task/QRCodeTask.java
package com.bgycc.smartcanteen.task;
import android_serialport_api.SerialPort;
import com.bgycc.smartcanteen.App;
import com.bgycc.smartcanteen.Storage.PayStorage;
import com.bgycc.smartcanteen.event.QRCodeEvent;
......@@ -11,10 +10,11 @@ import com.bgycc.smartcanteen.helper.TimerHelper;
import com.bgycc.smartcanteen.server.websocket.MainWebSocket;
import com.bgycc.smartcanteen.util.ByteUtil;
import com.blankj.utilcode.util.LogUtils;
import com.telpo.tps550.api.serial.Serial;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import java.io.File;
import java.util.Arrays;
import java.util.regex.Pattern;
......@@ -36,7 +36,7 @@ public class QRCodeTask {
}
private ScanAsyncTask mScanAsyncTask;
private SerialPort mSerial;
private Serial mSerial;
private long mTimerId = -1;
private long mOfflineTimerId = -1;
private long mOfflineUpdateDelay = 0;
......@@ -51,7 +51,11 @@ public class QRCodeTask {
if (!support()) return;
if (mScanAsyncTask == null) {
mSerial = SerialPort.build(new File("/dev/ttyS6"), 115200, 0);
try {
mSerial = new Serial("/dev/ttyS0", 115200, 0);
} catch (Exception e) {
LogUtils.file("串口初始化失败");
}
mScanAsyncTask = new ScanAsyncTask();
mTimerId = TimerHelper.INSTANCE.loop(new TimerHelper.LoopTask() {
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment