修改苏净zk-r322a的底层驱动逻辑

.idea/encodings.xml

@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/app/jni/Android.mk" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/jni/Application.mk" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/jni/SerialPort.c" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/jni/SerialPort.h" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/jni/gen_SerialPort_h.sh" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/libs/armeabi/libserial_port.so" charset="GBK" />
     <file url="file://$PROJECT_DIR$/app/src/main/java/com/jiebao/h518/scan/SqliteConnect.java" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-jni/Android.mk" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-jni/Application.mk" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-jni/SerialPort.c" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-jni/SerialPort.h" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-jni/gen_SerialPort_h.sh" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-libs/armeabi" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-libs/armeabi-v7a" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/app/vguang-libs/x86" charset="GBK" />
   </component>
 </project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 15
         versionCode 1
-        versionName "1.0"
+        versionName "V1.079"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,8 +31,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    //加载动态库
+    sourceSets{
+        main{
+            jniLibs.srcDir(['libs'])
+        }
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    //加载jar包
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }

app/jni/Android.mk

@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-TARGET_PLATFORM := android-8
+TARGET_PLATFORM := android-3
 LOCAL_MODULE    := serial_port
 LOCAL_SRC_FILES := SerialPort.c
 LOCAL_LDLIBS    := -llog

app/jni/Application.mk

@@ -0,0 +1 @@
+APP_ABI := armeabi armeabi-v7a x86

app/jni/SerialPort.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Cedric Priscal
+ * Copyright 2009-2011 Cedric Priscal
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,52 +22,14 @@
 #include <string.h>
 #include <jni.h>
 
+#include "SerialPort.h"
+
 #include "android/log.h"
 static const char *TAG="serial_port";
 #define LOGI(fmt, args...) __android_log_print(ANDROID_LOG_INFO,  TAG, fmt, ##args)
 #define LOGD(fmt, args...) __android_log_print(ANDROID_LOG_DEBUG, TAG, fmt, ##args)
 #define LOGE(fmt, args...) __android_log_print(ANDROID_LOG_ERROR, TAG, fmt, ##args)
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_android_barcode_SerialPort
- * Method:    open
- * Signature: (Ljava/lang/String;I)I
- */
-JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_open
-  (JNIEnv *, jclass, jstring, jint);
-
-/*
- * Class:     com_android_barcode_SerialPort
- * Method:    write
- * Signature: (ILjava/lang/String;I)I
- */
-JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_write
-  (JNIEnv *, jobject, jint, jstring, jint);
-
-/*
- * Class:     com_android_barcode_SerialPort
- * Method:    read
- * Signature: (II)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_com_android_barcode_SerialPort_read
-  (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class:     com_android_barcode_SerialPort
- * Method:    close
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_com_android_barcode_SerialPort_close
-  (JNIEnv *, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
 static speed_t getBaudrate(jint baudrate)
 {
 	switch(baudrate) {
@@ -107,15 +69,16 @@ static speed_t getBaudrate(jint baudrate)
 }
 
 /*
- * Class:     cedric_serial_SerialPort
+ * Class:     android_serialport_SerialPort
  * Method:    open
- * Signature: (Ljava/lang/String;)V
+ * Signature: (Ljava/lang/String;II)Ljava/io/FileDescriptor;
  */
-JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_open
-  (JNIEnv *env, jobject thiz, jstring path, jint baudrate)
+JNIEXPORT jobject JNICALL Java_android_1serialport_1api_SerialPort_open
+  (JNIEnv *env, jclass thiz, jstring path, jint baudrate, jint flags)
 {
 	int fd;
 	speed_t speed;
+	jobject mFileDescriptor;
 
 	/* Check arguments */
 	{
@@ -123,6 +86,7 @@ JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_open
 		if (speed == -1) {
 			/* TODO: throw an exception */
 			LOGE("Invalid baudrate");
+			return NULL;
 		}
 	}
 
@@ -130,8 +94,8 @@ JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_open
 	{
 		jboolean iscopy;
 		const char *path_utf = (*env)->GetStringUTFChars(env, path, &iscopy);
-		LOGD("Opening serial port %s", path_utf);
-		fd = open(path_utf, O_RDWR | O_SYNC);
+		LOGD("Opening serial port %s with flags 0x%x", path_utf, O_RDWR | flags);
+		fd = open(path_utf, O_RDWR | flags);
 		LOGD("open() fd = %d", fd);
 		(*env)->ReleaseStringUTFChars(env, path, path_utf);
 		if (fd == -1)
@@ -139,6 +103,7 @@ JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_open
 			/* Throw an exception */
 			LOGE("Cannot open port");
 			/* TODO: throw an exception */
+			return NULL;
 		}
 	}
 
@@ -151,136 +116,52 @@ JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_open
 			LOGE("tcgetattr() failed");
 			close(fd);
 			/* TODO: throw an exception */
+			return NULL;
 		}
 
 		cfmakeraw(&cfg);
 		cfsetispeed(&cfg, speed);
 		cfsetospeed(&cfg, speed);
-		/*******************************/
-  		cfg.c_cflag &= ~CSIZE;
-    		cfg.c_lflag &= ~(ICANON|ECHO|ECHOE|ISIG);
-    		cfg.c_oflag &= ~OPOST;
-		//'8' bit
-        	cfg.c_cflag |= CS8; 
-        	//'N' PARENB
-        	cfg.c_cflag &= ~PARENB;
-		cfg.c_iflag &= ~INPCK;
-  		//'1' STOP
-        	cfg.c_cflag &= ~CSTOPB; 
-
-    		cfg.c_cc[VTIME] = 15; 
-    		cfg.c_cc[VMIN] = 0; 
-    		tcflush(fd, TCIFLUSH);
-		/*********************************/
 
 		if (tcsetattr(fd, TCSANOW, &cfg))
 		{
 			LOGE("tcsetattr() failed");
 			close(fd);
 			/* TODO: throw an exception */
-		}
-	}
-
-
-	return fd;
-}
-/*
- * Class:     cedric_serial_SerialPort
- * Method:    write
- * Signature: ()V
- */
-
-JNIEXPORT jint JNICALL Java_com_android_barcode_SerialPort_write
-  (JNIEnv *env, jobject obj, jint fd, jstring str, jint len)
-{
-	jboolean iscopy;
-	const char *buff_utf = (*env)->GetStringUTFChars(env, str, &iscopy);
-	int wlen = 0;
-	wlen = write(fd, buff_utf, len);
-	if(wlen > 0)
-	{
-		LOGD("Write serial port %s\n", buff_utf);
-	}
-	else
-	{
-		LOGE("Write failed\n");
-	}
-	(*env)->ReleaseStringUTFChars(env, str, buff_utf);
-	LOGD("Write finish!\n");
-	return wlen;
-}
-/*
- * Class:     cedric_serial_SerialPort
- * Method:    read
- * Signature: ()V
- */
-
-JNIEXPORT jbyteArray JNICALL Java_com_android_barcode_SerialPort_read
-  (JNIEnv *env, jobject obj, jint fd, jint len)
-{
-	int reval;
-	int nread = 0;
-	char buff[len];
-	char result[len];
-	struct timeval tv;
-	jbyteArray jba;
-	fd_set rfds;
-
-	while(1)
-	{
-		FD_ZERO(&rfds);
-		FD_SET(fd, &rfds);
-		tv.tv_sec = 0;
-		tv.tv_usec = 100000;
-		if ((reval = select(1 + fd, &rfds, NULL, NULL, &tv)) > 0)
-		{
-			if(FD_ISSET(fd, &rfds))
-			{
-				int temp = read(fd, buff + nread, len);
-				nread += temp;
-				LOGD("%i us is used", 100000 - tv.tv_usec);
-				LOGD("wo have data %d\n", temp);
-			}
-		}
-		else if(reval == 0 && nread != 0)			//timeout means 
-		{
-//			int ffd;
-			buff[nread]=0;
-//			ffd = open("/data/ndk", O_WRONLY | O_TRUNC);
-//			write(ffd, buff, nread);
-//			close(ffd);
-			int i, j;
-			for(i = 0, j = 0; i < nread; i++)
-			{
-				if(buff[i] != 0)
-				{
-					result[j] = buff[i];
-					j++;
-				}
-			//	LOGD("0x%2x ", buff[i]);
-			}
-			//LOGD("\n");
-			//result[j] = 0;
-			jba = (*env)->NewByteArray(env, j);
-			(*env)->SetByteArrayRegion(env, jba, 0, j, result);
-/*			jba = (*env)->NewByteArray(env, nread);
-			(*env)->SetByteArrayRegion(env, jba, 0, nread, buff);*/
-			LOGD("readlength=%d\n, reallength=%d\n, all data received!\n", nread, j);
-			return jba;
-		}
-		else
-		{
 			return NULL;
 		}
 	}
+
+	/* Create a corresponding file descriptor */
+	{
+		jclass cFileDescriptor = (*env)->FindClass(env, "java/io/FileDescriptor");
+		jmethodID iFileDescriptor = (*env)->GetMethodID(env, cFileDescriptor, "<init>", "()V");
+		jfieldID descriptorID = (*env)->GetFieldID(env, cFileDescriptor, "descriptor", "I");
+		mFileDescriptor = (*env)->NewObject(env, cFileDescriptor, iFileDescriptor);
+		(*env)->SetIntField(env, mFileDescriptor, descriptorID, (jint)fd);
+	}
+
+	return mFileDescriptor;
 }
+
 /*
  * Class:     cedric_serial_SerialPort
  * Method:    close
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_com_android_barcode_SerialPort_close
-  (JNIEnv *env, jobject obj, jint fd)
+JNIEXPORT void JNICALL Java_android_1serialport_1api_SerialPort_close
+  (JNIEnv *env, jobject thiz)
 {
-	close(fd);
+	jclass SerialPortClass = (*env)->GetObjectClass(env, thiz);
+	jclass FileDescriptorClass = (*env)->FindClass(env, "java/io/FileDescriptor");
+
+	jfieldID mFdID = (*env)->GetFieldID(env, SerialPortClass, "mFd", "Ljava/io/FileDescriptor;");
+	jfieldID descriptorID = (*env)->GetFieldID(env, FileDescriptorClass, "descriptor", "I");
+
+	jobject mFd = (*env)->GetObjectField(env, thiz, mFdID);
+	jint descriptor = (*env)->GetIntField(env, mFd, descriptorID);
+
+	LOGD("close(fd = %d)", descriptor);
+	close(descriptor);
 }
+

app/jni/SerialPort.h

@@ -0,0 +1,29 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class android_serialport_api_SerialPort */
+
+#ifndef _Included_android_serialport_api_SerialPort
+#define _Included_android_serialport_api_SerialPort
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     android_serialport_api_SerialPort
+ * Method:    open
+ * Signature: (Ljava/lang/String;II)Ljava/io/FileDescriptor;
+ */
+JNIEXPORT jobject JNICALL Java_android_1serialport_1api_SerialPort_open
+  (JNIEnv *, jclass, jstring, jint, jint);
+
+/*
+ * Class:     android_serialport_api_SerialPort
+ * Method:    close
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_android_1serialport_1api_SerialPort_close
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

app/jni/gen_SerialPort_h.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+javah -o SerialPort.h -jni -classpath ../src android_serialport_api.SerialPort
+

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.chaoran"
     android:versionCode="1"
-    android:versionName="V1.077" >
+    android:versionName="V1.078" >
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -23,8 +23,6 @@
     <permission android:name="android.permission.BAIDU_LOCATION_SERVICE" >
     </permission>
 
-    <uses-permission android:name="android.permission.BAIDU_LOCATION_SERVICE" >
-    </uses-permission>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" >
     </uses-permission>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" >
@@ -125,11 +123,6 @@
           		<intent-filter>
 				<action android:name="com.baidu.location.service_v2.9"></action>
 			</intent-filter>
-
-
-
-
-
             -->
         </service>
 

app/src/main/java/android_serialport_api/SerialPort.java

@@ -1,17 +1,19 @@
 package android_serialport_api;
 
 import android.util.Log;
+import com.util.DialogUtil;
+import map.baidu.com.BMapManagerUtil;
 
 import java.io.*;
 
-public class SerialPort {
+public class SerialPort{
 
 	private static final String TAG = "SerialPort";
 	private FileDescriptor mFd;
 	private FileInputStream mFileInputStream;
 	private FileOutputStream mFileOutputStream;
 
-	public SerialPort(File device, int baudrate, int bits, char event, int stop, int flags) throws SecurityException,
+	public SerialPort(File device, int baudrate, int flags) throws SecurityException,
 			IOException {
 
 		if (!device.canRead() || !device.canWrite()) {
@@ -22,17 +24,20 @@ public class SerialPort {
 				su.getOutputStream().write(cmd.getBytes());
 
 				if ((su.waitFor() != 0) || !device.canRead() || !device.canWrite()) {
+					DialogUtil.builder(BMapManagerUtil.getGlobalApplicationContext(),"获取su命令权限失败","系统或许未root",15);
 					throw new SecurityException();
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
+				DialogUtil.builder(BMapManagerUtil.getGlobalApplicationContext(),"获取root权限失败",e.toString(),15);
 				throw new SecurityException();
 			}
 		}
-		mFd = open(device.getAbsolutePath(), baudrate, bits, event, stop, flags);
+		mFd = open(device.getAbsolutePath(), baudrate, flags);
 		Log.i("info", "open device!!");
 		if (mFd == null) {
 			Log.e(TAG, "native open returns null");
+			DialogUtil.builder(BMapManagerUtil.getGlobalApplicationContext(),"获取文件描述符失败","native open returns null",15);
 			throw new IOException();
 		}
 		mFileInputStream = new FileInputStream(mFd);
@@ -50,12 +55,12 @@ public class SerialPort {
 		return mFileOutputStream;
 	}
 
-	private native static FileDescriptor open(String path, int baudrate, int bits, char event, int stop, int flags);
+	private native static FileDescriptor open(String path, int baudrate, int flags);
 
 	public native void close();
 
 	static {
 
-		System.loadLibrary("serialport");
+		System.loadLibrary("serial_port");
 	}
 }

app/src/main/java/com/device/zk_r322a/ZKR322AControl.java

@@ -1,24 +1,18 @@
 package com.device.zk_r322a;
 
+import android_serialport_api.SerialPort;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-
-import android.gpio.GpioJNI;
-import android.util.Log;
-import android_serialport_api.SerialPort;
 
 public class ZKR322AControl {
 	private  SerialPort mSerialPort = null;
-	private  OutputStream mOutputStream = null;
 	private   InputStream mInputStream = null;
-	//private boolean readVal = false;
 
 	public ZKR322AControl() throws SecurityException, IOException {
-		mSerialPort = new SerialPort(new File("/dev/ttyS4"), 115200, 8, 'N', 1,0);
-		mOutputStream = mSerialPort.getOutputStream();
-		mInputStream = mSerialPort.getInputStream();	
+		mSerialPort = new SerialPort(new File("/dev/ttyS1"), 115200,0);
+		mInputStream = mSerialPort.getInputStream();
 	}
 	
 	public String getData() {
@@ -37,19 +31,13 @@ public class ZKR322AControl {
 	}
 	
 	public void start() {
-		//readVal = true;
-	//	GpioJNI.gpio_switch_scan_trig(1);
+//		GpioJNI.gpio_switch_scan_trig(1);
 	}
 	
 	public void stop() {
-		//readVal = false;
-	//	GpioJNI.gpio_switch_scan_trig(0);
+//		GpioJNI.gpio_switch_scan_trig(0);
 	}
 	
-	//public boolean isRead() {
-	//	return readVal;
-	//}
-	
 	public void close() {
 		if (mSerialPort != null) {
 			mSerialPort.close();
@@ -58,7 +46,7 @@ public class ZKR322AControl {
 	
 	
 	public void initScan() {
-	//	GpioJNI.gpio_switch_scan_rf_ired(0);
-	//	GpioJNI.gpio_switch_scan_power(1);
+//		GpioJNI.gpio_switch_scan_rf_ired(0);
+//		GpioJNI.gpio_switch_scan_power(1);
 	}
 }

app/src/main/java/com/example/chaoran/DjtqActivity.java

@@ -1,23 +1,5 @@
 package com.example.chaoran;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.kobjects.base64.Base64;
-
-import com.chaoran.component.MyAdapter;
-import com.chaoran.entiry.DataGrid;
-import com.chaoran.entiry.Djselefa;
-import com.example.chaoran.R;
-import com.util.DialogUtil;
-import com.util.IoUtil;
-import com.util.SqlUtil;
-import com.util.SysUtil;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -27,11 +9,26 @@ import android.os.Message;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.ListView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.TextView;
+import com.chaoran.component.MyAdapter;
+import com.chaoran.entiry.DataGrid;
+import com.chaoran.entiry.Djselefa;
+import com.util.DialogUtil;
+import com.util.IoUtil;
+import com.util.SqlUtil;
+import com.util.SysUtil;
+import org.kobjects.base64.Base64;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * 单据提取窗口
+ */
 public class DjtqActivity extends Activity {
 	private ListView listview;
 	private int cur_pos = -1;// 当前显示的一行

app/src/main/java/com/example/chaoran/ExitThread.java

@@ -11,6 +11,9 @@ import android.util.Log;
 
 import com.sys.SysData;
 
+/**
+ * 退出线程
+ */
 public class ExitThread extends Thread {
 	public String gzid;
 	public String mxTempTable;

app/src/main/java/com/example/chaoran/MainActivity.java

@@ -1,64 +1,23 @@
 package com.example.chaoran;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Properties;
-
-import org.ksoap2.SoapEnvelope;
-import org.ksoap2.serialization.SoapObject;
-import org.ksoap2.serialization.SoapSerializationEnvelope;
-import org.ksoap2.transport.HttpTransportSE;
-import org.xmlpull.v1.XmlPullParserException;
-
-import com.chaoran.db.DBManager;
-import com.chaoran.db.SqlHelpUtil;
-import com.chaoran.entiry.UpdataInfo;
-import com.chaoran.entiry.UserList;
-import com.chaoran.lx.activity.DownDataActivity;
-import com.chaoran.thread.DownApk;
-import com.example.chaoran.R;
-import com.honeywell.aidc.AidcManager;
-import com.honeywell.aidc.AidcManager.CreatedCallback;
-import com.honeywell.aidc.BarcodeReader;
-import com.sys.SysData;
-import com.util.DialogUtil;
-import com.util.Dom4jUtil;
-import com.util.InstallUtil;
-import com.util.IoUtil;
-import com.util.SysUtil;
-
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.ProgressDialog;
 import android.app.AlertDialog.Builder;
-import android.content.Context;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -67,7 +26,29 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
+import com.chaoran.db.DBManager;
+import com.chaoran.db.SqlHelpUtil;
+import com.chaoran.entiry.UpdataInfo;
+import com.chaoran.entiry.UserList;
+import com.chaoran.lx.activity.DownDataActivity;
+import com.chaoran.thread.DownApk;
+import com.honeywell.aidc.AidcManager;
+import com.honeywell.aidc.AidcManager.CreatedCallback;
+import com.honeywell.aidc.BarcodeReader;
+import com.sys.SysData;
+import com.util.*;
+import org.ksoap2.SoapEnvelope;
+import org.ksoap2.serialization.SoapObject;
+import org.ksoap2.serialization.SoapSerializationEnvelope;
+import org.ksoap2.transport.HttpTransportSE;
 
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * 主活动窗口
+ */
 public class MainActivity extends Activity {
 	SqlHelpUtil db;
 	SQLiteDatabase sDatabase;
@@ -103,8 +84,6 @@ public class MainActivity extends Activity {
 				DialogUtil.builder(MainActivity.this, "错误信息", "更新文件失败！",0);
 			} else if (msg.what == 1) {
 				UpdataInfo info = (UpdataInfo) msg.obj;
-				System.out.println(info+"---------------------");
-				System.out.println(versionStr+"---------------------");
 				if (info!=null&&!info.getVersion().equals(versionStr)) {
 					showUpdataDialog(info);
 				}
@@ -115,7 +94,6 @@ public class MainActivity extends Activity {
 					DialogUtil.builder(MainActivity.this, "提示信息", "该功能未授权！",0);
 				} else {
 					UserList user = (UserList) msg.obj;
-					// System.out.println(so.hasProperty("lgnname"));
 					if (user.getLgnname() == null) {
 						String udesc = user.getUdesc();
 						if (udesc.equals("0")) {
@@ -136,29 +114,8 @@ public class MainActivity extends Activity {
 						}
 
 					} else {
-						// SysData.username=
-						// so.getProperty("username").toString().trim();
 						SysData.is_lx = false;
 						login_end(user);
-						// SysData.jigid = user.getJigid();
-						// SysData.lgnname = user.getLgnname();
-						// SysData.userid = String.valueOf(user.getUserid());
-						// SysData.scale = MainActivity.this.getResources()
-						// .getDisplayMetrics().density + 1;
-						// SharedPreferences sp = MainActivity.this
-						// .getSharedPreferences("userTxt", MODE_PRIVATE);
-						// Editor editor = sp.edit();
-						// editor.putString("name", name.getText().toString()
-						// .trim());
-						// editor.putString("pwd",
-						// pwd.getText().toString().trim());
-						// editor.commit();
-						// Intent intent = new Intent();
-						// intent.putExtra("displaymode",
-						// user.getDisplaymode());
-						// intent.setClass(getApplicationContext(),
-						// DjActivity.class);
-						// startActivity(intent);
 					}
 				}
 			}
@@ -185,16 +142,10 @@ public class MainActivity extends Activity {
 		SysData.lgnname = user.getLgnname();
 		SysData.userid = String.valueOf(user.getUserid());
 		SysData.scale = MainActivity.this.getResources().getDisplayMetrics().density + 1;
-		//SysData.t_scale = MainActivity.this.getResources().getDisplayMetrics().densityDpi >= 200f ? 200f / MainActivity.this.getResources().getDisplayMetrics().densityDpi : 200f * 0.95f / MainActivity.this.getResources().getDisplayMetrics().densityDpi;
 		SysData.t_scale = MainActivity.this.getResources().getDisplayMetrics().densityDpi >= 300f ? 1 : 300f * def_pbl / MainActivity.this.getResources().getDisplayMetrics().densityDpi;
 		SysData.exectime=Integer.parseInt(user.getUdesc() == null ? "60" : user.getUdesc());
-		System.out.println(SysData.exectime+"---------------------------------------SysData.exectime");
 		SharedPreferences sp = MainActivity.this.getSharedPreferences(
 				"userTxt", MODE_PRIVATE);
-		// Editor editor = sp.edit();
-		// editor.putString("name", name.getText().toString().trim());
-		// editor.putString("pwd", pwd.getText().toString().trim());
-		// editor.commit();
 		if (checkBox.isChecked()) {
 			Editor editor = sp.edit();
 			editor.putString("name", name.getText().toString().trim());
@@ -245,8 +196,6 @@ public class MainActivity extends Activity {
 		TextView version = (TextView) findViewById(R.id.version);
 		versionStr=getVersionName();
 		version.setText("版本".concat(versionStr));
-		// SysData.clientid = Secure.getString(getContentResolver(),
-		// Secure.ANDROID_ID);
 		SysData.clientid = SysUtil.getLocalMacAddress(MainActivity.this);
 		db = new SqlHelpUtil(getApplicationContext());
 		sDatabase = db.getWritableDatabase();
@@ -269,7 +218,6 @@ public class MainActivity extends Activity {
 			new Thread(new CheckVersionTask()).start();
 			new Thread(queryZcrq).start();
 		}
-		//
 		BufferedReader br = null;
 		BufferedWriter bw = null;
 		File file = new File(getFilesDir().getAbsolutePath() + "/cr_pda_config");
@@ -311,7 +259,6 @@ public class MainActivity extends Activity {
 				}
 			}
 		}
-		//
 		if ("scanpal eda50".equals(android.os.Build.MODEL.toLowerCase())) {
 	        AidcManager.create(this, new CreatedCallback() {
 	
@@ -339,10 +286,6 @@ public class MainActivity extends Activity {
 		public void run() {
 			try {
 				String url = SysData.url + "/webservice/ServiceInterface?wsdl";
-				// System.out
-				// .println(url
-				// +
-				// "--------------============================================");
 				String method = "regEndRq";
 				SoapObject rpc = new SoapObject("", method);
 				HttpTransportSE ht = new HttpTransportSE(url, SysData.timeout);
@@ -391,27 +334,15 @@ public class MainActivity extends Activity {
 	public void onset(View v) {
 		Intent intent = new Intent();
 		intent.setClass(this, NetWorkSet.class);
-		// intent.setClass(getApplicationContext(), BDMapActivity.class);
 		startActivity(intent);
-		// startActivityForResult(intent,0);
 	}
 	
 	public void onopentest(View v) {
 		DialogUtil.builder(this, "测试标题","测试内容！open" + v.getLeft(), 18);
-//		ScanManager sm = (ScanManager) getSystemService("olc_service_scan");
-//		
-//		sm.setScanSwitchLeft(false);
-//		sm.setScanSwitchRight(false);
-//		sm.setScanSwitchMiddle(false);
 	}
 	
 	public void onclosetest(View v) {
 		DialogUtil.builder(this, "测试标题","测试内容！close" + v.getLeft(), 18);
-//		ScanManager sm = (ScanManager) getSystemService("olc_service_scan");
-//		
-//		sm.setScanSwitchLeft(true);
-//		sm.setScanSwitchRight(true);
-//		sm.setScanSwitchMiddle(true);
 	}
 
 	// 设置按钮监听
@@ -445,10 +376,6 @@ public class MainActivity extends Activity {
 
 	// 设置按钮监听
 	public void onsub(View v) {
-		// if (SysData.url == null) {
-		// DialogUtil.builder(this, "错误信息", "请检查网络！");
-		// return;
-		// }
 		loginTy = 1;
 		start_login();
 	}
@@ -482,20 +409,12 @@ public class MainActivity extends Activity {
 			DialogUtil.setDialog(pd, "提示", "正在登录……");
 		}
 
-	//	DialogUtil.setDialog(pd, "提示", "" + MainActivity.this.getResources().getDisplayMetrics().densityDpi);
 		new Thread(downloadRun).start();
 	}
 
 	public void login(String name, String pwd) {
-		// WifiManager wifiManager=(WifiManager)
-		// this.getSystemService(Context.WIFI_SERVICE);
-		// wifiManager.disconnect();
-		// wifiManager.reconnect();
 		try {
 			String url = SysData.url + "/webservice/ServiceInterface?wsdl";
-			// System.out
-			// .println(url
-			// + "--------------============================================");
 			String method = "login";
 			SoapObject rpc = new SoapObject("", method);
 			rpc.addProperty("name", name);
@@ -510,10 +429,6 @@ public class MainActivity extends Activity {
 			envelope.setOutputSoapObject(rpc);
 			ht.call("", envelope);
 			if (envelope.getResponse() != null) {
-				// SoapObject result = (SoapObject) envelope.bodyIn;
-				// SoapObject soapChilds = (SoapObject) result.getProperty(0);
-				// System.out.println(soapChilds+"---"+soapChilds.getProperty("jigid"));
-				// System.out.println(soapChilds.getProperty("jigid"));
 				byte[] bb = org.kobjects.base64.Base64.decode(envelope
 						.getResponse().toString());
 				Message message = new Message();
@@ -601,16 +516,13 @@ public class MainActivity extends Activity {
 			HttpURLConnection conn = null;
 			try {
 				String path = SysData.url + "/apk.xml";
-				System.out.println(path+"----------------------");
 				URL url = new URL(path);
 				conn = (HttpURLConnection) url.openConnection();
 				conn.setConnectTimeout(5000);
 				if (conn.getResponseCode() == 200) {
 					is = conn.getInputStream();
-					// UpdataInfo info = getUpdataInfo(is);
 					Message msg = new Message();
 					msg.what = 1;
-					System.out.println(versionStr);
 					msg.obj = Dom4jUtil.parserXml(is,versionStr);
 					handler.sendMessage(msg);
 				}
@@ -637,9 +549,6 @@ public class MainActivity extends Activity {
 		case R.id.lxdatadown:
 			loginTy = 2;
 			start_login();
-			// Intent intent = new Intent();
-			// intent.setClass(getApplicationContext(), DownDataActivity.class);
-			// startActivity(intent);
 			break;
 		case R.id.lxlogin:
 			if (!isNull()) {
@@ -687,8 +596,7 @@ public class MainActivity extends Activity {
 	 * 该方法解决屏幕旋转程序崩溃，需要对应 AndroidManifest.xml 文件 android:configChanges="orientation|screenSize|keyboardHidden" 配置
 	 */
 	public void onConfigurationChanged(Configuration newConfig) {  
-	    // TODO Auto-generated method stub  
-	    super.onConfigurationChanged(newConfig);  
+	    super.onConfigurationChanged(newConfig);
 	    if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {  
 	        Toast.makeText(this, "转换横屏", Toast.LENGTH_SHORT).show();  
 	    } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {  

app/src/main/java/com/example/chaoran/MenuActivity.java

@@ -1,34 +1,31 @@
 package com.example.chaoran;
 
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Menu;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import com.sys.SysData;
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
 import org.ksoap2.serialization.SoapSerializationEnvelope;
 import org.ksoap2.transport.HttpTransportSE;
 
+import java.io.ByteArrayInputStream;
+import java.io.ObjectInputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
-import com.chaoran.entiry.DanJuEntity;
-import com.example.chaoran.R;
-import com.sys.SysData;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.app.Activity;
-import android.content.Intent;
-import android.view.Menu;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.AdapterView.OnItemClickListener;
-
+/**
+ * 菜单窗口
+ */
 public class MenuActivity extends Activity {
 	private ListView listView; 
 	private List mData; 

app/src/main/java/com/example/chaoran/NetWorkSet.java

@@ -33,6 +33,9 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
+/**
+ * 网络相关窗口
+ */
 @SuppressLint("NewApi")
 public class NetWorkSet extends Activity {
 	private EditText ip;

app/src/main/java/com/example/chaoran/ParamActivity.java

@@ -1,28 +1,25 @@
 package com.example.chaoran;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+import android.widget.TextView;
+import com.chaoran.component.MyAdapter;
+import com.chaoran.entiry.DataGrid;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-
-import com.chaoran.component.MyAdapter;
-import com.chaoran.entiry.DataGrid;
-import com.example.chaoran.R;
-import com.util.DialogUtil;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Color;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
 
+/**
+ * 参数窗口
+ */
 public class ParamActivity extends Activity {
 	private ListView listView;
 	private List listdata;

app/src/main/java/com/example/chaoran/PdaRegActivity.java

@@ -22,6 +22,9 @@ import android.view.Menu;
 import android.view.View;
 import android.widget.EditText;
 
+/**
+ * pda注册窗口
+ */
 public class PdaRegActivity extends Activity {
 	private EditText ip;
 	private EditText port;

app/src/main/java/com/example/chaoran/RunSearchThread.java

@@ -1,23 +1,18 @@
 package com.example.chaoran;
 
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-import java.util.HashMap;
-import java.util.Map;
-
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import com.chaoran.entiry.DataGrid;
+import com.sys.SysData;
+import com.util.IoUtil;
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
 import org.ksoap2.serialization.SoapSerializationEnvelope;
 import org.ksoap2.transport.HttpTransportSE;
 
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-import com.chaoran.entiry.DataGrid;
-import com.chaoran.entiry.Sys_DanJuFormsOptions;
-import com.sys.SysData;
-import com.util.IoUtil;
+import java.util.HashMap;
+import java.util.Map;
 
 /*运行检索方案线程*/
 public class RunSearchThread extends Thread {

app/src/main/java/com/example/chaoran/RunYmupThread.java

@@ -1,20 +1,14 @@
 package com.example.chaoran;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.ksoap2.SoapEnvelope;
-import org.ksoap2.serialization.SoapObject;
-import org.ksoap2.serialization.SoapSerializationEnvelope;
-import org.ksoap2.transport.HttpTransportSE;
-
-import com.chaoran.entiry.DataGrid;
-import com.sys.SysData;
-import com.util.IoUtil;
-
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import com.sys.SysData;
+import com.util.IoUtil;
+import org.ksoap2.SoapEnvelope;
+import org.ksoap2.serialization.SoapObject;
+import org.ksoap2.serialization.SoapSerializationEnvelope;
+import org.ksoap2.transport.HttpTransportSE;
 
 public class RunYmupThread extends Thread {
 	private String param;

app/src/main/java/com/example/chaoran/SearchThread.java

@@ -10,6 +10,9 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
+/**
+ * 搜索线程
+ */
 public class SearchThread extends Thread {
 	private String fangalx;
 	private String functionname;

app/src/main/java/com/example/chaoran/UpdatePwdActivity.java

@@ -1,28 +1,19 @@
 package com.example.chaoran;
 
-import java.io.File;
-
-import org.ksoap2.serialization.SoapObject;
-
-import com.chaoran.entiry.UpdataInfo;
-import com.chaoran.thread.UpdatePwdThread;
-import com.example.chaoran.R;
-import com.sys.SysData;
-import com.util.DialogUtil;
-import com.util.InstallUtil;
-
-import android.R.color;
+import android.app.Activity;
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.graphics.Color;
-import android.view.Menu;
 import android.view.View;
 import android.widget.EditText;
+import com.chaoran.thread.UpdatePwdThread;
+import com.sys.SysData;
+import com.util.DialogUtil;
 
+/**
+ * 更新密码窗口
+ */
 public class UpdatePwdActivity extends Activity {
     private EditText newPwd;
     private EditText CfNewPwd;

app/src/main/java/com/jiebao/h518/scan/NewScanControler.java

@@ -15,7 +15,7 @@ public class NewScanControler {
 	private InputStream mInputStream;
 
 	public NewScanControler() throws SecurityException, IOException {
-		mSerialPort = new SerialPort(new File("/dev/ttySAC1"), 9600, 8, 'N', 1,
+		mSerialPort = new SerialPort(new File("/dev/ttySAC1"), 9600,
 				0);
 		mOutputStream = mSerialPort.getOutputStream();
 		mInputStream = mSerialPort.getInputStream();

app/src/main/java/com/util/DjUtil.java

@@ -1,32 +1,18 @@
 package com.util;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.chaoran.entiry.PhotographUi;
-import com.chaoran.entiry.SelfCheckBox;
-import com.chaoran.entiry.SelfEditText;
-import com.chaoran.entiry.SelfImage;
-import com.chaoran.entiry.SelfTextBut;
-import com.chaoran.imp.InputInterface;
-import com.chaoran.thread.ImageUrl;
-
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
 import android.os.Handler;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TabHost;
-import android.widget.TextView;
+import com.chaoran.entiry.PhotographUi;
+import com.chaoran.entiry.SelfCheckBox;
+import com.chaoran.entiry.SelfImage;
+import com.chaoran.imp.InputInterface;
+import com.chaoran.thread.ImageUrl;
+
+import java.util.*;
 
 /*
  * 单据工具类
@@ -167,11 +153,6 @@ public class DjUtil {
 		for (String s : set) {
 			view = layout.findViewWithTag(s);
 			if (view != null) {
-				// if (view instanceof SelfEditText) {
-				// ((SelfEditText) view).setText(map.get(s).toString().trim());
-				// } else if (view instanceof TextView) {
-				// ((TextView) view).setText(map.get(s).toString().trim());
-				// }
 				setText(view, map.get(s).toString().trim(), imgHandler, -1, -1);
 				list.add(s);
 			}

app/src/main/java/map/baidu/com/BMapManagerUtil.java

@@ -1,6 +1,7 @@
 package map.baidu.com;
 
 import android.app.Application;
+import android.content.Context;
 import android.widget.Toast;
 import com.baidu.mapapi.BMapManager;
 import com.baidu.mapapi.MKEvent;
@@ -57,5 +58,9 @@ public class BMapManagerUtil extends Application {
 		}
 		super.onTerminate();
 	}
+
+	public static Context getGlobalApplicationContext(){
+		return bMapManagerUtil.getApplicationContext();
+	}
      
 }