Commit 5503853c5a439e17f61f34b0d1b96272b0be0024

Authored by 杜方
1 parent fe95a7d1

畅游通核销app(湖南文旅):1.修改http为https 2.主界面只保留检票操作、订单查询、系统设置

res/layout/app_main.xml
@@ -32,12 +32,14 @@ @@ -32,12 +32,14 @@
32 android:layout_width="match_parent" 32 android:layout_width="match_parent"
33 android:layout_height="0.5dp" 33 android:layout_height="0.5dp"
34 android:layout_marginTop="15dp" 34 android:layout_marginTop="15dp"
35 - android:background="#cccccc" /> 35 + android:background="#cccccc"
  36 + android:visibility="gone"/>
36 37
37 <LinearLayout 38 <LinearLayout
38 android:layout_width="match_parent" 39 android:layout_width="match_parent"
39 android:layout_height="wrap_content" 40 android:layout_height="wrap_content"
40 - android:orientation="horizontal"> 41 + android:orientation="horizontal"
  42 + android:visibility="gone">
41 43
42 <TextView 44 <TextView
43 android:id="@+id/username" 45 android:id="@+id/username"
src/com/ectrip/cyt/ui/MainActivity.java
@@ -402,18 +402,18 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V @@ -402,18 +402,18 @@ public class MainActivity extends BaseActivity implements OnItemClickListener, V
402 ArrayList<ImageInfo> data = new ArrayList<ImageInfo>(); 402 ArrayList<ImageInfo> data = new ArrayList<ImageInfo>();
403 data.add(new ImageInfo(getString(R.string.check), 403 data.add(new ImageInfo(getString(R.string.check),
404 R.drawable.check_selector, R.drawable.icon_bg02, Module.CHECK)); 404 R.drawable.check_selector, R.drawable.icon_bg02, Module.CHECK));
405 - data.add(new ImageInfo(getString(R.string.reprint),  
406 - R.drawable.repaint_selector, R.drawable.icon_bg02, Module.REPRINT)); 405 +// data.add(new ImageInfo(getString(R.string.reprint),
  406 +// R.drawable.repaint_selector, R.drawable.icon_bg02, Module.REPRINT));
407 data.add(new ImageInfo(getString(R.string.query), 407 data.add(new ImageInfo(getString(R.string.query),
408 R.drawable.check_order, R.drawable.icon_bg02, Module.QUERY)); 408 R.drawable.check_order, R.drawable.icon_bg02, Module.QUERY));
409 data.add(new ImageInfo(getString(R.string.system_setting), 409 data.add(new ImageInfo(getString(R.string.system_setting),
410 R.drawable.set_selector, R.drawable.icon_bg02, Module.SETTING)); 410 R.drawable.set_selector, R.drawable.icon_bg02, Module.SETTING));
411 - data.add(new ImageInfo(getString(R.string.statistic),  
412 - R.drawable.statistic_selector, R.drawable.icon_bg02,  
413 - Module.STATISTIC));  
414 - data.add(new ImageInfo(getString(R.string.about),  
415 - R.drawable.about, R.drawable.icon_bg02,  
416 - Module.ABOUT)); 411 +// data.add(new ImageInfo(getString(R.string.statistic),
  412 +// R.drawable.statistic_selector, R.drawable.icon_bg02,
  413 +// Module.STATISTIC));
  414 +// data.add(new ImageInfo(getString(R.string.about),
  415 +// R.drawable.about, R.drawable.icon_bg02,
  416 +// Module.ABOUT));
417 return data; 417 return data;
418 } 418 }
419 419
src/com/ectrip/trips/net/HttpHelper.java
@@ -90,9 +90,9 @@ public class HttpHelper extends HttpHelperCore { @@ -90,9 +90,9 @@ public class HttpHelper extends HttpHelperCore {
90 map.put("requestParam", requestParam); 90 map.put("requestParam", requestParam);
91 LogUtil.i(TAG,requestParam + "requestParam"); 91 LogUtil.i(TAG,requestParam + "requestParam");
92 executeHttpPost( 92 executeHttpPost(
93 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 93 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
94 map, httpCallback, "data", DataTrans.class); 94 map, httpCallback, "data", DataTrans.class);
95 - LogUtil.i(TAG,"url = " + "http://" + MyApp.getInstance().getServiceIp() + action); 95 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
96 if (testMOdel != null && testMOdel) { // 这个是调试弹框 96 if (testMOdel != null && testMOdel) { // 这个是调试弹框
97 if (type == null) { 97 if (type == null) {
98 return; 98 return;
@@ -132,9 +132,9 @@ public class HttpHelper extends HttpHelperCore { @@ -132,9 +132,9 @@ public class HttpHelper extends HttpHelperCore {
132 map.put("requestParam", requestParam); 132 map.put("requestParam", requestParam);
133 LogUtil.i(TAG,"requestParam" + requestParam); 133 LogUtil.i(TAG,"requestParam" + requestParam);
134 executeHttpPost( 134 executeHttpPost(
135 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 135 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
136 map, httpCallback, "data", DataTrans.class); 136 map, httpCallback, "data", DataTrans.class);
137 - 137 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
138 if (testMOdel != null && testMOdel) { // 这个是调试弹框 138 if (testMOdel != null && testMOdel) { // 这个是调试弹框
139 if (type == null) { 139 if (type == null) {
140 return; 140 return;
@@ -172,9 +172,9 @@ public class HttpHelper extends HttpHelperCore { @@ -172,9 +172,9 @@ public class HttpHelper extends HttpHelperCore {
172 map.put("requestParam", requestParam); 172 map.put("requestParam", requestParam);
173 LogUtil.i(TAG,"requestParam" + requestParam); 173 LogUtil.i(TAG,"requestParam" + requestParam);
174 executeHttpPost( 174 executeHttpPost(
175 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 175 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
176 map, httpCallback, "data", DataTrans.class); 176 map, httpCallback, "data", DataTrans.class);
177 - 177 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
178 if (testMOdel != null && testMOdel) { // 这个是调试弹框 178 if (testMOdel != null && testMOdel) { // 这个是调试弹框
179 if (type == null) { 179 if (type == null) {
180 return; 180 return;
@@ -212,8 +212,9 @@ public class HttpHelper extends HttpHelperCore { @@ -212,8 +212,9 @@ public class HttpHelper extends HttpHelperCore {
212 map.put("requestParam", requestParam); 212 map.put("requestParam", requestParam);
213 LogUtil.i(TAG,"requestParam" + requestParam); 213 LogUtil.i(TAG,"requestParam" + requestParam);
214 executeHttpPost( 214 executeHttpPost(
215 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 215 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
216 map, httpCallback, "data", DataTrans.class); 216 map, httpCallback, "data", DataTrans.class);
  217 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
217 if (testMOdel != null && testMOdel) { // 这个是调试弹框 218 if (testMOdel != null && testMOdel) { // 这个是调试弹框
218 if (type == null) { 219 if (type == null) {
219 return; 220 return;
@@ -255,8 +256,9 @@ public class HttpHelper extends HttpHelperCore { @@ -255,8 +256,9 @@ public class HttpHelper extends HttpHelperCore {
255 map.put("requestParam", requestParam); 256 map.put("requestParam", requestParam);
256 LogUtil.i(TAG,"requestParam" + requestParam); 257 LogUtil.i(TAG,"requestParam" + requestParam);
257 executeHttpPost( 258 executeHttpPost(
258 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 259 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
259 map, httpCallback, "data", DataTrans.class); 260 map, httpCallback, "data", DataTrans.class);
  261 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
260 if (testMOdel != null && testMOdel) { // 这个是调试弹框 262 if (testMOdel != null && testMOdel) { // 这个是调试弹框
261 if (type == null) { 263 if (type == null) {
262 return; 264 return;
@@ -305,8 +307,9 @@ public class HttpHelper extends HttpHelperCore { @@ -305,8 +307,9 @@ public class HttpHelper extends HttpHelperCore {
305 map.put("requestParam", requestParam); 307 map.put("requestParam", requestParam);
306 LogUtil.i(TAG,"requestParam" + requestParam); 308 LogUtil.i(TAG,"requestParam" + requestParam);
307 executeHttpPost( 309 executeHttpPost(
308 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 310 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
309 map, httpCallback, "data", DataTrans.class); 311 map, httpCallback, "data", DataTrans.class);
  312 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
310 if (testMOdel != null && testMOdel) { // 这个是调试弹框 313 if (testMOdel != null && testMOdel) { // 这个是调试弹框
311 if (type == null) { 314 if (type == null) {
312 return; 315 return;
@@ -351,8 +354,9 @@ public class HttpHelper extends HttpHelperCore { @@ -351,8 +354,9 @@ public class HttpHelper extends HttpHelperCore {
351 signkey, identity); 354 signkey, identity);
352 map.put("requestParam", requestParam); 355 map.put("requestParam", requestParam);
353 LogUtil.i(TAG,"requestParam" + requestParam); 356 LogUtil.i(TAG,"requestParam" + requestParam);
354 - executeHttpPost("http://" + url + action, "", map, httpCallback, 357 + executeHttpPost("https://" + url + action, "", map, httpCallback,
355 "data", DataTrans.class); 358 "data", DataTrans.class);
  359 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
356 } 360 }
357 361
358 362
@@ -382,9 +386,9 @@ public class HttpHelper extends HttpHelperCore { @@ -382,9 +386,9 @@ public class HttpHelper extends HttpHelperCore {
382 map.put("requestParam", requestParam); 386 map.put("requestParam", requestParam);
383 LogUtil.i(TAG,"requestParam" + requestParam); 387 LogUtil.i(TAG,"requestParam" + requestParam);
384 executeHttpPost( 388 executeHttpPost(
385 - "http://" + MyApp.getInstance().getServiceIp() + action, "", 389 + "https://" + MyApp.getInstance().getServiceIp() + action, "",
386 map, httpCallback, "data", DataTrans.class); 390 map, httpCallback, "data", DataTrans.class);
387 - 391 + LogUtil.i(TAG,"url = " + "https://" + MyApp.getInstance().getServiceIp() + action);
388 392
389 } 393 }
390 } 394 }