修改苏净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

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

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 15
         versionCode 1
-        versionName "V1.077"
+        versionName "V1.079"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,5 +42,5 @@ android {
 
 dependencies {
     //加载jar包
-    compile fileTree(dir: 'libs', include: ['*.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,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="com.activity.chaoran">
+    package="com.example.chaoran"
+    android:versionCode="1"
+    android:versionName="V1.078" >
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -14,16 +15,14 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"
-            tools:ignore="ProtectedPermissions" />
+    <!-- <uses-permission android:name="android.permission.DEVICE_POWER" /> -->
+<!--    <uses-permission android:name="android.permission.WRITE_SETTINGS" />-->
     <uses-permission android:name="android.permission.READ_SETTINGS" />
 
     <!-- 百度定位服务权限 -->
     <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" >
@@ -34,12 +33,10 @@
     </uses-permission>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
     </uses-permission>
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-            tools:ignore="ProtectedPermissions">
-    </uses-permission>
-    <uses-permission android:name="android.permission.READ_LOGS"
-            tools:ignore="ProtectedPermissions">
-    </uses-permission>
+<!--    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" >-->
+<!--    </uses-permission>-->
+<!--    <uses-permission android:name="android.permission.READ_LOGS" >-->
+<!--    </uses-permission>-->
 
     <!-- 百度地图API权限 -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" >
@@ -50,6 +47,8 @@
     </uses-permission>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" >
     </uses-permission>
+    
+    <!--  -->
     <uses-permission android:name="com.honeywell.decode.permission.DECODE" />
 
     <application
@@ -58,10 +57,11 @@
         android:label="@string/app_name"
         android:persistent="true"
         android:theme="@style/AppTheme" >
+		<!-- <uses-library android:name="com.sprint.hardware.twinCamDevice" android:required="false"/> -->
         <uses-library android:name="android.scanner.library" android:required="false" />
 
         <activity
-            android:name="com.activity.chaoran.MainActivity"
+            android:name="com.example.chaoran.MainActivity"
             android:label="@string/title_activity_main"
             android:screenOrientation="behind" 
             android:configChanges="orientation|screenSize|keyboardHidden">
@@ -73,36 +73,37 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.activity.chaoran.NetWorkSet"
+            android:name="com.example.chaoran.NetWorkSet"
             android:label="@string/title_activity_net_work_set"
             android:screenOrientation="behind" >
         </activity>
         <activity
-            android:name="com.activity.chaoran.MenuActivity"
+            android:name="com.example.chaoran.MenuActivity"
             android:label="@string/title_activity_menu"
             android:screenOrientation="behind" >
         </activity>
         <activity
-            android:name="com.activity.chaoran.DjActivity"
+            android:name="com.example.chaoran.DjActivity"
             android:label="@string/title_activity_dj"
             android:screenOrientation="behind" 
             android:launchMode="singleTask">
         </activity>
         <activity
-            android:name="com.activity.chaoran.ParamActivity"
+            android:name="com.example.chaoran.ParamActivity"
             android:label="@string/title_activity_param"
             android:screenOrientation="behind" >
         </activity>
         <activity
-            android:name="com.activity.chaoran.DjtqActivity"
+            android:name="com.example.chaoran.DjtqActivity"
             android:label="@string/djtq_activity"
             android:screenOrientation="behind" >
         </activity>
         <activity
-            android:name="com.activity.chaoran.UpdatePwdActivity"
+            android:name="com.example.chaoran.UpdatePwdActivity"
             android:label="@string/title_activity_update_pwd"
             android:screenOrientation="behind" >
         </activity>
+        <!-- android:hardwareAccelerated="false"  android:hardwareAccelerated="false"  硬件加速3.0以上才有 -->
         <activity
             android:name="map.baidu.com.BDMapActivity"
             android:hardwareAccelerated="false"
@@ -117,6 +118,12 @@
             android:name="com.baidu.location.f"
             android:enabled="true"
             android:process=":remote" >
+
+            <!--
+          		<intent-filter>
+				<action android:name="com.baidu.location.service_v2.9"></action>
+			</intent-filter>
+            -->
         </service>
 
         <activity
@@ -130,13 +137,13 @@
             android:screenOrientation="behind" >
         </activity>
         <activity
-            android:name="com.activity.chaoran.MipcaActivityCapture"
+            android:name="com.example.chaoran.MipcaActivityCapture"
             android:label="@string/title_activity_camera_scan"
             android:screenOrientation="behind"
             android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
         <activity
-            android:name="com.activity.chaoran.PdaRegActivity"
+            android:name="com.example.chaoran.PdaRegActivity"
             android:label="@string/title_activity_pda_reg" >
         </activity>
     </application>

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/chaoran/component/ButAdapter.java

@@ -5,10 +5,13 @@ import java.util.HashMap;
 
 import com.chaoran.db.DBManager;
 import com.chaoran.lx.activity.DownDataActivity;
-import com.activity.chaoran.R;
+import com.example.chaoran.DjActivity;
+import com.example.chaoran.R;
 
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/chaoran/component/ImageAdpter.java

@@ -1,17 +1,23 @@
 package com.chaoran.component;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.example.chaoran.R;
+
 import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.GridView;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.activity.chaoran.R;
-
-import java.util.List;
-import java.util.Map;
 
 public class ImageAdpter extends BaseAdapter {
 	private List list;

app/src/main/java/com/chaoran/component/MyAdapter.java

@@ -4,7 +4,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import com.chaoran.entiry.Zujian;
-import com.activity.chaoran.R;
+import com.example.chaoran.DjActivity;
+import com.example.chaoran.R;
 import com.util.DialogUtil;
 import com.util.SysUtil;
 

app/src/main/java/com/chaoran/db/DBManager.java

@@ -1,11 +1,20 @@
 package com.chaoran.db;
 
+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 java.util.Set;
+
+import com.chaoran.entiry.DanJuEntity;
+
+import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import java.util.*;
-
 public class DBManager {
 	private SqlHelpUtil helper;
 	private SQLiteDatabase db;

app/src/main/java/com/chaoran/entiry/PhotographUi.java

@@ -1,9 +1,21 @@
 package com.chaoran.entiry;
 
+import com.example.chaoran.MainActivity;
+import com.util.DialogUtil;
+import com.util.SysUtil;
+
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
 import android.view.Gravity;
+import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 public class PhotographUi extends LinearLayout {

app/src/main/java/com/chaoran/entiry/SelfCheckBox.java

@@ -1,6 +1,6 @@
 package com.chaoran.entiry;
 
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 
 import android.content.Context;
 import android.util.TypedValue;

app/src/main/java/com/chaoran/entiry/SelfDateField.java

@@ -16,7 +16,7 @@ import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 
 import com.chaoran.imp.InputInterface;
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 
 public class SelfDateField extends RelativeLayout implements InputInterface {
 	private SelfEditText et;

app/src/main/java/com/chaoran/entiry/SelfTextBut.java

@@ -2,10 +2,16 @@ package com.chaoran.entiry;
 
 import com.chaoran.imp.InputInterface;
 
+import com.example.chaoran.R;
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.text.Editable;
 import android.util.TypedValue;
+import android.view.Gravity;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.RelativeLayout;
 
 public class SelfTextBut extends RelativeLayout implements InputInterface {

app/src/main/java/com/chaoran/entiry/Test.java

@@ -0,0 +1,25 @@
+package com.chaoran.entiry;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class Test {
+    public static void main(String[] args) {
+    	 Map<String, String> m=new HashMap<String, String>();
+		 m.put("a","1");
+		 m.put("b","2");
+		 m.put("c","3");
+		 Set<String> set=m.keySet();
+		 for(String a:set){
+			 System.out.println(a+"---");
+			 if(a.equals("a")){
+				 //set.remove(a);
+			 }
+		 }
+		 Set<String> set1=m.keySet();
+		 for(String b:set1){
+			 System.out.println(b);
+		 }
+	}
+}

app/src/main/java/com/chaoran/entiry/Zujian.java

@@ -1,5 +1,6 @@
 package com.chaoran.entiry;
 
+import android.widget.ImageView;
 import android.widget.TextView;
 
 public class Zujian {

app/src/main/java/com/chaoran/listener/ImageClickListener.java

@@ -1,19 +1,23 @@
 package com.chaoran.listener;
 
 import android.app.Activity;
+import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.drawable.BitmapDrawable;
 import android.view.Display;
 import android.view.Gravity;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 
 import com.chaoran.entiry.SelfImage;
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 
 public class ImageClickListener implements OnClickListener {
 	private Activity activity;

app/src/main/java/com/chaoran/listener/PzClickListener.java

@@ -4,10 +4,11 @@ import java.io.File;
 import java.io.IOException;
 
 import com.chaoran.entiry.PhotographUi;
-import com.activity.chaoran.DjActivity;
+import com.example.chaoran.DjActivity;
 import com.util.DialogUtil;
 import com.util.SysUtil;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.MediaStore;

app/src/main/java/com/chaoran/lx/activity/DownDataActivity.java

@@ -4,13 +4,19 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
 
+import org.kobjects.base64.Base64;
+
 import com.chaoran.component.ButAdapter;
 import com.chaoran.db.DBManager;
 import com.chaoran.lx.thread.LxDataDownThread;
-import com.activity.chaoran.R;
-import com.activity.chaoran.RunYmupThread;
+import com.example.chaoran.R;
+import com.example.chaoran.RunYmupThread;
+import com.example.chaoran.R.id;
+import com.example.chaoran.R.layout;
 import com.util.DialogUtil;
+import com.util.IoUtil;
 
+import android.R.integer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;

app/src/main/java/com/chaoran/lx/activity/Lx_Param_Activity.java

@@ -10,7 +10,10 @@ import org.dom4j.DocumentException;
 import com.chaoran.entiry.DanJuEntity;
 import com.chaoran.entiry.Sys_DanJuFormsOptions;
 import com.chaoran.thread.DownDJRun;
-import com.activity.chaoran.R;
+import com.example.chaoran.DjActivity;
+import com.example.chaoran.R;
+import com.example.chaoran.R.layout;
+import com.example.chaoran.R.menu;
 import com.util.DialogUtil;
 import com.util.IoUtil;
 import com.util.LxParamPageCreate;

app/src/main/java/com/chaoran/lx/thread/LxDJNrThread.java

@@ -1,13 +1,22 @@
 package com.chaoran.lx.thread;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.StreamCorruptedException;
+import java.util.HashMap;
+import java.util.List;
+
 import android.database.Cursor;
 import android.os.Handler;
 import android.os.Message;
+
 import com.chaoran.db.DBManager;
+import com.chaoran.entiry.DanJuEntity;
 import com.chaoran.entiry.Sys_DanJuFormsOptions;
 import com.util.DateUtil;
 
-import java.util.HashMap;
+import flex.messaging.io.ArrayList;
 
 public class LxDJNrThread implements Runnable {
 	private DBManager dbManager;

app/src/main/java/com/chaoran/lx/thread/LxDataDownThread.java

@@ -1,21 +1,25 @@
 package com.chaoran.lx.thread;
 
-import android.app.ProgressDialog;
-import android.os.Handler;
-import android.os.Message;
-import android.widget.TextView;
-import com.chaoran.db.DBManager;
-import com.sys.SysData;
-import com.util.IoUtil;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import org.kobjects.base64.Base64;
 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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import com.chaoran.db.DBManager;
+import com.sys.SysData;
+import com.util.IoUtil;
+
+import android.app.ProgressDialog;
+import android.os.Handler;
+import android.os.Message;
+import android.widget.TextView;
 
 public class LxDataDownThread implements Runnable {
 	private Handler handler;

app/src/main/java/com/chaoran/thread/UpdatePwdThread.java

@@ -1,12 +1,17 @@
 package com.chaoran.thread;
 
-import android.os.Handler;
-import android.os.Message;
-import com.sys.SysData;
+import java.io.IOException;
+
 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.sys.SysData;
+
+import android.os.Handler;
+import android.os.Message;
 public class UpdatePwdThread implements Runnable {
 	private Handler handler;
 	private String  userid;

app/src/main/java/com/cr5w/scan/CR5WScanControl.java

@@ -32,7 +32,9 @@ public class CR5WScanControl {
 						}
 						sleep(500);
 					}
+//					init(context);
 				} catch (Exception e) {
+					e.printStackTrace();
 				}
 			}
 

app/src/main/java/com/cr5w/scan/ScanHelper.java

@@ -1,6 +1,10 @@
 package com.cr5w.scan;
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
 import android.provider.Settings;
 public class ScanHelper {
 	/** scan settings show 0 : no; 1 : yes*/

app/src/main/java/com/cr5w/scan/aht70/ScanHelper.java

@@ -1,7 +1,11 @@
 package com.cr5w.scan.aht70;
 
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
 import android.provider.Settings;
 public class ScanHelper {
 	/** scan settings show 0 : no; 1 : yes*/

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,19 +1,4 @@
-package com.activity.chaoran;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.kobjects.base64.Base64;
-
-import com.chaoran.component.MyAdapter;
-import com.chaoran.entiry.DataGrid;
-import com.chaoran.entiry.Djselefa;
-import com.activity.chaoran.R;
-import com.util.DialogUtil;
-import com.util.IoUtil;
-import com.util.SqlUtil;
-import com.util.SysUtil;
+package com.example.chaoran;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -24,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

@@ -1,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
@@ -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,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -46,6 +46,9 @@ import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+/**
+ * 主活动窗口
+ */
 public class MainActivity extends Activity {
 	SqlHelpUtil db;
 	SQLiteDatabase sDatabase;
@@ -57,13 +60,13 @@ public class MainActivity extends Activity {
 	private int loginTy;// 登录类型,1为在线登录 2为离线数据下载
 	private TextView regts;
 	public String versionStr;
-
+	
 	public static float def_pbl = 0.9f; // 屏幕比列
-
+	
 	//Honeywell 扫描设备控制
     private static BarcodeReader barcodeReader = null;
     private AidcManager manager = null;
-
+	
 	private Handler handler = new Handler() {
 		@Override
 		// 当有消息发送出来的时候就执行Handler的这个方法
@@ -208,6 +211,7 @@ public class MainActivity extends Activity {
 		select_cursor = sDatabase.rawQuery(selectStr, null);
 		if (select_cursor.moveToFirst()) {
 			SysData.isreg = select_cursor.getString(0);
+			System.out.println(SysData.isreg+"---------------------");
 		}
 		select_cursor.close();
 		if (SysData.url != null) {
@@ -218,8 +222,8 @@ public class MainActivity extends Activity {
 		BufferedWriter bw = null;
 		File file = new File(getFilesDir().getAbsolutePath() + "/cr_pda_config");
 		try {
-	        if (!file.exists())
-	        	file.createNewFile();
+	        if (!file.exists())  
+	        	file.createNewFile(); 
 	        FileInputStream fis = new FileInputStream(file);
 			InputStreamReader isr = new InputStreamReader(fis);
 			br = new BufferedReader(isr);
@@ -257,7 +261,7 @@ public class MainActivity extends Activity {
 		}
 		if ("scanpal eda50".equals(android.os.Build.MODEL.toLowerCase())) {
 	        AidcManager.create(this, new CreatedCallback() {
-
+	
 	            @Override
 	            public void onCreated(AidcManager aidcManager) {
 	                manager = aidcManager;
@@ -267,7 +271,7 @@ public class MainActivity extends Activity {
 		}
 
 	}
-
+	
     public static BarcodeReader getBarcodeObject() {
         return barcodeReader;
     }
@@ -332,11 +336,11 @@ public class MainActivity extends Activity {
 		intent.setClass(this, NetWorkSet.class);
 		startActivity(intent);
 	}
-
+	
 	public void onopentest(View v) {
 		DialogUtil.builder(this, "测试标题","测试内容！open" + v.getLeft(), 18);
 	}
-
+	
 	public void onclosetest(View v) {
 		DialogUtil.builder(this, "测试标题","测试内容！close" + v.getLeft(), 18);
 	}
@@ -344,6 +348,7 @@ public class MainActivity extends Activity {
 	// 设置按钮监听
 	public void onRotation(View v) {
 		int i = MainActivity.this.getRequestedOrientation();
+		// name.setText(i+"--"+ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT+"--"+ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 		if (i == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
 			MainActivity.this
 					.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -403,6 +408,7 @@ public class MainActivity extends Activity {
 		} else {
 			DialogUtil.setDialog(pd, "提示", "正在登录……");
 		}
+
 		new Thread(downloadRun).start();
 	}
 
@@ -515,10 +521,8 @@ public class MainActivity extends Activity {
 				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);
 				}
@@ -587,13 +591,16 @@ public class MainActivity extends Activity {
 		}
 		return true;
 	}
-
-	public void onConfigurationChanged(Configuration newConfig) {
+	
+	/**
+	 * 该方法解决屏幕旋转程序崩溃，需要对应 AndroidManifest.xml 文件 android:configChanges="orientation|screenSize|keyboardHidden" 配置
+	 */
+	public void onConfigurationChanged(Configuration newConfig) {  
 	    super.onConfigurationChanged(newConfig);
-	    if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-	        Toast.makeText(this, "转换横屏", Toast.LENGTH_SHORT).show();
-	    } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-	        Toast.makeText(this, "转换竖屏", Toast.LENGTH_SHORT).show();
-	    }
-	}
+	    if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {  
+	        Toast.makeText(this, "转换横屏", Toast.LENGTH_SHORT).show();  
+	    } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {  
+	        Toast.makeText(this, "转换竖屏", Toast.LENGTH_SHORT).show();  
+	    }  
+	} 
 }

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

@@ -1,4 +1,21 @@
-package com.activity.chaoran;
+package com.example.chaoran;
+
+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;
@@ -6,27 +23,9 @@ import java.util.ArrayList;
 import java.util.List;
 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.activity.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/MipcaActivityCapture.java

@@ -1,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 
 import java.io.IOException;
@@ -13,6 +13,7 @@ import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnCompletionListener;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Vibrator;
 import android.view.SurfaceHolder;
 import android.view.SurfaceHolder.Callback;
 import android.view.SurfaceView;
@@ -21,7 +22,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.Toast;
 
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.mining.app.zxing.camera.CameraManager;

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

@@ -1,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -13,7 +13,7 @@ import java.util.HashMap;
 import org.kobjects.base64.Base64;
 
 import com.chaoran.db.SqlHelpUtil;
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 import com.sys.SysData;
 import com.util.DialogUtil;
 import com.util.IoUtil;
@@ -22,15 +22,20 @@ import com.util.SysUtil;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.provider.Settings.Secure;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.util.DisplayMetrics;
 import android.view.Menu;
 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,24 +1,25 @@
-package com.activity.chaoran;
+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 com.chaoran.component.MyAdapter;
-import com.chaoran.entiry.DataGrid;
-import com.activity.chaoran.R;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Color;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-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

@@ -1,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
@@ -6,9 +6,10 @@ import org.ksoap2.serialization.SoapSerializationEnvelope;
 import org.ksoap2.transport.HttpTransportSE;
 
 import com.chaoran.db.SqlHelpUtil;
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 import com.sys.SysData;
 import com.util.DialogUtil;
+import com.util.IoUtil;
 import com.util.SysUtil;
 
 import android.os.Bundle;
@@ -21,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,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import android.os.Handler;
 import android.os.Message;

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

@@ -1,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import android.os.Handler;
 import android.os.Message;
@@ -49,6 +49,13 @@ public class RunYmupThread extends Thread {
 			envelope.setOutputSoapObject(rpc);
 			ht.call("", envelope);
 			if (envelope.getResponse() != null) {// 判断是否返回结果，因为我这个是一个查询操作，是带有返回值的。
+				// byte[] bb = org.kobjects.base64.Base64.decode(envelope
+				// .getResponse().toString());
+				// Map map= (Map)IoUtil.byte_obj(bb);
+				// Message msg = new Message();
+				// msg.obj = map;
+				// msg.arg1=2;
+				// handler.sendMessage(msg);
 				Message msg = new Message();
 				if (methodName.equals("saveDj")) {
 					msg.arg1 = 3;

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

@@ -1,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
@@ -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,4 +1,4 @@
-package com.activity.chaoran;
+package com.example.chaoran;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -11,6 +11,9 @@ 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/BeepManager.java

@@ -10,7 +10,7 @@ import android.util.Log;
 
 import java.io.IOException;
 
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 
 
 

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

@@ -1,10 +1,17 @@
 package com.jiebao.h518.scan;
 
 
-import android.app.Activity;
-import android.util.Log;
+import com.jiebao.h518.scan.BeepManager;
 import com.motorolasolutions.adc.decoder.BarCodeReader;
 
+import android.app.Activity;
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.SoundPool;
+import android.media.ToneGenerator;
+import android.util.Log;
+import android.widget.SlidingDrawer;
+
 
 public class DiemensionalCodeControler implements BarCodeReader.DecodeCallback {
 	public interface DiemensionalScanListener{

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/jiebao/h518/scan/SqliteService.java

@@ -1,5 +1,9 @@
 package com.jiebao.h518.scan;
 
+import java.util.ArrayList;
+import java.util.List;
+
+
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

app/src/main/java/com/mining/app/zxing/decoding/CaptureActivityHandler.java

@@ -27,8 +27,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
-import com.activity.chaoran.MipcaActivityCapture;
-import com.activity.chaoran.R;
+import com.example.chaoran.MipcaActivityCapture;
+import com.example.chaoran.R;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.mining.app.zxing.camera.CameraManager;

app/src/main/java/com/mining/app/zxing/decoding/DecodeHandler.java

@@ -23,8 +23,8 @@ import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 
-import com.activity.chaoran.MipcaActivityCapture;
-import com.activity.chaoran.R;
+import com.example.chaoran.MipcaActivityCapture;
+import com.example.chaoran.R;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.MultiFormatReader;

app/src/main/java/com/mining/app/zxing/decoding/DecodeThread.java

@@ -23,7 +23,7 @@ import java.util.concurrent.CountDownLatch;
 import android.os.Handler;
 import android.os.Looper;
 
-import com.activity.chaoran.MipcaActivityCapture;
+import com.example.chaoran.MipcaActivityCapture;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.ResultPointCallback;

app/src/main/java/com/mining/app/zxing/view/ViewfinderView.java

@@ -30,7 +30,7 @@ import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 import com.google.zxing.ResultPoint;
 import com.mining.app.zxing.camera.CameraManager;
 

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

@@ -1,7 +1,8 @@
 package com.util;
 
 import com.chaoran.entiry.SelfEditText;
-import com.activity.chaoran.DjActivity;
+import com.example.chaoran.DjActivity;
+import com.example.chaoran.MainActivity;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -11,6 +12,9 @@ import android.content.DialogInterface.OnClickListener;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.AbsoluteSizeSpan;
+import android.util.Log;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
 
 public class DialogUtil {
 	// 错误消息对话框
@@ -31,6 +35,7 @@ public class DialogUtil {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
+				// TODO Auto-generated method stub
 				if (DjActivity.cr5wScanControl != null && "DjActivity".equals(context.getClass().getSimpleName())) {
 					DjActivity.cr5wScanControl.setIsOpen(true);
 					DjActivity.cr5wScanControl.start(context);
@@ -38,6 +43,7 @@ public class DialogUtil {
 					DjActivity.nr510ScanControl.start(context);
 				} else if (DjActivity.barcodeReader != null  && "DjActivity".equals(context.getClass().getSimpleName())) {
 					try {
+					//	DjActivity.triggerState = true;
 						DjActivity.barcodeReader.light(true);      //turn on/off backlight
 						DjActivity.barcodeReader.aim(true);		//开关瞄准线
 						DjActivity.barcodeReader.decode(true);	    //开关解码功能
@@ -55,9 +61,8 @@ public class DialogUtil {
 		});
 		builder.create();
 		builder.show();
-
-//		if (DjActivity.cr5wScanControl != null  && "DjActivity".equals(context.getClass().getSimpleName()))
-//			DjActivity.cr5wScanControl.setIsOpen(false);
+		if (DjActivity.cr5wScanControl != null  && "DjActivity".equals(context.getClass().getSimpleName()))
+			DjActivity.cr5wScanControl.setIsOpen(false);
 	}
 
 	public static void builderCancel(Context context, String title,

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

@@ -2,26 +2,30 @@ package com.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
+import java.text.DateFormat;
 
 import map.baidu.com.BDMapActivity;
 
 import org.kobjects.base64.Base64;
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.view.View;
 
 import com.chaoran.imp.InputInterface;
-import com.activity.chaoran.DjActivity;
-import com.activity.chaoran.ExitThread;
-import com.activity.chaoran.MipcaActivityCapture;
-import com.activity.chaoran.RunYmupThread;
+import com.example.chaoran.DjActivity;
+import com.example.chaoran.ExitThread;
+import com.example.chaoran.MipcaActivityCapture;
+import com.example.chaoran.NetWorkSet;
+import com.example.chaoran.RunYmupThread;
 import com.sys.SysData;
 
 public class DjMenuFun {

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

@@ -153,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/com/util/Dom4jUtil.java

@@ -2,6 +2,7 @@ package com.util;
 
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
@@ -22,12 +23,19 @@ import com.chaoran.entiry.SelfTextBut;
 import com.chaoran.entiry.UpdataInfo;
 import com.chaoran.imp.InputInterface;
 import com.chaoran.thread.ImageUrl;
-import com.activity.chaoran.DjActivity;
+import com.example.chaoran.DjActivity;
 import com.sys.SysData;
 
+import com.example.chaoran.R;
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Build.VERSION;
 import android.text.InputType;
 import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 

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

@@ -33,7 +33,7 @@ public class IoUtil {
 			if (bin != null) {
 				bin.close();
 			}
-			System.out.println("流关闭---");
+			System.out.println("留关闭---");
 		}
 	}
 

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

@@ -17,12 +17,16 @@ import android.widget.TextView;
 
 import com.chaoran.component.AntLine;
 import com.chaoran.component.SelfHRule;
+import com.chaoran.entiry.PhotographUi;
 import com.chaoran.entiry.SelfButton;
 import com.chaoran.entiry.SelfCheckBox;
 import com.chaoran.entiry.SelfDateField;
 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 com.example.chaoran.DjActivity;
 import com.sys.SysData;
 
 public class LxParamPageCreate {

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

@@ -1,6 +1,5 @@
 package com.util;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.net.wifi.WifiManager;
@@ -11,7 +10,6 @@ import android.os.PowerManager.WakeLock;
 public class WakeLockUtil {
 	private static WifiLock wifiLock;
 
-	@SuppressLint("InvalidWakeLockTag")
 	public static void acquireWakeLock(Activity activity, WakeLock wakeLock) {
 		if (wakeLock == null) {
 			PowerManager pm = (PowerManager) activity
@@ -20,7 +18,7 @@ public class WakeLockUtil {
 					| PowerManager.ACQUIRE_CAUSES_WAKEUP, "crtech");
 		}
 		if (wifiLock == null) {
-			WifiManager manager = (WifiManager) activity.getApplicationContext()
+			WifiManager manager = (WifiManager) activity
 					.getSystemService(Context.WIFI_SERVICE);
 			wifiLock = manager.createWifiLock("SwiFTP");
 			wifiLock.setReferenceCounted(false);

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

@@ -9,7 +9,7 @@ import android.widget.ZoomControls;
 import com.baidu.location.BDLocation;
 import com.baidu.location.BDLocationListener;
 import com.baidu.mapapi.*;
-import com.activity.chaoran.R;
+import com.example.chaoran.R;
 import com.util.DialogUtil;
 
 import java.util.HashMap;

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();
+	}
      
 }