diff --git a/.gitignore b/.gitignore index 648a7ad..f36094b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,19 @@ -/CYTAndroid4.0.iml -build.gradle -local.properties -license.dat -proguard-project.txt -local.properties -gradle -.gradle -.idea -*.iml -.project -gradlew -gradlew.bat -.gitignore -build -.settings -project.properties -/release/ +#/CYTAndroid4.0.iml +#build.gradle +#local.properties +#license.dat +#proguard-project.txt +#local.properties +#gradle +#.gradle +#.idea +#*.iml +#.project +#gradlew +#gradlew.bat +#.gitignore +#build +#.settings +#project.properties +#/release/ +/build diff --git a/CYTAndroid4.0.iml b/CYTAndroid4.0.iml index bc32f9a..9e17790 100644 --- a/CYTAndroid4.0.iml +++ b/CYTAndroid4.0.iml @@ -98,6 +98,8 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 593438a..54079d6 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,8 @@ dependencies { implementation files('libs/zxing.jar') implementation files('libs/gson-2.6.2.jar') implementation files('libs\\zypos1.8.jar') + implementation files('libs\\android-logging-log4j-1.0.3.jar') + implementation files('libs\\log4j-1.2.17.jar') compileOnly files('external_libs/classes_2.1.11_20160907.jar') compileOnly files('external_libs/bw_odm_20160526.jar') implementation files('libs/bw_pos_sdk2.0.18.jar') diff --git a/src/android_serialport_api/print_tool/MobilePrintTool.java b/src/android_serialport_api/print_tool/MobilePrintTool.java index 489371a..b26bea5 100644 --- a/src/android_serialport_api/print_tool/MobilePrintTool.java +++ b/src/android_serialport_api/print_tool/MobilePrintTool.java @@ -216,7 +216,7 @@ public class MobilePrintTool extends Activity { if (address == null) { break; } - LogUtil.i("address" + address); + LogUtil.i(TAG,"address" + address); // 获取设备进行连接 BluetoothDevice device = mBluetoothAdapter .getRemoteDevice(address); @@ -274,7 +274,7 @@ public class MobilePrintTool extends Activity { printer = new PrinterEscCmd(); } final int printNum = MyApp.getInstance().getPrintNum(); - LogUtil.d(printNum + getString(R.string.times)); + LogUtil.d(TAG,printNum + getString(R.string.times)); new Thread(new Runnable() { @Override public void run() { diff --git a/src/com/ectrip/cyt/config/MyApp.java b/src/com/ectrip/cyt/config/MyApp.java index c00cac8..adcc082 100644 --- a/src/com/ectrip/cyt/config/MyApp.java +++ b/src/com/ectrip/cyt/config/MyApp.java @@ -529,7 +529,7 @@ public class MyApp extends BaseApplication { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } catch (Exception e) { - LogUtil.v(TAG, + LogUtil.i(TAG, "open network settings failed, please check..."); e.printStackTrace(); } diff --git a/src/com/ectrip/cyt/exceptionsave/debug/LocalLogRunnable.java b/src/com/ectrip/cyt/exceptionsave/debug/LocalLogRunnable.java index 63d1f1c..b1a35a3 100644 --- a/src/com/ectrip/cyt/exceptionsave/debug/LocalLogRunnable.java +++ b/src/com/ectrip/cyt/exceptionsave/debug/LocalLogRunnable.java @@ -8,6 +8,7 @@ import java.util.Calendar; import java.util.Date; import com.ectrip.cyt.exceptionsave.init.InitAppValue; +import com.ectrip.cyt.utils.LogUtil; import android.content.Context; import android.content.Intent; @@ -19,7 +20,7 @@ import android.util.Log; public class LocalLogRunnable implements Runnable{ - private String TAG="LocalLogRunnable"; + private static final String TAG="LocalLogRunnable"; private Context mContext; private Throwable ex; @@ -174,6 +175,7 @@ public class LocalLogRunnable implements Runnable{ randomFile.close(); } catch (IOException e) { e.printStackTrace(); + LogUtil.d(TAG, LogUtil.getExMsg(e)); } } } diff --git a/src/com/ectrip/cyt/ui/BaseActivity.java b/src/com/ectrip/cyt/ui/BaseActivity.java index 77d6c11..6e10daf 100644 --- a/src/com/ectrip/cyt/ui/BaseActivity.java +++ b/src/com/ectrip/cyt/ui/BaseActivity.java @@ -231,7 +231,7 @@ public abstract class BaseActivity extends FragmentActivity { } isPause.set(true); super.onBackPressed(); - LogUtil.i(getString(R.string.back_pressed)); + LogUtil.i(TAG,getString(R.string.back_pressed)); if (netDialog != null && netDialog.isShowing()) { try { netDialog.dismiss(); diff --git a/src/com/ectrip/cyt/ui/MainActivity.java b/src/com/ectrip/cyt/ui/MainActivity.java index 4d69e45..89ecf64 100644 --- a/src/com/ectrip/cyt/ui/MainActivity.java +++ b/src/com/ectrip/cyt/ui/MainActivity.java @@ -157,14 +157,14 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V && getSerialNumber().contains("CTY") && getSerialNumber() .substring(0, 3).equals("CTY"))) { // 新的pos机 - LogUtil.i(getString(R.string.new_pos)); + LogUtil.i(TAG,getString(R.string.new_pos)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.New_POS.getValue()); } else if (DevicTool.getInstance().isHiboryPos()) { LogUtil.d(TAG, "5501H手持机"); // 5501H手持机 - LogUtil.i(getString(R.string.handset)); + LogUtil.i(TAG,getString(R.string.handset)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.BLACK_ID_POS.getValue()); @@ -173,7 +173,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V .substring(0, 2).equals("LY"))) { release(); // 新的手持pos机 - LogUtil.i(getString(R.string.new_handset_pos)); + LogUtil.i(TAG,getString(R.string.new_handset_pos)); SharedPreferences2Obj .getInstance(MainActivity.this) .setName("MachineType") @@ -183,13 +183,13 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V && getSerialNumber().contains("DY") && getSerialNumber() .substring(0, 2).equals("DY"))) { // 新的身份证pos机 - LogUtil.i(getString(R.string.new_id_pos)); + LogUtil.i(TAG,getString(R.string.new_id_pos)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.New_IDPOS.getValue()); } else if (HdxUtil.SetIDCARDPower(1) != -1) { // 身份证pos机 - LogUtil.i(getString(R.string.id_pos)); + LogUtil.i(TAG,getString(R.string.id_pos)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.ID_POS.getValue()); @@ -197,7 +197,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V || DevicTool.getInstance().isSerialPortHandset()) { release(); // 黄色手持机 - LogUtil.i(getString(R.string.handset)); + LogUtil.i(TAG,getString(R.string.handset)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.HANDSET.getValue()); @@ -207,14 +207,14 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V && height <= 500) { release(); // 小pos机 - LogUtil.i(getString(R.string.small_pos)); + LogUtil.i(TAG,getString(R.string.small_pos)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.SMALL_POS.getValue()); } else if (DevicTool.getInstance().isSerialPort() || DevicTool.getInstance().isIdPosPrint()) { // 一般pos机 - LogUtil.i(getString(R.string.general_pos)); + LogUtil.i(TAG,getString(R.string.general_pos)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.GENERAL_POS.getValue()); @@ -222,7 +222,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V //盛本pos机测试******************************* else if (BindService.getInstance().isBasewin()) { // 盛本pos机 - LogUtil.i("盛本POS机"); + LogUtil.i(TAG,"盛本POS机"); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.BASEWIN_REB_POS.getValue()); @@ -231,7 +231,7 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V else { release(); // 手机 - LogUtil.i(getString(R.string.mobile)); + LogUtil.i(TAG,getString(R.string.mobile)); SharedPreferences2Obj.getInstance(MainActivity.this) .setName("MachineType") .setObject("type", DeviceType.MOBILE.getValue()); diff --git a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java index 3c68a57..2a4a497 100644 --- a/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java +++ b/src/com/ectrip/cyt/ui/NewHandleScanerActivity.java @@ -159,7 +159,7 @@ public class NewHandleScanerActivity extends BaseActivity { } else { try { if (result.startsWith("CYT_")) { - LogUtil.i("result = " + result); + LogUtil.i(TAG,"result = " + result); typeScan = 0; if (result.contains(",")) { result = result.substring(result.indexOf("_") + 1, result.indexOf(",")); diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java index 16ea3b1..7dff667 100644 --- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java +++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java @@ -177,7 +177,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback { QRCodeOrderListActivity.class); intent.putExtra("mode", 1); intent.putExtra("input_orid", resultString); - LogUtil.i(getString(R.string.scan_result) + resultString); + LogUtil.i(TAG,getString(R.string.scan_result) + resultString); intent.putExtra("titleName", getString(R.string.show_result)); intent.putExtra("typeScan", typeScan); startActivity(intent); diff --git a/src/com/ectrip/cyt/ui/ScanerHandsetActivity.java b/src/com/ectrip/cyt/ui/ScanerHandsetActivity.java index 7f80154..0807be9 100644 --- a/src/com/ectrip/cyt/ui/ScanerHandsetActivity.java +++ b/src/com/ectrip/cyt/ui/ScanerHandsetActivity.java @@ -189,7 +189,7 @@ public class ScanerHandsetActivity extends SerialPortHandsetActivity { QRCodeOrderListActivity.class); intent.putExtra("mode", 1); intent.putExtra("input_orid", resultString); - LogUtil.i("scan_result:" + resultString); + LogUtil.i(TAG,"scan_result:" + resultString); intent.putExtra("titleName", getString(R.string.show_result)); startActivity(intent); diff --git a/src/com/ectrip/cyt/ui/ScanerIdCardActivity.java b/src/com/ectrip/cyt/ui/ScanerIdCardActivity.java index 71ec8db..53a8841 100644 --- a/src/com/ectrip/cyt/ui/ScanerIdCardActivity.java +++ b/src/com/ectrip/cyt/ui/ScanerIdCardActivity.java @@ -142,10 +142,10 @@ public class ScanerIdCardActivity extends BaseActivity { public void readIdCard(int num) throws Throwable { if (idcread.Authenticate() == 1 && !isStop.get())/* 身份证认证 */ { - LogUtil.d(getString(R.string.id_auth_success)); + LogUtil.d(TAG,getString(R.string.id_auth_success)); if (idcread.ReadContent("/mnt/sdcard/") == 1)/* 读取身份证数据 */// { - LogUtil.d(getString(R.string.read_id_info_success)); + LogUtil.d(TAG,getString(R.string.read_id_info_success)); try { testRead(); } catch (Exception e) { @@ -170,7 +170,7 @@ public class ScanerIdCardActivity extends BaseActivity { e.printStackTrace(); } } - LogUtil.d(getString(R.string.read_id_info_fail)); + LogUtil.d(TAG,getString(R.string.read_id_info_fail)); MToast(ScanerIdCardActivity.this, getString(R.string.read_id_info_fail), MToast.LENGTH_SHORT); @@ -191,7 +191,7 @@ public class ScanerIdCardActivity extends BaseActivity { } } num = 0; - LogUtil.d(getString(R.string.id_auth_fail)); + LogUtil.d(TAG,getString(R.string.id_auth_fail)); MToast(ScanerIdCardActivity.this, getString(R.string.id_stick_to_the_back), MToast.LENGTH_SHORT); diff --git a/src/com/ectrip/cyt/ui/SettingsActivity.java b/src/com/ectrip/cyt/ui/SettingsActivity.java index a475ec1..56b15d8 100644 --- a/src/com/ectrip/cyt/ui/SettingsActivity.java +++ b/src/com/ectrip/cyt/ui/SettingsActivity.java @@ -635,14 +635,14 @@ public class SettingsActivity extends BaseActivity implements OnClickListener, if (!ec_name.equals("")) { try { ec_name = AESEncryptor.decrypt(constant.decrypt, ec_name); - LogUtil.d(getString(R.string.enterprise_communication_identifier) + LogUtil.d(TAG,getString(R.string.enterprise_communication_identifier) + ec_name); ec_name = AESEncryptor.encrypt(constant.decrypt, ec_name); } catch (Exception ex) { try { ec_name = AESEncryptor.encrypt(constant.decrypt, ec_name); - LogUtil.d(getString(R.string.not_successfully_decrypt) + LogUtil.d(TAG,getString(R.string.not_successfully_decrypt) + ec_name); } catch (Exception e) { e.printStackTrace(); diff --git a/src/com/ectrip/cyt/utils/LogUtil.java b/src/com/ectrip/cyt/utils/LogUtil.java index 5f36c3e..6015579 100644 --- a/src/com/ectrip/cyt/utils/LogUtil.java +++ b/src/com/ectrip/cyt/utils/LogUtil.java @@ -1,7 +1,15 @@ package com.ectrip.cyt.utils; +import android.text.TextUtils; import android.util.Log; +import com.ectrip.cyt.exceptionsave.debug.ConfigureLog4J; + +import org.apache.log4j.Logger; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + /** * Log统一管理类 */ @@ -9,106 +17,85 @@ public class LogUtil { public static boolean isDebug = true;// 是否需要打印bug，可以在application的onCreate函数里面初始化 private static final String TAG = "MyAndroid"; - + private static boolean isConfigured = false; // 下面四个是默认tag的函数 - public static void i(String msg) - { - if (isDebug) - try { - Log.i(TAG, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void d(String tag, String message) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.debug(message); + } } - public static void d(String msg) - { - if (isDebug) - try { - Log.d(TAG, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void d(String tag, String message, Throwable exception) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.debug(message, exception); + } } - public static void w(String msg) - { - if (isDebug) - try { - Log.w(TAG, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void i(String tag, String message) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.info(message); + } } - public static void e(String msg) - { - if (isDebug) - try { - Log.e(TAG, msg); - } catch (Exception e1) { - e1.printStackTrace(); - } + public static void i(String tag, String message, Throwable exception) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.info(message, exception); + } } - public static void v(String msg) - { - if (isDebug) - try { - Log.v(TAG, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void w(String tag, String message) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.warn(message); + } } - // 下面是传入自定义tag的函数 - public static void i(String tag, String msg) - { - if (isDebug) - try { - Log.i(tag, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void w(String tag, String message, Throwable exception) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.warn(message, exception); + } } - public static void d(String tag, String msg) - { - if (isDebug) - try { - Log.d(tag, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void e(String tag, String message) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.error(message); + } } - public static void w(String tag,String msg) - { - if (isDebug) - try { - Log.w(tag, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static void e(String tag, String message, Throwable exception) { + if (isDebug) { + Logger LOGGER = getLogger(tag); + LOGGER.error(message, exception); + } } - public static void e(String tag, String msg) - { - if (isDebug) - try { - Log.e(tag, msg); - } catch (Exception e1) { - e1.printStackTrace(); - } + private static Logger getLogger(String tag) { + if (!isConfigured) { + ConfigureLog4J configureLog4J = new ConfigureLog4J(); + configureLog4J.configure(); + isConfigured = true; + } + Logger logger; + if (TextUtils.isEmpty(tag)) { + logger = Logger.getRootLogger(); + } else { + logger = Logger.getLogger(tag); + } + return logger; } - public static void v(String tag, String msg) - { - if (isDebug) - try { - Log.v(tag, msg); - } catch (Exception e) { - e.printStackTrace(); - } + public static String getExMsg(Exception e) { + e.printStackTrace(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + e.printStackTrace(new PrintStream(baos)); + String exception = baos.toString(); + return exception; + } } \ No newline at end of file diff --git a/src/com/ectrip/cyt/version/DownApkRunnable.java b/src/com/ectrip/cyt/version/DownApkRunnable.java index 5c3f934..9b06c41 100644 --- a/src/com/ectrip/cyt/version/DownApkRunnable.java +++ b/src/com/ectrip/cyt/version/DownApkRunnable.java @@ -190,7 +190,7 @@ public class DownApkRunnable implements Runnable { int count = 0; byte buf[] = new byte[1024]; // 总大小 - LogUtil.d(df.format((float) length / 1024 / 1024) + "MB"); + LogUtil.d("DownApkRunnable",df.format((float) length / 1024 / 1024) + "MB"); do { int numread = is.read(buf); count += numread; @@ -198,7 +198,7 @@ public class DownApkRunnable implements Runnable { String tmpFileSize = df.format((float) count / 1024 / 1024) + "MB"; // 当前进度值 progress = (int) (((float) count / length) * 100); - LogUtil.d(numread + "apkFileSize" + LogUtil.d("DownApkRunnable",numread + "apkFileSize" + conn.getContentLength()); // 更新进度 progressBean.setProgress(progress); diff --git a/src/com/ectrip/cyt/zxing/camera/FlashlightManager.java b/src/com/ectrip/cyt/zxing/camera/FlashlightManager.java index 5d6d0f2..3ab9f21 100644 --- a/src/com/ectrip/cyt/zxing/camera/FlashlightManager.java +++ b/src/com/ectrip/cyt/zxing/camera/FlashlightManager.java @@ -17,9 +17,9 @@ final class FlashlightManager { iHardwareService = getHardwareService(); setFlashEnabledMethod = getSetFlashEnabledMethod(iHardwareService); if (iHardwareService == null) { - LogUtil.v(TAG, "This device does supports control of a flashlight"); + LogUtil.i(TAG, "This device does supports control of a flashlight"); } else { - LogUtil.v(TAG, "This device does not support control of a flashlight"); + LogUtil.i(TAG, "This device does not support control of a flashlight"); } } diff --git a/src/com/ectrip/trips/net/DataTool.java b/src/com/ectrip/trips/net/DataTool.java index 0525cdf..5daf235 100644 --- a/src/com/ectrip/trips/net/DataTool.java +++ b/src/com/ectrip/trips/net/DataTool.java @@ -12,6 +12,7 @@ import com.ectrip.cyt.utils.LogUtil; import com.fourmob.datetimepicker.Utils; public class DataTool { + public static final String TAG = "DataTool"; /** * 通过signkey和data验证数据,验证通过会返回true,未通过返回false * 不建议外部调用此方法 @@ -79,13 +80,13 @@ public class DataTool { try { String signData = signkey + data; String base64 = Base64.encode(signData.getBytes("UTF-8")); - LogUtil.i("responseData:" + base64); + LogUtil.i(TAG,"responseData:" + base64); String responseSign = MD5Util.signMD5(base64,"UTF-8"); - LogUtil.i("responseSign：" + responseSign); + LogUtil.i(TAG,"responseSign：" + responseSign); return responseSign; } catch (UnsupportedEncodingException e) { e.printStackTrace(); - LogUtil.i("OTA Service ： getErrorResponseJson : String to xml UTF-8 Error !"); + LogUtil.i(TAG,"OTA Service ： getErrorResponseJson : String to xml UTF-8 Error !"); }catch (Exception e){ e.printStackTrace(); } diff --git a/src/com/ectrip/trips/net/HttpHelper.java b/src/com/ectrip/trips/net/HttpHelper.java index 8fff745..d601b44 100644 --- a/src/com/ectrip/trips/net/HttpHelper.java +++ b/src/com/ectrip/trips/net/HttpHelper.java @@ -29,7 +29,7 @@ import com.ectrip.cyt.utils.SharedPreferences2Obj; * @author jigo 网络访问工具类 */ public class HttpHelper extends HttpHelperCore { - + public static final String TAG = "HttpHelper"; private Context mContext; public static HttpHelper helper = null; @@ -85,11 +85,11 @@ public class HttpHelper extends HttpHelperCore { String requestParam = DataTool.envelopeData(orderRequest, MyApp .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); map.put("requestParam", requestParam); - LogUtil.i(requestParam + "requestParam"); + LogUtil.i(TAG,requestParam + "requestParam"); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); - LogUtil.i("url = " + "http://" + MyApp.getInstance().getServiceIp() + action); + LogUtil.i(TAG,"url = " + "http://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -127,7 +127,7 @@ public class HttpHelper extends HttpHelperCore { String requestParam = DataTool.envelopeData(consumeCount, MyApp .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); @@ -167,7 +167,7 @@ public class HttpHelper extends HttpHelperCore { String requestParam = DataTool.envelopeData(consumeCount, MyApp .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); @@ -206,7 +206,7 @@ public class HttpHelper extends HttpHelperCore { String requestParam = DataTool.envelopeData(consumeCount, MyApp .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); @@ -243,7 +243,7 @@ public class HttpHelper extends HttpHelperCore { MyApp.getInstance().getSignkey(), MyApp.getInstance() .getIdentity()); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); @@ -288,7 +288,7 @@ public class HttpHelper extends HttpHelperCore { MyApp.getInstance().getSignkey(), MyApp.getInstance() .getIdentity()); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); @@ -330,7 +330,7 @@ public class HttpHelper extends HttpHelperCore { String requestParam = DataTool.envelopeData(detectVersionRequest, signkey, identity); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost("http://" + url + action, "", map, httpCallback, "data", DataTrans.class); } @@ -358,7 +358,7 @@ public class HttpHelper extends HttpHelperCore { MyApp.getInstance().getSignkey(), MyApp.getInstance() .getIdentity()); map.put("requestParam", requestParam); - LogUtil.i("requestParam" + requestParam); + LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( "http://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); diff --git a/src/com/ectrip/trips/net/HttpPostRunnable.java b/src/com/ectrip/trips/net/HttpPostRunnable.java index a65f4ac..b5f30b9 100644 --- a/src/com/ectrip/trips/net/HttpPostRunnable.java +++ b/src/com/ectrip/trips/net/HttpPostRunnable.java @@ -233,24 +233,24 @@ public class HttpPostRunnable implements Runnable { try { // 获取服务器返回码 if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) { - LogUtil.v(TAG, "服务器成功返回网页"); + LogUtil.i(TAG, "服务器成功返回网页"); bufReader = new BufferedReader(new InputStreamReader( connection.getInputStream(), "UTF-8")); while ((line = bufReader.readLine()) != null) { result.append(line); } - LogUtil.v(TAG, "返回数据：" + result.toString()); + LogUtil.i(TAG, "返回数据：" + result.toString()); } else if (connection.getResponseCode() == 400) { - LogUtil.v(TAG, "服务器不理解请求的语法"); + LogUtil.i(TAG, "服务器不理解请求的语法"); return "CODE-"+"400错误!"; } else if (connection.getResponseCode() == 404) { - LogUtil.v(TAG, "服务器找不到请求的网页"); + LogUtil.i(TAG, "服务器找不到请求的网页"); return "CODE-"+"404错误!"; } else if (connection.getResponseCode() == 500) { - LogUtil.v(TAG, "服务端升级或者服务端程序有问题:500"); + LogUtil.i(TAG, "服务端升级或者服务端程序有问题:500"); return "CODE-"+"500错误!"; } else { - LogUtil.v(TAG, "响应失败" + connection.getResponseCode()); + LogUtil.i(TAG, "响应失败" + connection.getResponseCode()); return "CODE-"+"响应失败" + connection.getResponseCode(); } } catch (IOException e) {