diff --git a/res/layout/app_main.xml b/res/layout/app_main.xml index ad69c24..c37fb08 100644 --- a/res/layout/app_main.xml +++ b/res/layout/app_main.xml @@ -32,12 +32,14 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="15dp" - android:background="#cccccc" /> + android:background="#cccccc" + android:visibility="gone"/> + android:orientation="horizontal" + android:visibility="gone"> data = new ArrayList(); data.add(new ImageInfo(getString(R.string.check), R.drawable.check_selector, R.drawable.icon_bg02, Module.CHECK)); - data.add(new ImageInfo(getString(R.string.reprint), - R.drawable.repaint_selector, R.drawable.icon_bg02, Module.REPRINT)); +// data.add(new ImageInfo(getString(R.string.reprint), +// R.drawable.repaint_selector, R.drawable.icon_bg02, Module.REPRINT)); data.add(new ImageInfo(getString(R.string.query), R.drawable.check_order, R.drawable.icon_bg02, Module.QUERY)); data.add(new ImageInfo(getString(R.string.system_setting), R.drawable.set_selector, R.drawable.icon_bg02, Module.SETTING)); - data.add(new ImageInfo(getString(R.string.statistic), - R.drawable.statistic_selector, R.drawable.icon_bg02, - Module.STATISTIC)); - data.add(new ImageInfo(getString(R.string.about), - R.drawable.about, R.drawable.icon_bg02, - Module.ABOUT)); +// data.add(new ImageInfo(getString(R.string.statistic), +// R.drawable.statistic_selector, R.drawable.icon_bg02, +// Module.STATISTIC)); +// data.add(new ImageInfo(getString(R.string.about), +// R.drawable.about, R.drawable.icon_bg02, +// Module.ABOUT)); return data; } diff --git a/src/com/ectrip/trips/net/HttpHelper.java b/src/com/ectrip/trips/net/HttpHelper.java index 74c7f67..0fb542d 100644 --- a/src/com/ectrip/trips/net/HttpHelper.java +++ b/src/com/ectrip/trips/net/HttpHelper.java @@ -90,9 +90,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,requestParam + "requestParam"); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); - LogUtil.i(TAG,"url = " + "http://" + MyApp.getInstance().getServiceIp() + action); + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -132,9 +132,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); - + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -172,9 +172,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); - + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -212,8 +212,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -255,8 +256,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -305,8 +307,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); if (testMOdel != null && testMOdel) { // 这个是调试弹框 if (type == null) { return; @@ -351,8 +354,9 @@ public class HttpHelper extends HttpHelperCore { signkey, identity); map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); - executeHttpPost("http://" + url + action, "", map, httpCallback, + executeHttpPost("https://" + url + action, "", map, httpCallback, "data", DataTrans.class); + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); } @@ -382,9 +386,9 @@ public class HttpHelper extends HttpHelperCore { map.put("requestParam", requestParam); LogUtil.i(TAG,"requestParam" + requestParam); executeHttpPost( - "http://" + MyApp.getInstance().getServiceIp() + action, "", + "https://" + MyApp.getInstance().getServiceIp() + action, "", map, httpCallback, "data", DataTrans.class); - + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action); } }