diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9828d06..d10330c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
minSdkVersion 8
targetSdkVersion 15
versionCode 1
- versionName "1.0"
+ versionName "V1.077"
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 {
+ //加载jar包
compile fileTree(dir: 'libs', include: ['*.jar'])
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e76315e..3051141 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.activity.chaoran">
@@ -15,8 +14,8 @@
-
-
+
@@ -35,10 +34,12 @@
-
-
-
-
+
+
+
+
@@ -49,8 +50,6 @@
-
-
-
@@ -75,37 +73,36 @@
-
-
-
diff --git a/app/src/main/java/com/example/chaoran/DjActivity.java b/app/src/main/java/com/activity/chaoran/DjActivity.java
similarity index 70%
rename from app/src/main/java/com/example/chaoran/DjActivity.java
rename to app/src/main/java/com/activity/chaoran/DjActivity.java
index 0ffda0a..fb34f1e 100644
--- a/app/src/main/java/com/example/chaoran/DjActivity.java
+++ b/app/src/main/java/com/activity/chaoran/DjActivity.java
@@ -1,5 +1,6 @@
-package com.example.chaoran;
+package com.activity.chaoran;
+import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.Instrumentation;
import android.app.ProgressDialog;
@@ -136,24 +137,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
ttsNr = null;
}
}
- };// 声音提示停止接口
- // /* 单据内容查询 */
- // public Runnable downloadRun = new Runnable() {
- // public void run() {
- // Object ob;
- // try {
- // ob = getWeather(formlx);
- // Message message = new Message();
- // message.obj = ob;
- // handler.sendMessage(message);
- // } catch (Exception e) {
- // Message message = new Message();
- // message.obj = e.toString();
- // message.what = -1;
- // handler.sendMessage(message);
- // }
- // }
- // };
+ };
/* 菜单栏查询 */
Runnable menuRun = new Runnable() {
public void run() {
@@ -180,7 +164,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
// 当有消息发送出来的时候就执行Handler的这个方法
public void handleMessage(Message msg) {
super.handleMessage(msg);
- System.out.println("=========sd=================================" + msg.what);
if (msg.what == -1) {
if (pd != null) {
pd.cancel();
@@ -244,12 +227,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
pd.cancel();
DialogUtil.builder(DjActivity.this, "错误信息", "检索方案内容解析失败!", 0);
}
- // String sql = msg.obj.toString();
- // String return_one = sql.substring(0, 1);
- // sql = sql.substring(1, sql.length());
- // Map map = SqlUtil.regSql(sql, hzTab, pageMap);
- // pd.setMessage("正在执行检索方案");
- // runSearch(map, return_one);
} else if (msg.arg1 == 1) {
String sql = null;
try {
@@ -260,15 +237,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
return;
}
Map map = SqlUtil.regSql(sql, hzTab, pageMap);
- // if (mxData.size() > 0) {
- // map.put("mxSql", mxSql);
- // map.put("mxData",
- // DjUtil.organizationMxData(mxData,
- // pageMap.get("GZID")));
- // } else {
- // map.put("mxSql", "");
- // map.put("mxData", null);
- // }
map.put("gzid", pageMap.get("GZID"));
map.put("mxTempTable", mxTempTable);
Map hzData = DjUtil.organizationHzData(hzTab, pageMap.get("GZID"));
@@ -315,32 +283,19 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
super.handleMessage(msg);
View rootview = DjActivity.this.getWindow().getDecorView();
View aaa = rootview.findFocus();
- // View bbb =
- // hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- // if (aaa == bbb && defaultFocus2 != null) {
- // DjUtil.setFocus(hzTab, defaultFocus2);
- // }
if (aaa instanceof SelfEditText) {
m_view = aaa;
SelfEditText set = (SelfEditText)aaa;
if (set.getText().length() > 0)
set.selectAll();
}
- /*
- if (defaultFocus2 != null) {
- View bbb = hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- if (bbb instanceof SelfEditText) {
- if (((SelfEditText)bbb).getText().length() > 0)
- DjUtil.setFocus(hzTab, defaultFocus2);
- }
- }*/
if (msg.what == -1) {
pd.cancel();
DialogUtil.builder(DjActivity.this, "错误信息", "检索方案执行失败:" + msg.obj.toString(), 0);
} else if (msg.what == -2) {
pd.cancel();
DialogUtil.builder(DjActivity.this, "错误信息", "页面修改方案执行失败:" + msg.obj.toString(), 0);
- WifiManager wifiManager = (WifiManager) DjActivity.this.getSystemService(Context.WIFI_SERVICE);
+ WifiManager wifiManager = (WifiManager) DjActivity.this.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
wifiManager.disconnect();
wifiManager.reconnect();
} else if (msg.what == -3) {
@@ -368,12 +323,9 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
String speakFld = (map.get("audioFld")).toString();
if (map.get("return_one").equals("Y") && len < 2) {
- // System.out.println("检索方案");
- // if (len > 0) {
Map paramValueMap = (Map) dg.getTableData().get(0);
play(paramValueMap, speakFld);
DjUtil.setUiValue(hzTab, paramValueMap, pageMap, imgHandler);
- // }
} else {
Intent intent = new Intent();
intent.setClass(getApplicationContext(), ParamActivity.class);
@@ -387,31 +339,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
pd.cancel();
} else if (msg.arg1 == 2) {// 页面修改方案
- // byte[] bb = org.kobjects.base64.Base64.decode(msg.obj
- // .toString());
Object ob = msg.obj;
- // try {
- // ob = IoUtil.byte_obj(bb);
- // } catch (Exception e) {
- // DialogUtil.builder(DjActivity.this, "提示信息",
- // "数据转换失败");
- // }
- // if (ob instanceof Map) {
- // Map map = (Map) ob;
- // DjUtil.setUiValue(hzTab, (List) map.get("hz"),
- // pageMap, imgHandler);
- // // mxData.clear();
- // // mxData.addAll((List) map.get("mx"));
- // // mxAdapter.notifyDataSetChanged();
- // // System.out.println(map.get("msg"));
- // if (map.get("msg") != null) {
- // DialogUtil.builder(DjActivity.this, "提示信息", map
- // .get("msg").toString());
- // }
- // } else {
- // DialogUtil.builder(DjActivity.this, "提示信息",
- // ob.toString());
- // }
if (ob instanceof Map) {
Map map = (Map) ob;
List> list = (List>) map.get("hz");
@@ -422,10 +350,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
} else if ("MESSAGE_AUDIO".equals(tm.get("fieldname")))
paramValueMap = tm;
}
- // Map paramValueMap = (Map)
- // dg.getTableData().get(0);
- // String speakFld =
- // (map.get("audioFld")).toString();
play(paramValueMap, "fieldValue");
DjUtil.setUiValue(hzTab, (List) map.get("hz"), pageMap, imgHandler);
@@ -468,14 +392,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
String mess = msg.obj.toString();
if (mess.substring(0, 2).equals("ok")) {
String djbh = mess.substring(2, mess.length());
- // if(pageMap.containsKey("DJBH")){
- // djbh=pageMap.get("DJBH").toString();
- // }else{
- // View et=hzTab.findViewWithTag("DJBH");
- // if(et instanceof InputInterface){
- // djbh=((InputInterface)et).getText().toString();
- // }
- // }
mxData.clear();
mxAdapter.notifyDataSetChanged();
hzTab.setCurrentTab(0);
@@ -492,7 +408,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
pd.cancel();
} else if (msg.arg1 == 4) {
if (tabhost.getCurrentTab() != 0) {
- // hzTab.setCurrentTab(0);
hzTab.clearAllTabs();
mxData.clear();
fangAMap.clear();
@@ -524,17 +439,12 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
if (nextFocusTag != null) {
- // System.out.println(nextFocusTag
- // + "----------------------------");
setNextFocus(nextFocusTag);
nextFocusTag = null;
}
if (isLinghtScreen) {
releaseLinghtScreen();
}
- // if (dc != null) {
- // dc.start();
- // }
if (newScanControler != null) {
newScanControler.scanOnce();// 如果PDA是ht518 则一进入单据就打开扫描
}
@@ -564,17 +474,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
reReadCode = true;
}
};
- /*
- * mt35a 扫描所需变量 private DeviceControl DevCtrl; private SerialPort
- * mSerialPort; public int fd; private ReadThread mReadThread; private
- * static final String TAG = "SerialPort"; private boolean key_start =
- * true;// 指明scan键的状态 private boolean Powered = false;// 指明扫头是否上电 private
- * boolean Opened = false;// // 指明串口是否打开 private Timer timer = new Timer();
- * private Timer retrig_timer = new Timer(); private SoundPool soundPool;
- * private int soundId; private Handler succeed_handler = null; private
- * Handler t_handler = null; private Handler n_handler = null; private
- * boolean ops = false;// 指明程序是否初始化**
- */
+
/* 事件 */
public OnFocusChangeEvent focusEvent;
public OnClickEvent clickEvent;
@@ -641,13 +541,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
Dom4jUtil.testParseXMLData(in, DjActivity.this);
if (dj.mxzdArray.size() > 0) {
mxTitle.setText(((Map) dj.mxzdArray.get(0)).get("chnname").toString().trim());
- // mxAdapter = new SimpleAdapter(
- // DjActivity.this,
- // mxData,
- // R.layout.activity_menu,
- // new String[] { ((Map) dj.mxzdArray.get(0))
- // .get("fdname").toString().trim().toUpperCase() },
- // new int[] { R.id.title });
if (mxAdapter != null) {
mxAdapter.clear();
}
@@ -699,7 +592,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
in = null;
}
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
@@ -709,21 +601,17 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void onClick(DialogInterface dialog, int which) {
- // TODO Auto-generated method stub
new DjMenuFun().exitDj(DjActivity.this);
}
};
public DialogInterface.OnClickListener cancelClick = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- // TODO Auto-generated method stub
-
}
};
public void queryMx(View v) {
if (mxQuerySql == null) {
- // DialogUtil.builder(DjActivity.this, "提示信息", "明细未设置", 0);
return;
}
DialogUtil.setDialog(pd, "正在查询单据内容", "正在查询明细……");
@@ -736,15 +624,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
DialogUtil.builder(DjActivity.this, "提示信息", "请下载单据表", 0);
return;
}
- // if (dbManager.existsTable("sys_SearchOptions".toUpperCase()) < 1)
- // {
- // DialogUtil.builder(DjActivity.this, "提示信息", "请下载检索方案表");
- // return;
- // }
- // if (dbManager.existsTable("sys_YmupOptions".toUpperCase()) < 1) {
- // DialogUtil.builder(DjActivity.this, "提示信息", "请下载页面修改方案表");
- // return;
- // }
}
DialogUtil.setDialog(pd, "正在查询单据内容", "正在下载……");
Map map = (Map) menuData.get(currentDjId);
@@ -759,7 +638,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
mxTempTable = null;
mxSql = null;
tabhost.setCurrentTab(1);
- // hzTab.setCurrentTab(0);
hzTab.clearAllTabs();
if (SysData.is_lx) {
new Thread(new LxDJNrThread(dbManager, handler, formlx)).start();
@@ -772,10 +650,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_dj);
- // layout = new RelativeLayout(this);
- // layout.setLayoutParams(new RelativeLayout.LayoutParams(-1, -1));
- // layout.setBackgroundColor(Color.WHITE);
- // setContentView(layout);
if (SysData.url != null) {
this.setTitle(SysData.no + " " + SysData.url.substring(SysData.url.indexOf("//") + 2, 24));
}
@@ -783,12 +657,10 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
clickEvent = new OnClickEvent();
imgClickEvent = new ImageClickListener(this);
pzClickEvent = new PzClickListener(this);
- /* 检测语音包资源 如果有合适的资源 就在onActivityResult中实例化一个TTS */
Intent checkIntent = new Intent();
checkIntent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
startActivityForResult(checkIntent, MY_DATA_CHECK_CODE);
mxRefreshBut = (Button) findViewById(R.id.mxbut);
- /*--------------*/
pd = ProgressDialog.show(DjActivity.this, "正在查询单据菜单", "正在下载……");
pd.setOnCancelListener(new OnCancelListener() {
@@ -811,9 +683,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
tabhost = getTabHost();
tabhost.addTab(tabhost.newTabSpec("djmenu").setIndicator("菜单").setContent(R.id.djmenu));
- // tabhost.addTab(tabhost.newTabSpec("hz").setIndicator("汇总")
- // .setContent(R.id.hz));
- // mxActivity=new MxActivity();
tabhost.addTab(tabhost.newTabSpec("hz").setIndicator("汇总").setContent(R.id.hz));
tabhost.addTab(tabhost.newTabSpec("mx").setIndicator("明细").setContent(R.id.mx));
TabWidget tabwidget = tabhost.getTabWidget();
@@ -834,7 +703,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
((LinearLayout) findViewById(R.id.djmenu)).addView(menuList, layoutParams);
} else {
menuAdapter = new SimpleAdapter(this, menuData, R.layout.activity_menu, new String[] { "mname" }, new int[] { R.id.title });
- // menuList = (ListView) findViewById(R.id.munuList);
menuList = new ListView(this);
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
layoutParams.topMargin = 0;
@@ -874,12 +742,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void onClick(View v) {
- // TODO Auto-generated method stub
((Button) findViewById(R.id.mxbut)).performClick();
tabhost.setCurrentTab(2);
- // tabhost.getTabWidget().setCurrentTab(2);
- // DialogUtil.builder(DjActivity.this, "测试标题","测试内容！" +
- // v.getLeft(), 18);
}
});
@@ -887,7 +751,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void onClick(View v) {
- // TODO Auto-generated method stub
tabhost.setCurrentTab(1);
if (defaultFocus2 != null) {
DjUtil.setFocus(hzTab, defaultFocus2);
@@ -895,48 +758,30 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
});
- // mxAdapter = new SimpleAdapter(this, mxData, R.layout.activity_menu,
- // new String[] { "mname" }, new int[] { R.id.title });
phoneModel = android.os.Build.MODEL.toLowerCase();
- System.out.println(phoneModel + "--------------phoneModel---------------");
if (phoneModel.equals("zk-r322a") || phoneModel.equals("zk-r322")|| phoneModel.equals("zk-r323")|| phoneModel.equals("zk-r323a")) {
zkr322aNew();
- }/* else if (phoneModel.equals("n1s")) {
- haixinN1SInit();
- } */else if (phoneModel.equals("ht518")) {
- // ht518Init();
+ }else if (phoneModel.equals("ht518")) {
ht518InitNew();
- } else if (phoneModel.equals("al9") /*|| "cruise".equals(phoneModel)*/) {
+ } else if (phoneModel.equals("al9")) {
seuicIint();
- } else if ("cr-5w".equals(phoneModel) /*|| "android handheld terminal".equals(phoneModel)*/) {
+ } else if ("cr-5w".equals(phoneModel)) {
cr5wScanControl = new CR5WScanControl();
cr5wScanControl.init(DjActivity.this);
} else if("android handheld terminal".equals(phoneModel)) {
androidHandheldTerminal0 = new AndroidHandheldTerminal0(DjActivity.this);
- //androidHandheldTerminal = new AndroidHandheldTerminal();
} else if ("nr510".equals(phoneModel) || "android".equals(phoneModel)) {
nr510ScanControl = new Nr510ScanControl();
} else if ("scanpal eda50".equals(phoneModel)) {
- // get bar code instance from MainActivity
- // DialogUtil.builder(DjActivity.this, "信息", "初始化失败:111111111111111111", 0);
- //if (barcodeReader != null) {
- /// continuousScanning(true);
- //} else {
barcodeReader = MainActivity.getBarcodeObject();
if (barcodeReader != null) {
- // register bar code event listener
barcodeReader.addBarcodeListener(this);
- // set the trigger mode to client control
try {
- //barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE,
- // BarcodeReader.TRIGGER_CONTROL_MODE_AUTO_CONTROL);
- // set the trigger mode to client control
barcodeReader.setProperty(BarcodeReader.PROPERTY_TRIGGER_CONTROL_MODE,
BarcodeReader.TRIGGER_CONTROL_MODE_CLIENT_CONTROL);
-
} catch (UnsupportedPropertyException e) {
Toast.makeText(this, "Failed to apply properties", Toast.LENGTH_SHORT).show();
}
@@ -972,73 +817,18 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
e.printStackTrace();
Toast.makeText(this, "Scanner unavailable", Toast.LENGTH_SHORT).show();
}
- // }
}
acquireWakeLock();
- WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+ WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
wifiLock = wifiManager.createWifiLock("crtechWIFI");
wifiLock.acquire();
- System.out.println(wifiLock.isHeld() + "-----------------===-----------锁住");
- /****
- * mt35a初始化扫描变量 try { DevCtrl = new DeviceControl("/proc/driver/scan");
- * System.out.println("DevCtrl初始化扫描"); } catch (SecurityException e) {
- * e.printStackTrace(); } catch (IOException e) { Log.d(TAG, "AAA"); new
- * AlertDialog.Builder(this) .setTitle(R.string.DIA_ALERT)
- * .setMessage(R.string.DEV_OPEN_ERR)
- * .setPositiveButton(R.string.DIA_CHECK, new
- * DialogInterface.OnClickListener() {
- *
- * @Override public void onClick(DialogInterface dialog, int which) { //
- * TODO Auto-generated method stub finish(); } }).show();
- * return; } ops = true;// 指明程序是否初始化
- *
- * soundPool = new SoundPool(1, AudioManager.STREAM_MUSIC, 0);
- * soundId =
- * soundPool.load("/system/media/audio/ui/VideoRecord.ogg",
- * 0);
- *
- * t_handler = new Handler() {
- * @Override public void handleMessage(Message msg) {
- * super.handleMessage(msg); if (msg.what == 1) { try {
- * DevCtrl.PowerOffDevice(); } catch (IOException e) {
- * Log.d(TAG, "BBB"); // TODO Auto-generated catch block
- * e.printStackTrace(); }// powersave Powered = false; } } };
- *
- * n_handler = new Handler() {
- * @Override public void handleMessage(Message msg) {
- * super.handleMessage(msg); if (msg.what == 1) { try { if
- * (key_start == false) { DevCtrl.TriggerOffDevice(); timer =
- * new Timer(); // 启动一个计时器，当机器闲置一段时间后，切断电源，节省能源。
- * timer.schedule(new MyTask(), 60000); key_start = true; } }
- * catch (IOException e) { // TODO Auto-generated catch block
- * e.printStackTrace(); } } } };
- *
- * succeed_handler = new Handler() {
- * @Override public void handleMessage(Message msg) {
- * super.handleMessage(msg); if (msg.what == 1 && key_start ==
- * false) { String buff1 = msg.obj.toString(); //
- * mReception.append(buff+"---"); View view =
- * DjActivity.this.getCurrentFocus(); if (view != null && view
- * instanceof EditText) { ((EditText) view).setText(buff1);
- * view.clearFocus(); View nextView = layout
- * .findViewWithTag(((SelfEditText) view).nextFocus); if
- * (nextView != null) { nextView.requestFocus(); } }
- *
- * soundPool.play(soundId, 1, 1, 0, 0, 1); key_start = true;
- * retrig_timer.cancel(); } } };
- ***/
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- // if (resultCode == 1) {
- // Map map = (Map) data.getSerializableExtra("param");
- // DjUtil.setUiValue(hzTab, map, pageMap, imgHandler);
- // }
if (requestCode == MY_DATA_CHECK_CODE) {
if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
- // success, create the TTS instance
tts = new TextToSpeech(this, this);
} else {
Intent installIntent = new Intent();
@@ -1057,7 +847,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
} else if (requestCode == 2) {
if (resultCode == 2) {
DjUtil.setUiValue(hzTab, (HashMap) data.getSerializableExtra("param"), pageMap, imgHandler);
- System.out.println(nextFocusTag + "-------------------------------------------------------------------");
if (nextFocusTag != null) {
setNextFocus(nextFocusTag);
nextFocusTag = null;
@@ -1066,9 +855,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
} else if (requestCode == 3) {
if (resultCode == 3) {
HashMap tempmap = (HashMap) data.getSerializableExtra("param");
- // for (Object key : tempmap.keySet()) {
- // System.out.println(tempmap.get(key) + "-------------------");
- // }
DjUtil.setUiValue(hzTab, tempmap, pageMap, imgHandler);
}
} else if (requestCode == 4) {
@@ -1100,10 +886,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
// 设置页签高度和页签内字体属性
TextView tv = (TextView) tabwidget.getChildAt(i).findViewById(android.R.id.title);
tabwidget.getChildAt(i).getLayoutParams().height = UnitConversionUtil.convertDIP2PX(20.0);
- // tv.setTextSize(20);
- // float t = tv.getTextSize() * SysData.t_scale * 2 / 3;
- // tv.setTextSize(t);
- // System.out.println(tv.getTextSize());
tv.setTextColor(Color.WHITE);
tv.setGravity(Gravity.CENTER_HORIZONTAL);
}
@@ -1126,9 +908,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
if (envelope.getResponse() != null) {// 判断是否返回结果，因为我这个是一个查询操作，是带有返回值的。
byte[] bb = Base64.decode(envelope.getResponse().toString());
List list = (List) IoUtil.byte_obj(bb);
- // for(int i=0;i 0) { Log.d(TAG, "opened"); Opened = true; } } if
- * (mReadThread == null) { mReadThread = new ReadThread();
- * mReadThread.start(); System.out.println("线程创建并启动"); } else
- * { if (!mReadThread.isAlive()) { mReadThread.start();
- * System.out.println("线程只启动"); } } } Log.d(TAG, "onResume");
- ****/
super.onResume();
System.out.println("onResume");
if (cr5wScanControl != null)
@@ -1186,12 +939,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
boolean b = seuicScanner.open();
System.out.println(b + "----seuicScanner.open()");
seuicScanner.setDecodeInfoCallBack(this);
- // ScannerKey.open();
- // if (!seuicScannerThread.isrun) {
- // System.out.println("------------------------onResume");
- // seuicScannerThread.isrun = true;
- // new Thread(seuicScannerThread).start();
- // }
}
if (barcodeReader != null) {
continuousScanning(true);
@@ -1224,8 +971,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
else if (haixinN1SDemoReceiver != null) {
haixinN1sStart();
}
-// else if(androidHandheldTerminal0 != null)
-// androidHandheldTerminal0.start();
if (zkr322aControl != null) {
zkr322aControl.start();
}
@@ -1234,7 +979,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
protected void onPause() {
- // TODO Auto-generated method stub
super.onPause();
if (newScanControler != null) {
newScanControler.stopScan();
@@ -1256,15 +1000,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
seuicScanner.stopScan();
seuicScanner.close();
seuicScanner.setDecodeCallBack(null);
- // ScannerKey.close();
- // if (seuicScannerThread.isrun) {
- // seuicScannerThread.isrun = false;
- // }
}
if (barcodeReader != null) {
- // release the scanner claim so we don't get any scanner
- // notifications while paused.
-// barcodeReader.release();
continuousScanning(false);
}
if (zkr322aControl != null) {
@@ -1274,36 +1011,17 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
protected void onStop() {
- // TODO Auto-generated method stub
super.onStop();
}
public void onDestroy() {
- // if (seuicScanner != null) {// seuic PDA操作
- // ScannerKey.close();
- // com.seuic.scanner.Scanner.stopScanService(this);
- // }
- // TODO Auto-generated method stub
- /**
- * mt35a 调用 System.out.println("杀死---------------------------------");
- * if (ops == true) { try {
- * System.out.println("杀死123---------------------------------");
- * mReadThread.interrupt(); soundPool.release(); DevCtrl.DeviceClose();
- * } catch (IOException e) { Log.d(TAG, "EEE"); // TODO Auto-generated
- * catch block e.printStackTrace(); } }
- ****/
super.onDestroy();
-
-
if (barcodeReader != null) {
barcodeReader.release();
- // unregister barcode event listener
barcodeReader.removeBarcodeListener(this);
- // unregister trigger state change listener
barcodeReader.removeTriggerListener(this);
barcodeReader = null;
- // triggerState = true;
}
if (diPlayer != null) {
@@ -1319,20 +1037,10 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
if (vibrator != null) {
vibrator.cancel();
}
-// if (seuicScanner != null) {
-// seuicScanner.stopScan();
-// seuicScanner.close();
-// seuicScanner.setDecodeCallBack(null);
-// }
completionListener = null;
- // if (washeld) {
- // washeld = false;
-
-
}
private void exitClear() {
- System.out.println("---退出清理---");
if (dbManager != null) {
dbManager.closeDB();
dbManager = null;
@@ -1361,7 +1069,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
if (mxList != null) {
mxList = null;
}
- System.out.println(phoneModel + "---------------------------------phoneModel1");
mxData.clear();
mxData = null;
if (mxAdapter != null) {
@@ -1380,7 +1087,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
if (phoneModel.equals("ht518")) {
ht518Clear();
- // DiemensionalCodeControler.setDiemensionalConNull();//ht518旧扫描头清除
}
if (zkr322aControl != null) {
zkr322aClear();
@@ -1409,18 +1115,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
return true;
}
- /*
- * mt35a 调用 public boolean onKeyDown(int keyCode, KeyEvent event) {
- * System.out.println(keyCode + "==================="); switch (keyCode) {
- * case 111: try { if (key_start == true) { if (Powered == false) { Powered
- * = true; DevCtrl.PowerOnDevice(); } timer.cancel();
- * DevCtrl.TriggerOnDevice(); key_start = false; retrig_timer = new Timer();
- * retrig_timer.schedule(new RetrigTask(), 3500); } } catch (IOException e)
- * { Log.d(TAG, "FFF"); // TODO Auto-generated catch block
- * e.printStackTrace(); } break; case 4: dialog(); break; }
- *
- * return super.onKeyDown(keyCode, event); }
- */
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (!isKeyDown) {
@@ -1433,7 +1127,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
public boolean onKeyDown(int keyCode, KeyEvent event) {
super.onKeyDown(keyCode, event);
String temp = String.valueOf(keyCode);
- System.err.println(temp + "---------------------1" + seuicScanner + "--" + isKeyDown);
if (temp.equals("132")) {// ht518专用
event.startTracking();// 加了这句 键盘长按事件才有效
return true;
@@ -1457,10 +1150,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
- // System.out.println(event.getKeyCode() + "---------------------");
int keyCode = event.getKeyCode();
- // DialogUtil.builder(DjActivity.this, "提示信息", "keyCode = " + keyCode, 0);
- // if (event.getAction() != KeyEvent.ACTION_UP) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
switch (keyCode) {
case 120:
@@ -1485,10 +1175,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
break;
case 132:
- // if (!isOpen) {
- // isOpen = true;
- // dc.start();
- // }
if (newScanControler != null) {
newScanControler.scanOnce();
}
@@ -1501,67 +1187,23 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
default:
return super.dispatchKeyEvent(event);
}
- // return true;
} else if (event.getAction() == KeyEvent.ACTION_UP) {
if (keyCode == 120 || keyCode == 211 || keyCode == 212) {
} else if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) { // 阻止系统的enter事件
return true;
}
- // else if (keyCode == 132) {
- // if (isOpen) {
- // isOpen = false;
- // }
- // }
}
return super.dispatchKeyEvent(event);
}
- // @Override
- // public boolean onKeyUp(int keyCode, KeyEvent event) {
- // super.onKeyUp(keyCode, event);
- // if(keyCode==132&&isOpen){
- // isOpen = false;
- // }
- // return true;
- // }
-
public boolean onKeyLongPress(int keyCode, KeyEvent event) {
super.onKeyLongPress(keyCode, event);
String temp = String.valueOf(keyCode);
if (temp.equals("132")) {
- // dc.stop();
- // dc.doHandsFree();
}
return true;
}
- // public boolean onKeyDown(int keyCode, KeyEvent event) {
- // System.out.println(keyCode + "--------------------------------");
- // switch (keyCode) {
- // case 120:
- // if (SysUtil.isTopApp(this)) {
- // if (mScanManager.getTriggerLockState()) {
- // mScanManager.unlockTriggler();
- // }
- // } else {
- // if (!mScanManager.getTriggerLockState()) {
- // mScanManager.lockTriggler();
- // }
- // }
- // break;
- // case 4:
- // dialog();
- // break;
- // case 113:
- // View view = DjActivity.this.getCurrentFocus();
- // if (view != null && view instanceof EditText) {
- // setFcous(view);
- // }
- // break;
- // }
- // return super.onKeyDown(keyCode, event);
- // }
-
protected void dialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(DjActivity.this);
builder.setMessage("确定要退出吗?");
@@ -1586,42 +1228,12 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
builder.create().show();
}
- /*
- * 扫描所需要的内容 class MyTask extends TimerTask {
- *
- * @Override public void run() { // TODO Auto-generated method stub Message
- * message = new Message(); message.what = 1;
- * t_handler.sendMessage(message); } }
- */
- /*
- * class RetrigTask extends TimerTask {
- *
- * @Override public void run() { // TODO Auto-generated method stub Message
- * message = new Message(); message.what = 1;
- * n_handler.sendMessage(message); } }
- *
- * private class ReadThread extends Thread {
- *
- * @Override public void run() { super.run(); while
- * (!Thread.currentThread().isInterrupted()) { try { Log.d(TAG, "read");
- * String buff = mSerialPort.ReadSerial(fd, 1024); Log.d(TAG, "end"); if
- * (buff != null) { Message msg = new Message(); msg.what = 1; msg.obj =
- * buff; succeed_handler.sendMessage(msg); timer = new Timer();
- * timer.schedule(new MyTask(), 60000); } else { Message msg = new
- * Message(); msg.what = 0; succeed_handler.sendMessage(msg); } } catch
- * (SecurityException e) { e.printStackTrace(); } catch
- * (UnsupportedEncodingException e) { // TODO Auto-generated catch block
- * e.printStackTrace(); } } } }
- */
class OnFocusChangeEvent implements View.OnFocusChangeListener {
@Override
public void onFocusChange(View v, boolean hasFocus) {
- // System.out.println(v.toString());
if (hasFocus) {
if (v instanceof SelfEditText) {
SelfEditText focusInSet = (SelfEditText) v;
- // focusInSet.setInputType(InputType.TYPE_NULL);
- // System.out.println(focusInSet.getTag()+"的到焦点------------");
if (focusInSet.closeKeyBoard) {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(focusInSet.getWindowToken(), 0);
@@ -1635,8 +1247,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
} else {
if (v instanceof SelfEditText) {
SelfEditText set = (SelfEditText) v;
- // System.out.println(set.getTag()+"失去焦点------------" +
- // set.isTextChange);
if (set.isTextChange) {
nextFocusTag = set.nextFocus;
eventHandler(((SelfEditText) v).focusOutFun, v);
@@ -1680,11 +1290,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
return;
}
String funType = "";
- String functionname = null;
if (funName.indexOf("_") > -1) {
funType = funName.substring(0, funName.indexOf("_")).toUpperCase();
- // functionname = funName.substring(funName.indexOf("_") + 1,
- // funName.length());
}
HashMap faMap = (HashMap) fangAMap.get(funName.toUpperCase());
if (faMap == null && (funType.equals("SEARCH") || funType.equals("YMUP") || funType.equals("DJTQ"))) {
@@ -1701,16 +1308,12 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
else if (haixinN1SDemoReceiver != null) {
haixinN1sStop();
}
- // else if (androidHandheldTerminal0 != null)
- // androidHandheldTerminal0.stop();
if (barcodeReader != null) {
- // continuousScanning(false);
}
if (zkr322aControl != null) {
zkr322aControl.stop();
}
DialogUtil.setDialog(pd, "检索方案", "正在执行检索方案……");
- // new SearchThread(formlx, functionname, sqlHandler, 0).start();
Map map = SqlUtil.regSql(faMap.get("zdysql").toString(), hzTab, pageMap);
String audioFld = "";
if (faMap.get("audioFld") != null) {
@@ -1727,18 +1330,13 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
else if (haixinN1SDemoReceiver != null) {
haixinN1sStop();
}
- // else if (androidHandheldTerminal0 != null)
- // androidHandheldTerminal0.stop();
if (barcodeReader != null) {
- // continuousScanning(false);
}
if (zkr322aControl != null) {
zkr322aControl.stop();
}
DialogUtil.setDialog(pd, "页面修改方案", "正在执行页面修改方案");
- // new SearchThread(formlx, functionname, sqlHandler, 1).start();
Map map = SqlUtil.regSql(faMap.get("zdysql").toString(), hzTab, pageMap);
- System.out.println(pageMap.get("GZID") + "------------------gzid");
map.put("gzid", pageMap.get("GZID"));
map.put("mxTempTable", mxTempTable);
Map hzData = DjUtil.organizationHzData(hzTab, pageMap.get("GZID"));
@@ -1758,7 +1356,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
} else if (funType.equals("DJTQ")) {
DialogUtil.setDialog(pd, "提取方案", "加载提取方案函数……");
- // new SearchThread(formlx, functionname, sqlHandler, 2).start();
Djselefa djselefa = new Djselefa();
djselefa.setT_sql(faMap.get("t_sql").toString());
djselefa.setHz_sql(faMap.get("hz_sql").toString());
@@ -1802,13 +1399,10 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
/* 运行检索方案 */
public void runSearch(Map map, String return_one, String audioFld) {
- // new SearchThread(formlx, "WMSW87_01", sqlHandler).start();
try {
new RunSearchThread(map.get("sql").toString(), IoUtil.ob_base64(map.get("param")), runHandler, return_one, audioFld).start();
} catch (IOException e) {
- // TODO Auto-generated catch block
DialogUtil.builder(this, "错误信息", "转换成Base64编码失败！", 0);
- // e.printStackTrace();
}
}
@@ -1858,8 +1452,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
vibrator.vibrate(2000);
}
- // tts.speak(map.get(speakFld).toString(), TextToSpeech.QUEUE_ADD,
- // null);
}
}
@@ -1888,6 +1480,7 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
}
+ @SuppressLint("InvalidWakeLockTag")
public void acquireWakeLock() {
if (pm == null) {
pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
@@ -1899,7 +1492,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
linghtScreen = pm.newWakeLock(PowerManager.ACQUIRE_CAUSES_WAKEUP | PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "bright");
}
if (wakeLock != null) {
- System.out.println(wakeLock + "------------------锁定");
wakeLock.acquire();
}
}
@@ -1908,7 +1500,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
public void releaseWakeLock() {
if (wakeLock != null) {
wakeLock.release();
- System.out.println("------------------解除锁定");
wakeLock = null;
}
}
@@ -1920,58 +1511,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
}
- /* ht518 扫描 */
- // DiemensionalCodeControler dc;
- // DiemensionalScanListener scanListener;
- // private boolean isOpen = false;// 判断扫描是否开始
- //
- // /* ht518初始化(带旧版扫描头) */
- // private void ht518Init() {
- // DiemensionalCodeControler.setDiemensionalConNull();
- // scanListener = new ScanListener();
- // dc = DiemensionalCodeControler.getCodeControler(this, scanListener);
- // }
- // public class ScanListener implements DiemensionalScanListener {
- //
- // @Override
- // public void onDiemensionalScanComplete(String result, String error) {
- // KeyguardManager km = (KeyguardManager)
- // getSystemService(Context.KEYGUARD_SERVICE);
- // if (km.inKeyguardRestrictedInputMode()) {
- // System.out.println("解锁屏幕------------");
- // // 得到键盘锁管理器对象
- // KeyguardLock kl = km.newKeyguardLock("unLock");
- // // 参数是LogCat里用的Tag
- // kl.disableKeyguard(); // 解锁
- // }
- // // System.out.println(wakeLock+"------------"+washeld);
- // // if (washeld) {
- // // washeld = false;
- // // wakeLock.release();
- // // System.out.println(wakeLock);
- // // }
- // // System.out.println(wakeLock + "------------");
- // // wakeLock.acquire();
- // // washeld = true;
- //
- // // 获取PowerManager.WakeLock对象，后面的参数|表示同时传入两个值，最后的是LogCat里用的Tag
- // if (!pm.isScreenOn()) {
- // linghtScreen.acquire();// 点亮屏幕
- // isLinghtScreen = true;
- // System.out.println(wakeLock + "------------");
- // }
- // if (result != null) {
- // zyFcous(result);
- // } else {
- // if (error.equals("解码超时")) {
- // dc.start();
- // } else {
- // tts.speak(error, TextToSpeech.QUEUE_ADD, null);
- // }
- // }
- // }
- // }
-
// 富力叶 android handheld terminal 扫描头
AndroidHandheldTerminal0 androidHandheldTerminal0 = null;
public class AndroidHandheldTerminal0 {
@@ -1992,17 +1531,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
}
public void stop() {
- //ScanHelper.setScanSwitchLeft(context, false);
- //ScanHelper.setScanSwitchRight(context, false);
-// ScanHelper.setBarcodeReceiveModel(context, 2);
-// if (!state) {
-// synchronized (lock) {
-// if (!state) {
-// state = true;
-// unregisterReceiver(myCodeReceiver);
-// }
-// }
-// }
running = false;
}
}
@@ -2019,32 +1547,24 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
if (!"".equals(str)) {
View rootview = DjActivity.this.getWindow().getDecorView();
View aaa = rootview.findFocus();
- // View bbb =
- // hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- // if (aaa == bbb && defaultFocus2 != null) {
- // DjUtil.setFocus(hzTab, defaultFocus2);
- // }
if (aaa instanceof SelfEditText) {
SelfEditText set = (SelfEditText)aaa;
set.setText(str);
- //if (set.closeKeyBoard) {
-// set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
-// set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
new Thread(new Runnable() {
@Override
public void run() {
- // TODO Auto-generated method stub
- Instrumentation inst = new Instrumentation();
+ Instrumentation inst = new Instrumentation();
inst.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
}
}).start();
- //}
}
}
}
}
}
+
+
// 海信 n1s 设备扫描头控制
public static final String HAIXIN_N1S_ACTION_SCAN_RESULT = "android.provider.sdlMessage";
public static boolean haixinN1SStart = false;
@@ -2064,7 +1584,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
//
final String action = intent.getAction();
if (HAIXIN_N1S_ACTION_SCAN_RESULT.equals(action)) {
- // The string is the scan result value.
final String scanResultStr = intent.getStringExtra("msg");
if (scanResultStr != null && scanResultStr.trim().length() > 0) {
@@ -2072,11 +1591,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
public void run() {
View rootview = DjActivity.this.getWindow().getDecorView();
View aaa = rootview.findFocus();
- // View bbb =
- // hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- // if (aaa == bbb && defaultFocus2 != null) {
- // DjUtil.setFocus(hzTab, defaultFocus2);
- // }
if (aaa instanceof SelfEditText) {
SelfEditText set = (SelfEditText)aaa;
set.setText(scanResultStr);
@@ -2085,9 +1599,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void run() {
- // TODO Auto-generated method stub
- Instrumentation inst = new Instrumentation();
- inst.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
+ Instrumentation inst = new Instrumentation();
+ inst.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
}
}).start();
}
@@ -2116,80 +1629,14 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
// 富力叶 android handheld terminal 扫描头
-
public static AndroidHandheldTerminal androidHandheldTerminal = null;
- /* 富力叶不兼容代码
- private Handler androidHandheldTerminalHandler = new MainHandler();
-
-
- private class MainHandler extends Handler {
- @SuppressLint("HandlerLeak")
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == 1) {
- String readerdata = (String) msg.obj;
- //
- View rootview = DjActivity.this.getWindow().getDecorView();
- View aaa = rootview.findFocus();
- // View bbb =
- // hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- // if (aaa == bbb && defaultFocus2 != null) {
- // DjUtil.setFocus(hzTab, defaultFocus2);
- // }
- if (aaa instanceof SelfEditText) {
- SelfEditText set = (SelfEditText)aaa;
- set.setText(readerdata);
- //set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
- //set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
- }
- //
-
- }
-
- }
-}
-
- private IScanCallBack androidHandheldTerminalcb = new IScanCallBack.Stub() {
-
- @Override
- public void doScanResult(String barCode) throws RemoteException {
-
- Message msg = new Message();
- msg.what = 1;
- msg.obj = barCode;
- androidHandheldTerminalHandler.sendMessage(msg);
-
- }
-};*/
public class AndroidHandheldTerminal {
- /* 富力叶不兼容代码
- private ScanManager scan = null;
-
- public AndroidHandheldTerminal() {
- scan = (ScanManager) getSystemService("olc_service_scan");
- }
-*/
- public void start() {/* 富力叶不兼容代码
- if (scan != null) {
- Log.v("AndroidHandheldTerminal", "scan: start begin");
- scan.setScanSwitchLeft(true);
- scan.setScanSwitchRight(true);
-
- scan.startRead(androidHandheldTerminalcb);
- Log.v("AndroidHandheldTerminal", "scan: start end");
- } else
- Log.v("AndroidHandheldTerminal", "scan: start fail");*/
+
+ public void start() {
}
- public void stop() {/* 富力叶不兼容代码
- if (scan != null) {
- Log.v("AndroidHandheldTerminal", "scan: stop begin");
- scan.setScanSwitchLeft(false);
- scan.setScanSwitchRight(false);
- Log.v("AndroidHandheldTerminal", "scan: stop end");
- } else
- Log.v("AndroidHandheldTerminal", "scan: stop fail");*/
+ public void stop() {
}
public void restart() {
@@ -2289,20 +1736,13 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void onReceive(Context arg0, Intent arg1) {
- Log.i("NR510GetValue", "onReceive......");
final String value = arg1
.getStringExtra("lachesis_barcode_value_notice_broadcast_data_string");
- //final String value = "1234567890";
if (value.length() > 10) {
handler.post(new Runnable() {
public void run() {
View rootview = DjActivity.this.getWindow().getDecorView();
View aaa = rootview.findFocus();
- // View bbb =
- // hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- // if (aaa == bbb && defaultFocus2 != null) {
- // DjUtil.setFocus(hzTab, defaultFocus2);
- // }
if (aaa instanceof SelfEditText) {
SelfEditText set = (SelfEditText)aaa;
if (set.closeKeyBoard) {
@@ -2321,8 +1761,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
* Honeywell 设备扫描头控制
*/
public static BarcodeReader barcodeReader = null;
-// public static boolean triggerState = false;
-
/*
* ht518初始化(带新版扫描头) 包括android_serialport_api包和android.gpio包
* 和com.jiebao.h518.scan.NewScanControler类
@@ -2356,10 +1794,8 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
newScanControler = new NewScanControler();
newScanControler.initScan();
} catch (SecurityException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
reciverThread = new Thread(ReciverDataRunable);
@@ -2415,110 +1851,41 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void onTriggerEvent(TriggerStateChangeEvent event) {
- // TODO Auto-generated method stub
-
-// if (event.getState()) {
-// //turn on/off aimer, illumination and decoding
-// try {
-// barcodeReader.aim(!triggerState);
-// barcodeReader.light(!triggerState);
-// barcodeReader.decode(!triggerState);
-//
-// triggerState = !triggerState;
-// } catch (ScannerNotClaimedException e) {
-// e.printStackTrace();
-// } catch (ScannerUnavailableException e) {
-// e.printStackTrace();
-// }
-// }
}
@Override
public void onBarcodeEvent(BarcodeReadEvent event) {
- // TODO Auto-generated method stub
final BarcodeReadEvent event2 = event;
runOnUiThread(new Runnable() {
@Override
public void run() {
- /*
- // update UI to reflect the data
- List list = new ArrayList();
- list.add("Barcode data: " + event.getBarcodeData());
- list.add("Character Set: " + event.getCharset());
- list.add("Code ID: " + event.getCodeId());
- list.add("AIM ID: " + event.getAimId());
- list.add("Timestamp: " + event.getTimestamp());
-
- final ArrayAdapter dataAdapter = new ArrayAdapter(
- AutomaticBarcodeActivity.this, android.R.layout.simple_list_item_1, list);
-
- barcodeList.setAdapter(dataAdapter);
-*/
- //
-// Toast.makeText(DjActivity.this, event2.getBarcodeData(), Toast.LENGTH_SHORT).show();
if (barcodeReader == null) return;
View rootview = DjActivity.this.getWindow().getDecorView();
- // boolean isfindEdit = true;
if (rootview != null) {
View aaa = rootview.findFocus();
if (aaa != null && aaa instanceof SelfEditText) {
final SelfEditText set = (SelfEditText)aaa;
set.setText(event2.getBarcodeData());
-// set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
-// set.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
new Thread(new Runnable() {
@Override
public void run() {
- // TODO Auto-generated method stub
- Instrumentation inst = new Instrumentation();
+ Instrumentation inst = new Instrumentation();
inst.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
}
}).start();
} else {
- // isfindEdit = false;
}
} else {
- // isfindEdit = false;
}
- /* if (!isfindEdit) {
- Timer timer = new Timer();
- timer.schedule(new TimerTask() {
-
- @Override
- public void run() {
- // TODO Auto-generated method stub
- triggerState = false;
- continuousScanning(true);
- }
- }, 1000);
- }*/
- /*
- if (defaultFocus2 != null) {
- View bbb = hzTab.findViewWithTag(defaultFocus2.toUpperCase().trim());
- if (bbb instanceof SelfEditText) {
- if (((SelfEditText)bbb).getText().length() > 0)
- DjUtil.setFocus(hzTab, defaultFocus2);
- }
- }*/
-
- //
-// try {
-// Thread.sleep(1000);//sleep 1s waiting for another barcode
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
-// continuousScanning(true);
continuousScanning(true);
}
});
}
public void continuousScanning(final boolean bState){
-// if (triggerState && bState) return;
-// triggerState = bState;
-
+
new Thread(new Runnable() {
@Override
public void run() {
@@ -2542,8 +1909,6 @@ public class DjActivity extends TabActivity implements OnInitListener, DecodeInf
@Override
public void onFailureEvent(BarcodeFailureEvent arg0) {
- // TODO Auto-generated method stub
- //continuousScanning(true);
}
}
diff --git a/app/src/main/java/com/example/chaoran/DjtqActivity.java b/app/src/main/java/com/activity/chaoran/DjtqActivity.java
similarity index 97%
rename from app/src/main/java/com/example/chaoran/DjtqActivity.java
rename to app/src/main/java/com/activity/chaoran/DjtqActivity.java
index b7b1008..11b0842 100644
--- a/app/src/main/java/com/example/chaoran/DjtqActivity.java
+++ b/app/src/main/java/com/activity/chaoran/DjtqActivity.java
@@ -1,18 +1,15 @@
-package com.example.chaoran;
+package com.activity.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.activity.chaoran.R;
import com.util.DialogUtil;
import com.util.IoUtil;
import com.util.SqlUtil;
diff --git a/app/src/main/java/com/example/chaoran/ExitThread.java b/app/src/main/java/com/activity/chaoran/ExitThread.java
similarity index 98%
rename from app/src/main/java/com/example/chaoran/ExitThread.java
rename to app/src/main/java/com/activity/chaoran/ExitThread.java
index f5c1409..1755f79 100644
--- a/app/src/main/java/com/example/chaoran/ExitThread.java
+++ b/app/src/main/java/com/activity/chaoran/ExitThread.java
@@ -1,4 +1,4 @@
-package com.example.chaoran;
+package com.activity.chaoran;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
diff --git a/app/src/main/java/com/example/chaoran/MainActivity.java b/app/src/main/java/com/activity/chaoran/MainActivity.java
similarity index 80%
rename from app/src/main/java/com/example/chaoran/MainActivity.java
rename to app/src/main/java/com/activity/chaoran/MainActivity.java
index 5e2f32a..06d0f7b 100644
--- a/app/src/main/java/com/example/chaoran/MainActivity.java
+++ b/app/src/main/java/com/activity/chaoran/MainActivity.java
@@ -1,64 +1,23 @@
-package com.example.chaoran;
+package com.activity.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,6 +26,25 @@ 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;
@@ -79,13 +57,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的这个方法
@@ -103,8 +81,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 +91,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 +111,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 +139,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 +193,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();
@@ -262,20 +208,18 @@ 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) {
new Thread(new CheckVersionTask()).start();
new Thread(queryZcrq).start();
}
- //
BufferedReader br = null;
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);
@@ -311,10 +255,9 @@ 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;
@@ -324,7 +267,7 @@ public class MainActivity extends Activity {
}
}
-
+
public static BarcodeReader getBarcodeObject() {
return barcodeReader;
}
@@ -339,10 +282,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,33 +330,20 @@ 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);
}
// 设置按钮监听
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);
@@ -445,10 +371,6 @@ public class MainActivity extends Activity {
// 设置按钮监听
public void onsub(View v) {
- // if (SysData.url == null) {
- // DialogUtil.builder(this, "错误信息", "请检查网络！");
- // return;
- // }
loginTy = 1;
start_login();
}
@@ -481,21 +403,12 @@ public class MainActivity extends Activity {
} else {
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 +423,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,7 +510,6 @@ 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);
@@ -637,9 +545,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()) {
@@ -682,17 +587,13 @@ public class MainActivity extends Activity {
}
return true;
}
-
- /**
- * 该方法解决屏幕旋转程序崩溃，需要对应 AndroidManifest.xml 文件 android:configChanges="orientation|screenSize|keyboardHidden" 配置
- */
- public void onConfigurationChanged(Configuration newConfig) {
- // TODO Auto-generated method stub
- 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();
- }
- }
+
+ 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();
+ }
+ }
}
diff --git a/app/src/main/java/com/example/chaoran/MenuActivity.java b/app/src/main/java/com/activity/chaoran/MenuActivity.java
similarity index 96%
rename from app/src/main/java/com/example/chaoran/MenuActivity.java
rename to app/src/main/java/com/activity/chaoran/MenuActivity.java
index 48c5e87..92b21ce 100644
--- a/app/src/main/java/com/example/chaoran/MenuActivity.java
+++ b/app/src/main/java/com/activity/chaoran/MenuActivity.java
@@ -1,9 +1,8 @@
-package com.example.chaoran;
+package com.activity.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;
@@ -13,8 +12,7 @@ import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
-import com.chaoran.entiry.DanJuEntity;
-import com.example.chaoran.R;
+import com.activity.chaoran.R;
import com.sys.SysData;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/chaoran/MipcaActivityCapture.java b/app/src/main/java/com/activity/chaoran/MipcaActivityCapture.java
similarity index 98%
rename from app/src/main/java/com/example/chaoran/MipcaActivityCapture.java
rename to app/src/main/java/com/activity/chaoran/MipcaActivityCapture.java
index 457807f..7952089 100644
--- a/app/src/main/java/com/example/chaoran/MipcaActivityCapture.java
+++ b/app/src/main/java/com/activity/chaoran/MipcaActivityCapture.java
@@ -1,4 +1,4 @@
-package com.example.chaoran;
+package com.activity.chaoran;
import java.io.IOException;
@@ -13,7 +13,6 @@ 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;
@@ -22,7 +21,7 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;
-import com.example.chaoran.R;
+import com.activity.chaoran.R;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.Result;
import com.mining.app.zxing.camera.CameraManager;
diff --git a/app/src/main/java/com/example/chaoran/NetWorkSet.java b/app/src/main/java/com/activity/chaoran/NetWorkSet.java
similarity index 98%
rename from app/src/main/java/com/example/chaoran/NetWorkSet.java
rename to app/src/main/java/com/activity/chaoran/NetWorkSet.java
index d4d098f..4bf57e2 100644
--- a/app/src/main/java/com/example/chaoran/NetWorkSet.java
+++ b/app/src/main/java/com/activity/chaoran/NetWorkSet.java
@@ -1,4 +1,4 @@
-package com.example.chaoran;
+package com.activity.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.example.chaoran.R;
+import com.activity.chaoran.R;
import com.sys.SysData;
import com.util.DialogUtil;
import com.util.IoUtil;
@@ -22,12 +22,10 @@ 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;
diff --git a/app/src/main/java/com/example/chaoran/ParamActivity.java b/app/src/main/java/com/activity/chaoran/ParamActivity.java
similarity index 94%
rename from app/src/main/java/com/example/chaoran/ParamActivity.java
rename to app/src/main/java/com/activity/chaoran/ParamActivity.java
index 96cb04e..d336ddf 100644
--- a/app/src/main/java/com/example/chaoran/ParamActivity.java
+++ b/app/src/main/java/com/activity/chaoran/ParamActivity.java
@@ -1,25 +1,21 @@
-package com.example.chaoran;
+package com.activity.chaoran;
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 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.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;
diff --git a/app/src/main/java/com/example/chaoran/PdaRegActivity.java b/app/src/main/java/com/activity/chaoran/PdaRegActivity.java
similarity index 98%
rename from app/src/main/java/com/example/chaoran/PdaRegActivity.java
rename to app/src/main/java/com/activity/chaoran/PdaRegActivity.java
index 0cce99a..2f2c527 100644
--- a/app/src/main/java/com/example/chaoran/PdaRegActivity.java
+++ b/app/src/main/java/com/activity/chaoran/PdaRegActivity.java
@@ -1,4 +1,4 @@
-package com.example.chaoran;
+package com.activity.chaoran;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
@@ -6,10 +6,9 @@ import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
import com.chaoran.db.SqlHelpUtil;
-import com.example.chaoran.R;
+import com.activity.chaoran.R;
import com.sys.SysData;
import com.util.DialogUtil;
-import com.util.IoUtil;
import com.util.SysUtil;
import android.os.Bundle;
diff --git a/app/src/main/java/com/example/chaoran/RunSearchThread.java b/app/src/main/java/com/activity/chaoran/RunSearchThread.java
similarity index 94%
rename from app/src/main/java/com/example/chaoran/RunSearchThread.java
rename to app/src/main/java/com/activity/chaoran/RunSearchThread.java
index 0398eac..f7041e6 100644
--- a/app/src/main/java/com/example/chaoran/RunSearchThread.java
+++ b/app/src/main/java/com/activity/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;
+package com.activity.chaoran;
+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 {
diff --git a/app/src/main/java/com/example/chaoran/RunYmupThread.java b/app/src/main/java/com/activity/chaoran/RunYmupThread.java
similarity index 87%
rename from app/src/main/java/com/example/chaoran/RunYmupThread.java
rename to app/src/main/java/com/activity/chaoran/RunYmupThread.java
index 32c5eba..df23400 100644
--- a/app/src/main/java/com/example/chaoran/RunYmupThread.java
+++ b/app/src/main/java/com/activity/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;
+package com.activity.chaoran;
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;
@@ -55,13 +49,6 @@ 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;
diff --git a/app/src/main/java/com/example/chaoran/SearchThread.java b/app/src/main/java/com/activity/chaoran/SearchThread.java
similarity index 98%
rename from app/src/main/java/com/example/chaoran/SearchThread.java
rename to app/src/main/java/com/activity/chaoran/SearchThread.java
index 2b6bd7b..a29e8c6 100644
--- a/app/src/main/java/com/example/chaoran/SearchThread.java
+++ b/app/src/main/java/com/activity/chaoran/SearchThread.java
@@ -1,4 +1,4 @@
-package com.example.chaoran;
+package com.activity.chaoran;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
diff --git a/app/src/main/java/com/example/chaoran/UpdatePwdActivity.java b/app/src/main/java/com/activity/chaoran/UpdatePwdActivity.java
similarity index 88%
rename from app/src/main/java/com/example/chaoran/UpdatePwdActivity.java
rename to app/src/main/java/com/activity/chaoran/UpdatePwdActivity.java
index 5a9b47d..307ef83 100644
--- a/app/src/main/java/com/example/chaoran/UpdatePwdActivity.java
+++ b/app/src/main/java/com/activity/chaoran/UpdatePwdActivity.java
@@ -1,27 +1,15 @@
-package com.example.chaoran;
+package com.activity.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;
diff --git a/app/src/main/java/com/chaoran/component/ButAdapter.java b/app/src/main/java/com/chaoran/component/ButAdapter.java
index ed94ee0..c2ce15c 100644
--- a/app/src/main/java/com/chaoran/component/ButAdapter.java
+++ b/app/src/main/java/com/chaoran/component/ButAdapter.java
@@ -5,13 +5,10 @@ import java.util.HashMap;
import com.chaoran.db.DBManager;
import com.chaoran.lx.activity.DownDataActivity;
-import com.example.chaoran.DjActivity;
-import com.example.chaoran.R;
+import com.activity.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;
diff --git a/app/src/main/java/com/chaoran/component/ImageAdpter.java b/app/src/main/java/com/chaoran/component/ImageAdpter.java
index 84c6ddc..f8fa663 100644
--- a/app/src/main/java/com/chaoran/component/ImageAdpter.java
+++ b/app/src/main/java/com/chaoran/component/ImageAdpter.java
@@ -1,23 +1,17 @@
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;
diff --git a/app/src/main/java/com/chaoran/component/MyAdapter.java b/app/src/main/java/com/chaoran/component/MyAdapter.java
index 923f40c..22b92bf 100644
--- a/app/src/main/java/com/chaoran/component/MyAdapter.java
+++ b/app/src/main/java/com/chaoran/component/MyAdapter.java
@@ -4,8 +4,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import com.chaoran.entiry.Zujian;
-import com.example.chaoran.DjActivity;
-import com.example.chaoran.R;
+import com.activity.chaoran.R;
import com.util.DialogUtil;
import com.util.SysUtil;
diff --git a/app/src/main/java/com/chaoran/db/DBManager.java b/app/src/main/java/com/chaoran/db/DBManager.java
index 855c70e..df05b0c 100644
--- a/app/src/main/java/com/chaoran/db/DBManager.java
+++ b/app/src/main/java/com/chaoran/db/DBManager.java
@@ -1,20 +1,11 @@
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;
diff --git a/app/src/main/java/com/chaoran/entiry/PhotographUi.java b/app/src/main/java/com/chaoran/entiry/PhotographUi.java
index 90e2feb..feb8e37 100644
--- a/app/src/main/java/com/chaoran/entiry/PhotographUi.java
+++ b/app/src/main/java/com/chaoran/entiry/PhotographUi.java
@@ -1,21 +1,9 @@
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 {
diff --git a/app/src/main/java/com/chaoran/entiry/SelfCheckBox.java b/app/src/main/java/com/chaoran/entiry/SelfCheckBox.java
index f831005..9c7630d 100644
--- a/app/src/main/java/com/chaoran/entiry/SelfCheckBox.java
+++ b/app/src/main/java/com/chaoran/entiry/SelfCheckBox.java
@@ -1,6 +1,6 @@
package com.chaoran.entiry;
-import com.example.chaoran.R;
+import com.activity.chaoran.R;
import android.content.Context;
import android.util.TypedValue;
diff --git a/app/src/main/java/com/chaoran/entiry/SelfDateField.java b/app/src/main/java/com/chaoran/entiry/SelfDateField.java
index ac448a2..aec0e38 100644
--- a/app/src/main/java/com/chaoran/entiry/SelfDateField.java
+++ b/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.example.chaoran.R;
+import com.activity.chaoran.R;
public class SelfDateField extends RelativeLayout implements InputInterface {
private SelfEditText et;
diff --git a/app/src/main/java/com/chaoran/entiry/SelfTextBut.java b/app/src/main/java/com/chaoran/entiry/SelfTextBut.java
index 4d8ce62..9c6c8bc 100644
--- a/app/src/main/java/com/chaoran/entiry/SelfTextBut.java
+++ b/app/src/main/java/com/chaoran/entiry/SelfTextBut.java
@@ -2,16 +2,10 @@ 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 {
diff --git a/app/src/main/java/com/chaoran/entiry/Test.java b/app/src/main/java/com/chaoran/entiry/Test.java
deleted file mode 100644
index 12dcbc6..0000000
--- a/app/src/main/java/com/chaoran/entiry/Test.java
+++ /dev/null
@@ -1,25 +0,0 @@
-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 m=new HashMap();
- m.put("a","1");
- m.put("b","2");
- m.put("c","3");
- Set set=m.keySet();
- for(String a:set){
- System.out.println(a+"---");
- if(a.equals("a")){
- //set.remove(a);
- }
- }
- Set set1=m.keySet();
- for(String b:set1){
- System.out.println(b);
- }
- }
-}
diff --git a/app/src/main/java/com/chaoran/entiry/Zujian.java b/app/src/main/java/com/chaoran/entiry/Zujian.java
index 39f8ac3..6162126 100644
--- a/app/src/main/java/com/chaoran/entiry/Zujian.java
+++ b/app/src/main/java/com/chaoran/entiry/Zujian.java
@@ -1,6 +1,5 @@
package com.chaoran.entiry;
-import android.widget.ImageView;
import android.widget.TextView;
public class Zujian {
diff --git a/app/src/main/java/com/chaoran/listener/ImageClickListener.java b/app/src/main/java/com/chaoran/listener/ImageClickListener.java
index 04a756a..18524a6 100644
--- a/app/src/main/java/com/chaoran/listener/ImageClickListener.java
+++ b/app/src/main/java/com/chaoran/listener/ImageClickListener.java
@@ -1,23 +1,19 @@
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.example.chaoran.R;
+import com.activity.chaoran.R;
public class ImageClickListener implements OnClickListener {
private Activity activity;
diff --git a/app/src/main/java/com/chaoran/listener/PzClickListener.java b/app/src/main/java/com/chaoran/listener/PzClickListener.java
index dfed85b..14814f8 100644
--- a/app/src/main/java/com/chaoran/listener/PzClickListener.java
+++ b/app/src/main/java/com/chaoran/listener/PzClickListener.java
@@ -4,11 +4,10 @@ import java.io.File;
import java.io.IOException;
import com.chaoran.entiry.PhotographUi;
-import com.example.chaoran.DjActivity;
+import com.activity.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;
diff --git a/app/src/main/java/com/chaoran/lx/activity/DownDataActivity.java b/app/src/main/java/com/chaoran/lx/activity/DownDataActivity.java
index 9fd7947..3e80fdd 100644
--- a/app/src/main/java/com/chaoran/lx/activity/DownDataActivity.java
+++ b/app/src/main/java/com/chaoran/lx/activity/DownDataActivity.java
@@ -4,19 +4,13 @@ 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.example.chaoran.R;
-import com.example.chaoran.RunYmupThread;
-import com.example.chaoran.R.id;
-import com.example.chaoran.R.layout;
+import com.activity.chaoran.R;
+import com.activity.chaoran.RunYmupThread;
import com.util.DialogUtil;
-import com.util.IoUtil;
-import android.R.integer;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
diff --git a/app/src/main/java/com/chaoran/lx/activity/Lx_Param_Activity.java b/app/src/main/java/com/chaoran/lx/activity/Lx_Param_Activity.java
index c6ebde4..a355670 100644
--- a/app/src/main/java/com/chaoran/lx/activity/Lx_Param_Activity.java
+++ b/app/src/main/java/com/chaoran/lx/activity/Lx_Param_Activity.java
@@ -10,10 +10,7 @@ import org.dom4j.DocumentException;
import com.chaoran.entiry.DanJuEntity;
import com.chaoran.entiry.Sys_DanJuFormsOptions;
import com.chaoran.thread.DownDJRun;
-import com.example.chaoran.DjActivity;
-import com.example.chaoran.R;
-import com.example.chaoran.R.layout;
-import com.example.chaoran.R.menu;
+import com.activity.chaoran.R;
import com.util.DialogUtil;
import com.util.IoUtil;
import com.util.LxParamPageCreate;
diff --git a/app/src/main/java/com/chaoran/lx/thread/LxDJNrThread.java b/app/src/main/java/com/chaoran/lx/thread/LxDJNrThread.java
index 454b595..60feffe 100644
--- a/app/src/main/java/com/chaoran/lx/thread/LxDJNrThread.java
+++ b/app/src/main/java/com/chaoran/lx/thread/LxDJNrThread.java
@@ -1,22 +1,13 @@
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 flex.messaging.io.ArrayList;
+import java.util.HashMap;
public class LxDJNrThread implements Runnable {
private DBManager dbManager;
diff --git a/app/src/main/java/com/chaoran/lx/thread/LxDataDownThread.java b/app/src/main/java/com/chaoran/lx/thread/LxDataDownThread.java
index 854340e..1e0c5ca 100644
--- a/app/src/main/java/com/chaoran/lx/thread/LxDataDownThread.java
+++ b/app/src/main/java/com/chaoran/lx/thread/LxDataDownThread.java
@@ -1,25 +1,21 @@
package com.chaoran.lx.thread;
-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 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;
+import com.chaoran.db.DBManager;
+import com.sys.SysData;
+import com.util.IoUtil;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
public class LxDataDownThread implements Runnable {
private Handler handler;
diff --git a/app/src/main/java/com/chaoran/thread/UpdatePwdThread.java b/app/src/main/java/com/chaoran/thread/UpdatePwdThread.java
index edc069a..d5db2c5 100644
--- a/app/src/main/java/com/chaoran/thread/UpdatePwdThread.java
+++ b/app/src/main/java/com/chaoran/thread/UpdatePwdThread.java
@@ -1,17 +1,12 @@
package com.chaoran.thread;
-import java.io.IOException;
-
+import android.os.Handler;
+import android.os.Message;
+import com.sys.SysData;
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;
diff --git a/app/src/main/java/com/cr5w/scan/CR5WScanControl.java b/app/src/main/java/com/cr5w/scan/CR5WScanControl.java
index 70c0473..7238646 100644
--- a/app/src/main/java/com/cr5w/scan/CR5WScanControl.java
+++ b/app/src/main/java/com/cr5w/scan/CR5WScanControl.java
@@ -32,9 +32,7 @@ public class CR5WScanControl {
}
sleep(500);
}
-// init(context);
} catch (Exception e) {
- e.printStackTrace();
}
}
diff --git a/app/src/main/java/com/cr5w/scan/ScanHelper.java b/app/src/main/java/com/cr5w/scan/ScanHelper.java
index f67deb9..4440455 100644
--- a/app/src/main/java/com/cr5w/scan/ScanHelper.java
+++ b/app/src/main/java/com/cr5w/scan/ScanHelper.java
@@ -1,10 +1,6 @@
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*/
diff --git a/app/src/main/java/com/cr5w/scan/aht70/ScanHelper.java b/app/src/main/java/com/cr5w/scan/aht70/ScanHelper.java
index c9d7bef..02d7acb 100644
--- a/app/src/main/java/com/cr5w/scan/aht70/ScanHelper.java
+++ b/app/src/main/java/com/cr5w/scan/aht70/ScanHelper.java
@@ -1,11 +1,7 @@
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*/
diff --git a/app/src/main/java/com/jiebao/h518/scan/BeepManager.java b/app/src/main/java/com/jiebao/h518/scan/BeepManager.java
index 7791cf9..3086abc 100644
--- a/app/src/main/java/com/jiebao/h518/scan/BeepManager.java
+++ b/app/src/main/java/com/jiebao/h518/scan/BeepManager.java
@@ -10,7 +10,7 @@ import android.util.Log;
import java.io.IOException;
-import com.example.chaoran.R;
+import com.activity.chaoran.R;
diff --git a/app/src/main/java/com/jiebao/h518/scan/DiemensionalCodeControler.java b/app/src/main/java/com/jiebao/h518/scan/DiemensionalCodeControler.java
index 83ce0f6..cd5d64f 100644
--- a/app/src/main/java/com/jiebao/h518/scan/DiemensionalCodeControler.java
+++ b/app/src/main/java/com/jiebao/h518/scan/DiemensionalCodeControler.java
@@ -1,16 +1,9 @@
package com.jiebao.h518.scan;
-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;
+import com.motorolasolutions.adc.decoder.BarCodeReader;
public class DiemensionalCodeControler implements BarCodeReader.DecodeCallback {
diff --git a/app/src/main/java/com/jiebao/h518/scan/SqliteService.java b/app/src/main/java/com/jiebao/h518/scan/SqliteService.java
index 42cb092..dbb602f 100644
--- a/app/src/main/java/com/jiebao/h518/scan/SqliteService.java
+++ b/app/src/main/java/com/jiebao/h518/scan/SqliteService.java
@@ -1,9 +1,5 @@
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;
diff --git a/app/src/main/java/com/mining/app/zxing/decoding/CaptureActivityHandler.java b/app/src/main/java/com/mining/app/zxing/decoding/CaptureActivityHandler.java
index bb566bd..dfd275e 100644
--- a/app/src/main/java/com/mining/app/zxing/decoding/CaptureActivityHandler.java
+++ b/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.example.chaoran.MipcaActivityCapture;
-import com.example.chaoran.R;
+import com.activity.chaoran.MipcaActivityCapture;
+import com.activity.chaoran.R;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.Result;
import com.mining.app.zxing.camera.CameraManager;
diff --git a/app/src/main/java/com/mining/app/zxing/decoding/DecodeHandler.java b/app/src/main/java/com/mining/app/zxing/decoding/DecodeHandler.java
index 1e2e41d..3cd2566 100644
--- a/app/src/main/java/com/mining/app/zxing/decoding/DecodeHandler.java
+++ b/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.example.chaoran.MipcaActivityCapture;
-import com.example.chaoran.R;
+import com.activity.chaoran.MipcaActivityCapture;
+import com.activity.chaoran.R;
import com.google.zxing.BinaryBitmap;
import com.google.zxing.DecodeHintType;
import com.google.zxing.MultiFormatReader;
diff --git a/app/src/main/java/com/mining/app/zxing/decoding/DecodeThread.java b/app/src/main/java/com/mining/app/zxing/decoding/DecodeThread.java
index 7c46e98..fe6e18d 100644
--- a/app/src/main/java/com/mining/app/zxing/decoding/DecodeThread.java
+++ b/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.example.chaoran.MipcaActivityCapture;
+import com.activity.chaoran.MipcaActivityCapture;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
import com.google.zxing.ResultPointCallback;
diff --git a/app/src/main/java/com/mining/app/zxing/view/ViewfinderView.java b/app/src/main/java/com/mining/app/zxing/view/ViewfinderView.java
index 56a76b3..467cc0a 100644
--- a/app/src/main/java/com/mining/app/zxing/view/ViewfinderView.java
+++ b/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.example.chaoran.R;
+import com.activity.chaoran.R;
import com.google.zxing.ResultPoint;
import com.mining.app.zxing.camera.CameraManager;
diff --git a/app/src/main/java/com/util/DialogUtil.java b/app/src/main/java/com/util/DialogUtil.java
index 3a32a75..3cbde99 100644
--- a/app/src/main/java/com/util/DialogUtil.java
+++ b/app/src/main/java/com/util/DialogUtil.java
@@ -1,8 +1,7 @@
package com.util;
import com.chaoran.entiry.SelfEditText;
-import com.example.chaoran.DjActivity;
-import com.example.chaoran.MainActivity;
+import com.activity.chaoran.DjActivity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
@@ -12,9 +11,6 @@ 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 {
// 错误消息对话框
@@ -35,7 +31,6 @@ 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);
@@ -43,7 +38,6 @@ 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); //开关解码功能
@@ -61,8 +55,9 @@ 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,
diff --git a/app/src/main/java/com/util/DjMenuFun.java b/app/src/main/java/com/util/DjMenuFun.java
index b756599..a96c04d 100644
--- a/app/src/main/java/com/util/DjMenuFun.java
+++ b/app/src/main/java/com/util/DjMenuFun.java
@@ -2,30 +2,26 @@ 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.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.activity.chaoran.DjActivity;
+import com.activity.chaoran.ExitThread;
+import com.activity.chaoran.MipcaActivityCapture;
+import com.activity.chaoran.RunYmupThread;
import com.sys.SysData;
public class DjMenuFun {
diff --git a/app/src/main/java/com/util/DjUtil.java b/app/src/main/java/com/util/DjUtil.java
index 076ba48..3294614 100644
--- a/app/src/main/java/com/util/DjUtil.java
+++ b/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.*;
/*
* 单据工具类
diff --git a/app/src/main/java/com/util/Dom4jUtil.java b/app/src/main/java/com/util/Dom4jUtil.java
index d213195..cc9fe09 100644
--- a/app/src/main/java/com/util/Dom4jUtil.java
+++ b/app/src/main/java/com/util/Dom4jUtil.java
@@ -2,7 +2,6 @@ package com.util;
import java.io.InputStream;
import java.lang.reflect.Method;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -23,19 +22,12 @@ import com.chaoran.entiry.SelfTextBut;
import com.chaoran.entiry.UpdataInfo;
import com.chaoran.imp.InputInterface;
import com.chaoran.thread.ImageUrl;
-import com.example.chaoran.DjActivity;
+import com.activity.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;
diff --git a/app/src/main/java/com/util/IoUtil.java b/app/src/main/java/com/util/IoUtil.java
index 9f02d7d..c5f34dd 100644
--- a/app/src/main/java/com/util/IoUtil.java
+++ b/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("流关闭---");
}
}
diff --git a/app/src/main/java/com/util/LxParamPageCreate.java b/app/src/main/java/com/util/LxParamPageCreate.java
index 77d36a2..5e35d0b 100644
--- a/app/src/main/java/com/util/LxParamPageCreate.java
+++ b/app/src/main/java/com/util/LxParamPageCreate.java
@@ -17,16 +17,12 @@ 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 {
diff --git a/app/src/main/java/com/util/WakeLockUtil.java b/app/src/main/java/com/util/WakeLockUtil.java
index be9a266..1800eba 100644
--- a/app/src/main/java/com/util/WakeLockUtil.java
+++ b/app/src/main/java/com/util/WakeLockUtil.java
@@ -1,5 +1,6 @@
package com.util;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.net.wifi.WifiManager;
@@ -10,6 +11,7 @@ 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
@@ -18,7 +20,7 @@ public class WakeLockUtil {
| PowerManager.ACQUIRE_CAUSES_WAKEUP, "crtech");
}
if (wifiLock == null) {
- WifiManager manager = (WifiManager) activity
+ WifiManager manager = (WifiManager) activity.getApplicationContext()
.getSystemService(Context.WIFI_SERVICE);
wifiLock = manager.createWifiLock("SwiFTP");
wifiLock.setReferenceCounted(false);
diff --git a/app/src/main/java/map/baidu/com/BDMapActivity.java b/app/src/main/java/map/baidu/com/BDMapActivity.java
index e3f3dbb..aa1dfd3 100644
--- a/app/src/main/java/map/baidu/com/BDMapActivity.java
+++ b/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.example.chaoran.R;
+import com.activity.chaoran.R;
import com.util.DialogUtil;
import java.util.HashMap;