杜方 / CYTAndroid4.0

Commit 7fa57dc5095160ddbfe9c80d9d496cd8c959c9b3

Authored by 杜方
1 parent 22a717ff

畅游通核销app():1. 4.0版本

Inline Side-by-side
Showing 4 changed files with 464 additions and 457 deletions
src/com/ectrip/cyt/ui/IDOrderListActivity.java
  View file @7fa57dc
@@ -50,382 +50,383 @@ import com.ectrip.trips.view.AnimatedExpandableListView; @@ -50,382 +50,383 @@ import com.ectrip.trips.view.AnimatedExpandableListView;
50 * 身份证列表 50 * 身份证列表
51 */ 51 */
52 public class IDOrderListActivity extends BaseActivity implements 52 public class IDOrderListActivity extends BaseActivity implements
53 - ListOnclickCallback {  
54 -  
55 - private AnimatedExpandableListView orderList;  
56 - private ReportExpandableListAdapter adapter;  
57 - private String idcardNumber;  
58 - private List<OrderInfo> orderInfos;  
59 - private Integer type;  
60 - private View errorLayout;  
61 - private TextView errorInfo;  
62 - private Integer Select;  
63 - private int pageSize = 15;  
64 - private int pageSizeDown = 0;  
65 - private int count;  
66 - private View moreView;  
67 - private View footLayout;  
68 - private TextView load_more;  
69 - private ProgressBar load_progress;  
70 - private boolean isUpMove = false;  
71 - private int allItem;  
72 - List<String> list = new ArrayList<>();  
73 - @Override  
74 - protected void onCreate(Bundle savedInstanceState) {  
75 - super.onCreate(savedInstanceState);  
76 - setContentView(R.layout.id_order_list_activity);  
77 - initView();  
78 - init();  
79 - }  
80 -  
81 - private void initFootView() {  
82 - moreView = View.inflate(this, R.layout.listview_loding,  
83 - null);  
84 - footLayout = moreView.findViewById(R.id.footLayout);  
85 - load_more = (TextView) moreView.findViewById(R.id.load_text);  
86 - load_progress = (ProgressBar) moreView.findViewById(R.id.load_progress);  
87 - orderList.addFooterView(moreView);  
88 - footLayout.setVisibility(View.GONE);  
89 - footLayout.setOnClickListener(new OnClickListener() {  
90 - @Override  
91 - public void onClick(View view) {  
92 - if (pageSizeDown>=pageSize){  
93 -  
94 - load_progress.setVisibility(View.VISIBLE);  
95 - load_more.setText("加载中...");  
96 - HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,  
97 - null, idcardNumber, null, null, null,pageSize+"", count+"",  
98 - new MyHttpCallback());  
99 - }  
100 - }  
101 - });  
102 -  
103 - /**  
104 - * 滑动监听,上拉加载  
105 - */  
106 - orderList.setOnScrollListener(new AbsListView.OnScrollListener() {  
107 -  
108 -  
109 -  
110 - @Override  
111 - public void onScrollStateChanged(AbsListView absListView, int scrollState) {  
112 - int position = orderList.getLastVisiblePosition();  
113 -  
114 -  
115 - if (adapter!=null&&position== allItem){  
116 - isUpMove = true;  
117 - }else {  
118 - isUpMove = false;  
119 - }  
120 -  
121 -  
122 - }  
123 -  
124 - @Override  
125 - public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {  
126 -  
127 -  
128 - if (footLayout!=null){  
129 - if (visibleItemCount==totalItemCount-1){  
130 - footLayout.setVisibility(View.VISIBLE);  
131 - load_progress.setVisibility(View.GONE);  
132 - load_more.setText("点击加载更多");  
133 -  
134 - }  
135 -  
136 - }  
137 -  
138 - }  
139 - });  
140 -  
141 -  
142 - orderList.setOnTouchListener(new View.OnTouchListener() {  
143 - float x_temp01 = 0.0f;  
144 - float y_temp01 = 0.0f;  
145 - float x_temp02 = 0.0f;  
146 - float y_temp02 = 0.0f;  
147 - @Override  
148 - public boolean onTouch(View view, MotionEvent motionEvent) {  
149 -  
150 - //获得当前坐标  
151 - float x = motionEvent.getX();  
152 - float y = motionEvent.getY();  
153 - switch (motionEvent.getAction()){  
154 - case MotionEvent.ACTION_DOWN:  
155 -  
156 - x_temp01 = x;  
157 - y_temp01 = y;  
158 - break;  
159 - case MotionEvent.ACTION_MOVE:  
160 -  
161 - break;  
162 -  
163 - case MotionEvent.ACTION_UP:  
164 -  
165 - x_temp02 = x;  
166 - y_temp02 = y;  
167 - if (isUpMove&&y_temp01-y_temp02>0&&Math.abs(y_temp02-y_temp01)>Math.abs(x_temp02-x_temp01)){  
168 - if (pageSizeDown>=pageSize){  
169 - load_progress.setVisibility(View.VISIBLE);  
170 - load_more.setText("加载中...");  
171 - HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,  
172 - null, idcardNumber, null, null, null,pageSize+"", count+"",  
173 - new MyHttpCallback());  
174 - }  
175 - }  
176 - break;  
177 - }  
178 -  
179 - return false;  
180 - }  
181 - });  
182 -  
183 -  
184 -  
185 - }  
186 -  
187 - private void initView() {  
188 - errorLayout = findViewById(R.id.errorLayout);  
189 - errorInfo = (TextView) errorLayout.findViewById(R.id.errorInfo);  
190 - Select = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)  
191 - .setName("SelectAction").getObject("Select", Integer.class);  
192 - if (Select != null) {  
193 - if (Select == SelectAction.Check.getValue()) {  
194 - ((TextView) findViewById(R.id.title))  
195 - .setText(getString(R.string.order_list_check));  
196 - } else if (Select == SelectAction.Reprint.getValue()) {  
197 - ((TextView) findViewById(R.id.title))  
198 - .setText(getString(R.string.order_list_reprint));  
199 - } else if (Select == SelectAction.Query.getValue()) {  
200 - ((TextView) findViewById(R.id.title))  
201 - .setText(getString(R.string.order_list_query));  
202 - }  
203 - } else {  
204 - ((TextView) findViewById(R.id.title))  
205 - .setText(getString(R.string.order_list));  
206 - }  
207 - ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);  
208 - orderList = (AnimatedExpandableListView) findViewById(R.id.orderList);  
209 - orderList.setGroupIndicator(null);  
210 -  
211 - initFootView();  
212 -  
213 - findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {  
214 - @Override  
215 - public void onClick(View v) {  
216 - finish();  
217 - }  
218 - });  
219 - }  
220 -  
221 - private void init() {  
222 - type = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)  
223 - .setName("MachineType").getObject("type", Integer.class);  
224 - idcardNumber = getIntent().getStringExtra("idcardNumber");  
225 - count = 1;  
226 - orderInfos = new ArrayList<OrderInfo>() ;  
227 - HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,  
228 - null, idcardNumber, null, null, null,pageSize+"", count+"",  
229 - new MyHttpCallback());  
230 - }  
231 -  
232 - /**  
233 - * @author jigo 查询订单  
234 - */  
235 - public class MyHttpCallback extends HttpCallback<DataTrans> {  
236 - ProgressDialog dialog = null;  
237 - private String signed;  
238 - private String data;  
239 -  
240 - @Override  
241 - public void onStopCallback() {  
242 - }  
243 -  
244 - @Override  
245 - public void onPreCallback() {  
246 - if (dialog == null) {  
247 - // 显示ProgressDialog  
248 - dialog = new ProgressDialog(IDOrderListActivity.this);  
249 - dialog.setMessage(getString(R.string.get_order));  
250 - dialog.setCanceledOnTouchOutside(true);  
251 - dialog.setCancelable(true);  
252 - if (type == DeviceType.HANDSET.getValue()) {  
253 - dialog.getWindow().setType(  
254 - WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);  
255 - }  
256 - try {  
257 - if (dialog != null && !dialog.isShowing()) {  
258 - dialog.show();  
259 - }  
260 - } catch (Exception e) {  
261 - e.printStackTrace();  
262 - }  
263 - } else {  
264 - dialog.setMessage(getString(R.string.get_order));  
265 - }  
266 - }  
267 -  
268 - @Override  
269 - public void onFailureCallback(String FailureStr) {  
270 - orderList.setEmptyView(errorLayout);  
271 - errorLayout.setVisibility(View.VISIBLE); // 错误信息提示  
272 - if (dialog != null && dialog.isShowing()) {  
273 - try {  
274 - dialog.dismiss();  
275 - } catch (Exception e) {  
276 - e.printStackTrace();  
277 - } catch (Throwable e) {  
278 - e.printStackTrace();  
279 - }  
280 - }  
281 - //播放语音  
282 - SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.wuxiaopiao);  
283 - if (FailureStr != null) {  
284 - errorInfo.setText(FailureStr);  
285 - MToast(IDOrderListActivity.this, FailureStr, Toast.LENGTH_LONG);  
286 - }  
287 - }  
288 -  
289 - @Override  
290 - public void onCompletedCallback(DataTrans result) {  
291 - }  
292 -  
293 - @Override  
294 - public void afterCompletedCallback(DataTrans result) {  
295 - LogUtil.d("IDOrderListActivity","result_data = "+result.getData());  
296 - if (result != null) {  
297 - signed = result.getSigned();  
298 - data = result.getData();  
299 - parse2(result.getData(), QueryOrderResponse.class,IDOrderListActivity.this);  
300 - } else {  
301 - if (dialog != null && dialog.isShowing()) {  
302 - try {  
303 - dialog.dismiss();  
304 - } catch (Exception e) {  
305 - e.printStackTrace();  
306 - } catch (Throwable e) {  
307 - e.printStackTrace();  
308 - }  
309 - }  
310 - //播放语音  
311 - SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);  
312 - MToast(IDOrderListActivity.this,  
313 - getString(R.string.get_order_error), Toast.LENGTH_LONG);  
314 - }  
315 - }  
316 -  
317 - @Override  
318 - public void onAgainParseCallback(Object parse) {  
319 - if (dialog != null && dialog.isShowing()) {  
320 - try {  
321 - dialog.dismiss();  
322 - } catch (Exception e) {  
323 - e.printStackTrace();  
324 - } catch (Throwable e) {  
325 - e.printStackTrace();  
326 - }  
327 - }  
328 - if (parse != null) {  
329 - QueryOrderResponse orderResponse = (QueryOrderResponse) parse;  
330 - String code = orderResponse.getCode();  
331 - if (code != null && OrderCode.SUCESS.getValue().equals(code)) {  
332 - Intent intent = new Intent("cyt.idcard.action");  
333 - intent.putExtra("sucess",true);  
334 - sendBroadcast(intent); //成功的情况,通知前一个页面,清空输入信息  
335 - if (signed == null  
336 - || signed.equals(DataTool.getSign(MyApp  
337 - .getInstance().getSignkey(), data))) {  
338 - pageSizeDown = orderResponse.getOrderInfos().size();  
339 - if (pageSizeDown<pageSize){  
340 - footLayout.setVisibility(View.VISIBLE);  
341 - load_more.setText("已经加载全部");  
342 - load_progress.setVisibility(View.GONE);  
343 - }else {  
344 - footLayout.setVisibility(View.VISIBLE);  
345 - load_progress.setVisibility(View.GONE);  
346 - load_more.setText("点击加载更多");  
347 - }  
348 - orderInfos.addAll(orderResponse.getOrderInfos());  
349 - count++;  
350 -  
351 - allItem = orderInfos.size();  
352 - for (int i=0;i<orderInfos.size();i++){  
353 - allItem = allItem +orderInfos.get(i).getProducts().size();  
354 - }  
355 - if (orderInfos != null) {  
356 - if (adapter==null){  
357 - adapter = new ReportExpandableListAdapter(  
358 - IDOrderListActivity.this,  
359 - IDOrderListActivity.this, orderInfos,1);  
360 - orderList.setAdapter(adapter);  
361 - }else {  
362 - adapter.notifyDataSetChanged();  
363 - }  
364 -  
365 -  
366 - //取消分割线  
367 - orderList.setDivider(null);  
368 - //默认展开  
369 - for (int i = 0; i < orderInfos.size(); i++) {  
370 - orderList.expandGroup(i);  
371 - }  
372 -  
373 - //点击不可收缩  
374 - orderList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {  
375 -  
376 - @Override  
377 - public boolean onGroupClick(ExpandableListView parent, View v,  
378 - int groupPosition, long id) {  
379 - return true;  
380 - }  
381 - });  
382 -  
383 - } else {  
384 - //播放语音  
385 - SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);  
386 - MToast(IDOrderListActivity.this,  
387 - getString(R.string.get_order_error),  
388 - Toast.LENGTH_LONG);  
389 - }  
390 - } else {  
391 - //播放语音  
392 - SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);  
393 - onFailureCallback(getString(R.string.sign_not_pass));  
394 - MToast(IDOrderListActivity.this,  
395 - getString(R.string.sign_not_pass),  
396 - Toast.LENGTH_LONG);  
397 - }  
398 - } else {  
399 - //播放语音  
400 - SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);  
401 - onFailureCallback(orderResponse.getDescribe());  
402 - MToast(IDOrderListActivity.this,  
403 - orderResponse.getDescribe(), Toast.LENGTH_LONG);  
404 - }  
405 - }  
406 - }  
407 - }  
408 -  
409 - CenterHandle centerHandle;  
410 -  
411 - @Override  
412 - public void onclickCallback(View view, int position) {  
413 - if (view.getId() == R.id.ticketPrint) {  
414 - String pwd = orderInfos.get(position).getCredentials();  
415 - pwd = pwd.substring(6, 14);  
416 - if (centerHandle == null) {  
417 - centerHandle = new CenterHandle(IDOrderListActivity.this,  
418 - orderInfos, pwd, "TRUE", IDOrderListActivity.this);  
419 - }  
420 - centerHandle.allTicket(position, pwd, "TRUE");  
421 - } else if (view.getId() == R.id.part) {  
422 - try {  
423 - String pwd = orderInfos.get(position).getCredentials();  
424 - pwd = pwd.substring(6, 14);  
425 - if (centerHandle == null) {  
426 - centerHandle = new CenterHandle(IDOrderListActivity.this,  
427 - orderInfos, pwd, "TRUE", IDOrderListActivity.this);  
428 - } 53 + ListOnclickCallback {
  54 +
  55 + private AnimatedExpandableListView orderList;
  56 + private ReportExpandableListAdapter adapter;
  57 + private String idcardNumber;
  58 + private List<OrderInfo> orderInfos;
  59 + private Integer type;
  60 + private View errorLayout;
  61 + private TextView errorInfo;
  62 + private Integer Select;
  63 + private int pageSize = 15;
  64 + private int pageSizeDown = 0;
  65 + private int count;
  66 + private View moreView;
  67 + private View footLayout;
  68 + private TextView load_more;
  69 + private ProgressBar load_progress;
  70 + private boolean isUpMove = false;
  71 + private int allItem;
  72 + List<String> list = new ArrayList<>();
  73 +
  74 + @Override
  75 + protected void onCreate(Bundle savedInstanceState) {
  76 + super.onCreate(savedInstanceState);
  77 + setContentView(R.layout.id_order_list_activity);
  78 + initView();
  79 + init();
  80 + }
  81 +
  82 + private void initFootView() {
  83 + moreView = View.inflate(this, R.layout.listview_loding,
  84 + null);
  85 + footLayout = moreView.findViewById(R.id.footLayout);
  86 + load_more = (TextView) moreView.findViewById(R.id.load_text);
  87 + load_progress = (ProgressBar) moreView.findViewById(R.id.load_progress);
  88 + orderList.addFooterView(moreView);
  89 + footLayout.setVisibility(View.GONE);
  90 + footLayout.setOnClickListener(new OnClickListener() {
  91 + @Override
  92 + public void onClick(View view) {
  93 + if (pageSizeDown >= pageSize) {
  94 +
  95 + load_progress.setVisibility(View.VISIBLE);
  96 + load_more.setText("加载中...");
  97 + HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
  98 + null, idcardNumber, null, null, null, pageSize + "", count + "",
  99 + new MyHttpCallback());
  100 + }
  101 + }
  102 + });
  103 +
  104 + /**
  105 + * 滑动监听,上拉加载
  106 + */
  107 + orderList.setOnScrollListener(new AbsListView.OnScrollListener() {
  108 +
  109 +
  110 + @Override
  111 + public void onScrollStateChanged(AbsListView absListView, int scrollState) {
  112 + int position = orderList.getLastVisiblePosition();
  113 +
  114 +
  115 + if (adapter != null && position == allItem) {
  116 + isUpMove = true;
  117 + } else {
  118 + isUpMove = false;
  119 + }
  120 +
  121 +
  122 + }
  123 +
  124 + @Override
  125 + public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
  126 +
  127 +
  128 + if (footLayout != null) {
  129 + if (visibleItemCount == totalItemCount - 1) {
  130 + footLayout.setVisibility(View.VISIBLE);
  131 + load_progress.setVisibility(View.GONE);
  132 + load_more.setText("点击加载更多");
  133 +
  134 + }
  135 +
  136 + }
  137 +
  138 + }
  139 + });
  140 +
  141 +
  142 + orderList.setOnTouchListener(new View.OnTouchListener() {
  143 + float x_temp01 = 0.0f;
  144 + float y_temp01 = 0.0f;
  145 + float x_temp02 = 0.0f;
  146 + float y_temp02 = 0.0f;
  147 +
  148 + @Override
  149 + public boolean onTouch(View view, MotionEvent motionEvent) {
  150 +
  151 + //获得当前坐标
  152 + float x = motionEvent.getX();
  153 + float y = motionEvent.getY();
  154 + switch (motionEvent.getAction()) {
  155 + case MotionEvent.ACTION_DOWN:
  156 +
  157 + x_temp01 = x;
  158 + y_temp01 = y;
  159 + break;
  160 + case MotionEvent.ACTION_MOVE:
  161 +
  162 + break;
  163 +
  164 + case MotionEvent.ACTION_UP:
  165 +
  166 + x_temp02 = x;
  167 + y_temp02 = y;
  168 + if (isUpMove && y_temp01 - y_temp02 > 0 && Math.abs(y_temp02 - y_temp01) > Math.abs(x_temp02 - x_temp01)) {
  169 + if (pageSizeDown >= pageSize) {
  170 + load_progress.setVisibility(View.VISIBLE);
  171 + load_more.setText("加载中...");
  172 + HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
  173 + null, idcardNumber, null, null, null, pageSize + "", count + "",
  174 + new MyHttpCallback());
  175 + }
  176 + }
  177 + break;
  178 + }
  179 +
  180 + return false;
  181 + }
  182 + });
  183 +
  184 +
  185 + }
  186 +
  187 + private void initView() {
  188 + errorLayout = findViewById(R.id.errorLayout);
  189 + errorInfo = (TextView) errorLayout.findViewById(R.id.errorInfo);
  190 + Select = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)
  191 + .setName("SelectAction").getObject("Select", Integer.class);
  192 + if (Select != null) {
  193 + if (Select == SelectAction.Check.getValue()) {
  194 + ((TextView) findViewById(R.id.title))
  195 + .setText(getString(R.string.order_list_check));
  196 + } else if (Select == SelectAction.Reprint.getValue()) {
  197 + ((TextView) findViewById(R.id.title))
  198 + .setText(getString(R.string.order_list_reprint));
  199 + } else if (Select == SelectAction.Query.getValue()) {
  200 + ((TextView) findViewById(R.id.title))
  201 + .setText(getString(R.string.order_list_query));
  202 + }
  203 + } else {
  204 + ((TextView) findViewById(R.id.title))
  205 + .setText(getString(R.string.order_list));
  206 + }
  207 + ((TextView) findViewById(R.id.title)).setVisibility(View.VISIBLE);
  208 + orderList = (AnimatedExpandableListView) findViewById(R.id.orderList);
  209 + orderList.setGroupIndicator(null);
  210 +
  211 + initFootView();
  212 +
  213 + findViewById(R.id.topBack).setOnClickListener(new OnClickListener() {
  214 + @Override
  215 + public void onClick(View v) {
  216 + finish();
  217 + }
  218 + });
  219 + }
  220 +
  221 + private void init() {
  222 + type = SharedPreferences2Obj.getInstance(IDOrderListActivity.this)
  223 + .setName("MachineType").getObject("type", Integer.class);
  224 + idcardNumber = getIntent().getStringExtra("idcardNumber");
  225 + count = 1;
  226 + orderInfos = new ArrayList<OrderInfo>();
  227 + HttpHelper.getInstance(IDOrderListActivity.this).queryOrder("ID", null,
  228 + null, idcardNumber, null, null, null, pageSize + "", count + "",
  229 + new MyHttpCallback());
  230 + }
  231 +
  232 + /**
  233 + * @author jigo 查询订单
  234 + */
  235 + public class MyHttpCallback extends HttpCallback<DataTrans> {
  236 + ProgressDialog dialog = null;
  237 + private String signed;
  238 + private String data;
  239 +
  240 + @Override
  241 + public void onStopCallback() {
  242 + }
  243 +
  244 + @Override
  245 + public void onPreCallback() {
  246 + if (dialog == null) {
  247 + // 显示ProgressDialog
  248 + dialog = new ProgressDialog(IDOrderListActivity.this);
  249 + dialog.setMessage(getString(R.string.get_order));
  250 + dialog.setCanceledOnTouchOutside(true);
  251 + dialog.setCancelable(true);
  252 + if (type == DeviceType.HANDSET.getValue()) {
  253 + dialog.getWindow().setType(
  254 + WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
  255 + }
  256 + try {
  257 + if (dialog != null && !dialog.isShowing()) {
  258 + dialog.show();
  259 + }
  260 + } catch (Exception e) {
  261 + e.printStackTrace();
  262 + }
  263 + } else {
  264 + dialog.setMessage(getString(R.string.get_order));
  265 + }
  266 + }
  267 +
  268 + @Override
  269 + public void onFailureCallback(String FailureStr) {
  270 + orderList.setEmptyView(errorLayout);
  271 + errorLayout.setVisibility(View.VISIBLE); // 错误信息提示
  272 + if (dialog != null && dialog.isShowing()) {
  273 + try {
  274 + dialog.dismiss();
  275 + } catch (Exception e) {
  276 + e.printStackTrace();
  277 + } catch (Throwable e) {
  278 + e.printStackTrace();
  279 + }
  280 + }
  281 + //播放语音
  282 + SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.wuxiaopiao);
  283 + if (FailureStr != null) {
  284 + errorInfo.setText(FailureStr);
  285 + MToast(IDOrderListActivity.this, FailureStr, Toast.LENGTH_LONG);
  286 + }
  287 + }
  288 +
  289 + @Override
  290 + public void onCompletedCallback(DataTrans result) {
  291 + }
  292 +
  293 + @Override
  294 + public void afterCompletedCallback(DataTrans result) {
  295 + LogUtil.d("IDOrderListActivity", "result_data = " + result.getData());
  296 + if (result != null) {
  297 + signed = result.getSigned();
  298 + data = result.getData();
  299 + parse2(result.getData(), QueryOrderResponse.class, IDOrderListActivity.this);
  300 + } else {
  301 + if (dialog != null && dialog.isShowing()) {
  302 + try {
  303 + dialog.dismiss();
  304 + } catch (Exception e) {
  305 + e.printStackTrace();
  306 + } catch (Throwable e) {
  307 + e.printStackTrace();
  308 + }
  309 + }
  310 + //播放语音
  311 + SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
  312 + MToast(IDOrderListActivity.this,
  313 + getString(R.string.get_order_error), Toast.LENGTH_LONG);
  314 + }
  315 + }
  316 +
  317 + @Override
  318 + public void onAgainParseCallback(Object parse) {
  319 + if (dialog != null && dialog.isShowing()) {
  320 + try {
  321 + dialog.dismiss();
  322 + } catch (Exception e) {
  323 + e.printStackTrace();
  324 + } catch (Throwable e) {
  325 + e.printStackTrace();
  326 + }
  327 + }
  328 + if (parse != null) {
  329 + QueryOrderResponse orderResponse = (QueryOrderResponse) parse;
  330 + String code = orderResponse.getCode();
  331 + if (code != null && OrderCode.SUCESS.getValue().equals(code)) {
  332 + Intent intent = new Intent("cyt.idcard.action");
  333 + intent.putExtra("sucess", true);
  334 + sendBroadcast(intent); //成功的情况,通知前一个页面,清空输入信息
  335 + if (signed == null
  336 + || signed.equals(DataTool.getSign(MyApp
  337 + .getInstance().getSignkey(), data))) {
  338 + pageSizeDown = orderResponse.getOrderInfos().size();
  339 + if (pageSizeDown < pageSize) {
  340 + footLayout.setVisibility(View.VISIBLE);
  341 + load_more.setText("已经加载全部");
  342 + load_progress.setVisibility(View.GONE);
  343 + } else {
  344 + footLayout.setVisibility(View.VISIBLE);
  345 + load_progress.setVisibility(View.GONE);
  346 + load_more.setText("点击加载更多");
  347 + }
  348 + orderInfos.addAll(orderResponse.getOrderInfos());
  349 + count++;
  350 +
  351 + allItem = orderInfos.size();
  352 + for (int i = 0; i < orderInfos.size(); i++) {
  353 + allItem = allItem + orderInfos.get(i).getProducts().size();
  354 + }
  355 + if (orderInfos != null) {
  356 + if (adapter == null) {
  357 + adapter = new ReportExpandableListAdapter(
  358 + IDOrderListActivity.this,
  359 + IDOrderListActivity.this, orderInfos, 1);
  360 + orderList.setAdapter(adapter);
  361 + } else {
  362 + adapter.notifyDataSetChanged();
  363 + }
  364 +
  365 +
  366 + //取消分割线
  367 + orderList.setDivider(null);
  368 + //默认展开
  369 + for (int i = 0; i < orderInfos.size(); i++) {
  370 + orderList.expandGroup(i);
  371 + }
  372 +
  373 + //点击不可收缩
  374 + orderList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
  375 +
  376 + @Override
  377 + public boolean onGroupClick(ExpandableListView parent, View v,
  378 + int groupPosition, long id) {
  379 + return true;
  380 + }
  381 + });
  382 +
  383 + } else {
  384 + //播放语音
  385 + SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
  386 + MToast(IDOrderListActivity.this,
  387 + getString(R.string.get_order_error),
  388 + Toast.LENGTH_LONG);
  389 + }
  390 + } else {
  391 + //播放语音
  392 + SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
  393 + onFailureCallback(getString(R.string.sign_not_pass));
  394 + MToast(IDOrderListActivity.this,
  395 + getString(R.string.sign_not_pass),
  396 + Toast.LENGTH_LONG);
  397 + }
  398 + } else {
  399 + //播放语音
  400 + SoundUtil.getInstents(IDOrderListActivity.this).playWavSound(R.raw.qingchongxinyanpiao);
  401 + onFailureCallback(orderResponse.getDescribe());
  402 + MToast(IDOrderListActivity.this,
  403 + orderResponse.getDescribe(), Toast.LENGTH_LONG);
  404 + }
  405 + }
  406 + }
  407 + }
  408 +
  409 + CenterHandle centerHandle;
  410 +
  411 + @Override
  412 + public void onclickCallback(View view, int position) {
  413 + if (view.getId() == R.id.ticketPrint) {
  414 + String pwd = orderInfos.get(position).getCredentials();
  415 + pwd = pwd.substring(6, 14);
  416 + if (centerHandle == null) {
  417 + centerHandle = new CenterHandle(IDOrderListActivity.this,
  418 + orderInfos, pwd, "TRUE", IDOrderListActivity.this);
  419 + }
  420 + centerHandle.allTicket(position, pwd, "TRUE");
  421 + } else if (view.getId() == R.id.part) {
  422 + try {
  423 + String pwd = orderInfos.get(position).getCredentials();
  424 + LogUtil.d(TAG, "pwd = " + pwd);
  425 + pwd = pwd.substring(6, 14);
  426 + if (centerHandle == null) {
  427 + centerHandle = new CenterHandle(IDOrderListActivity.this,
  428 + orderInfos, pwd, "TRUE", IDOrderListActivity.this);
  429 + }
429 // centerHandle.dialog(Integer.parseInt(orderInfos.get(position) 430 // centerHandle.dialog(Integer.parseInt(orderInfos.get(position)
430 // .getOrderAmount()), position); 431 // .getOrderAmount()), position);
431 432
@@ -441,24 +442,24 @@ public class IDOrderListActivity extends BaseActivity implements @@ -441,24 +442,24 @@ public class IDOrderListActivity extends BaseActivity implements
441 // // List集合转成数组 442 // // List集合转成数组
442 // String[] str = list.toArray(new String[0]); 443 // String[] str = list.toArray(new String[0]);
443 // centerHandle.showDialog(str); 444 // centerHandle.showDialog(str);
444 - LogUtil.d("IDOrderListActivity","idcardNumber = "+idcardNumber);  
445 -  
446 - List<ProductInfoQuery> products = orderInfos.get(position).getProducts();  
447 - for (int i = 0; i < products.size(); i++) {  
448 - List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();  
449 - for (PassengerInfosBean bean : passengerInfosBeans){  
450 - if(idcardNumber.equals(bean.getCredentials())){  
451 - LogUtil.d("IDOrderListActivity","getCredentials1 = "+bean.getCredentials());  
452 - if("ID_CARD".equals(bean.getCredentialsType())){  
453 - LogUtil.d("IDOrderListActivity","getCredentialsType = "+bean.getCredentialsType());  
454 - centerHandle.partTicket(position, pwd, "TRUE",bean.getCredentials(),true);  
455 - }else{  
456 - centerHandle.partTicket(position, pwd, "TRUE",bean.getVoucher(),false);  
457 - }  
458 -  
459 - }  
460 - }  
461 - } 445 + LogUtil.d("IDOrderListActivity", "idcardNumber = " + idcardNumber);
  446 +
  447 + List<ProductInfoQuery> products = orderInfos.get(position).getProducts();
  448 + for (int i = 0; i < products.size(); i++) {
  449 + List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();
  450 + for (PassengerInfosBean bean : passengerInfosBeans) {
  451 + if (idcardNumber.equals(bean.getCredentials())) {
  452 + LogUtil.d("IDOrderListActivity", "getCredentials1 = " + bean.getCredentials());
  453 + if ("ID_CARD".equals(bean.getCredentialsType())) {
  454 + LogUtil.d("IDOrderListActivity", "getCredentialsType = " + bean.getCredentialsType());
  455 + centerHandle.partTicket(position, pwd, "TRUE", bean.getCredentials(), true);
  456 + } else {
  457 + centerHandle.partTicket(position, pwd, "TRUE", bean.getVoucher(), false);
  458 + }
  459 +
  460 + }
  461 + }
  462 + }
462 463
463 // List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos(); 464 // List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
464 // for (PassengerInfosBean bean : passengerInfosBeans){ 465 // for (PassengerInfosBean bean : passengerInfosBeans){
@@ -474,53 +475,53 @@ public class IDOrderListActivity extends BaseActivity implements @@ -474,53 +475,53 @@ public class IDOrderListActivity extends BaseActivity implements
474 // } 475 // }
475 // } 476 // }
476 477
477 - } catch (NumberFormatException e) {  
478 - e.printStackTrace();  
479 - }  
480 - }  
481 - }  
482 -  
483 - @Override  
484 - public void onCenterCallback() {  
485 - adapter.notifyDataSetChanged();  
486 - centerHandle = null;  
487 - }  
488 -  
489 - AtomicBoolean isonKey = new AtomicBoolean(false);  
490 -  
491 - @Override  
492 - public void onPrintInfosCallback(String Infos) {  
493 - PrintHandle.getInstance().print(Infos, IDOrderListActivity.this);  
494 - }  
495 -  
496 - @Override  
497 - public boolean onKeyDown(int keyCode, KeyEvent event) {  
498 - if (keyCode == KeyEvent.KEYCODE_BACK && isonKey.get()) {  
499 - return true;  
500 - }  
501 - return super.onKeyDown(keyCode, event);  
502 - }  
503 -  
504 - @Override  
505 - public void onProgress() {  
506 - isonKey.set(true);  
507 - TimerTask task = new TimerTask() {  
508 - public void run() {  
509 - try {  
510 - isonKey.set(false);  
511 - } catch (Exception e) {  
512 - e.printStackTrace();  
513 - }  
514 - }  
515 - };  
516 - Timer timer = new Timer();  
517 - timer.schedule(task, 3000);  
518 - }  
519 -  
520 - @Override  
521 - protected void onDestroy() {  
522 - super.onDestroy();  
523 - PrintHandle.getInstance().printClose();  
524 - } 478 + } catch (NumberFormatException e) {
  479 + e.printStackTrace();
  480 + }
  481 + }
  482 + }
  483 +
  484 + @Override
  485 + public void onCenterCallback() {
  486 + adapter.notifyDataSetChanged();
  487 + centerHandle = null;
  488 + }
  489 +
  490 + AtomicBoolean isonKey = new AtomicBoolean(false);
  491 +
  492 + @Override
  493 + public void onPrintInfosCallback(String Infos) {
  494 + PrintHandle.getInstance().print(Infos, IDOrderListActivity.this);
  495 + }
  496 +
  497 + @Override
  498 + public boolean onKeyDown(int keyCode, KeyEvent event) {
  499 + if (keyCode == KeyEvent.KEYCODE_BACK && isonKey.get()) {
  500 + return true;
  501 + }
  502 + return super.onKeyDown(keyCode, event);
  503 + }
  504 +
  505 + @Override
  506 + public void onProgress() {
  507 + isonKey.set(true);
  508 + TimerTask task = new TimerTask() {
  509 + public void run() {
  510 + try {
  511 + isonKey.set(false);
  512 + } catch (Exception e) {
  513 + e.printStackTrace();
  514 + }
  515 + }
  516 + };
  517 + Timer timer = new Timer();
  518 + timer.schedule(task, 3000);
  519 + }
  520 +
  521 + @Override
  522 + protected void onDestroy() {
  523 + super.onDestroy();
  524 + PrintHandle.getInstance().printClose();
  525 + }
525 526
526 } 527 }
src/com/ectrip/cyt/ui/ScanerOrderActivity.java
  View file @7fa57dc
@@ -263,6 +263,8 @@ public class ScanerOrderActivity extends BaseActivity { @@ -263,6 +263,8 @@ public class ScanerOrderActivity extends BaseActivity {
263 } 263 }
264 } 264 }
265 265
  266 + }else{
  267 + LogUtil.d(TAG,"未扫到数据");
266 } 268 }
267 } 269 }
268 }; 270 };
src/com/ectrip/cyt/zxing/decoding/DecodeFormatManager.java
  View file @7fa57dc
@@ -39,7 +39,7 @@ final class DecodeFormatManager { @@ -39,7 +39,7 @@ final class DecodeFormatManager {
39 PRODUCT_FORMATS.add(BarcodeFormat.UPC_E); 39 PRODUCT_FORMATS.add(BarcodeFormat.UPC_E);
40 PRODUCT_FORMATS.add(BarcodeFormat.EAN_13); 40 PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
41 PRODUCT_FORMATS.add(BarcodeFormat.EAN_8); 41 PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
42 - PRODUCT_FORMATS.add(BarcodeFormat.RSS14); 42 + PRODUCT_FORMATS.add(BarcodeFormat.RSS_14);
43 ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 4); 43 ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 4);
44 ONE_D_FORMATS.addAll(PRODUCT_FORMATS); 44 ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
45 ONE_D_FORMATS.add(BarcodeFormat.CODE_39); 45 ONE_D_FORMATS.add(BarcodeFormat.CODE_39);
src/com/ectrip/trips/net/HttpHelper.java
  View file @7fa57dc
@@ -33,7 +33,7 @@ import com.ectrip.cyt.utils.SharedPreferences2Obj; @@ -33,7 +33,7 @@ import com.ectrip.cyt.utils.SharedPreferences2Obj;
33 * @author jigo 网络访问工具类 33 * @author jigo 网络访问工具类
34 */ 34 */
35 public class HttpHelper extends HttpHelperCore { 35 public class HttpHelper extends HttpHelperCore {
36 - public static final String TAG="HttpHelper"; 36 + public static final String TAG = "HttpHelper";
37 private Context mContext; 37 private Context mContext;
38 public static HttpHelper helper = null; 38 public static HttpHelper helper = null;
39 39
@@ -43,7 +43,7 @@ public class HttpHelper extends HttpHelperCore { @@ -43,7 +43,7 @@ public class HttpHelper extends HttpHelperCore {
43 private static BaseActivity activity; 43 private static BaseActivity activity;
44 // public static final String action="/service/terminal-2.action"; 44 // public static final String action="/service/terminal-2.action";
45 // public final String action = "/service/terminal-3.do"; 45 // public final String action = "/service/terminal-3.do";
46 - public final String action = "/prod-api/manager/service/terminal-3"; 46 + public final String action = "/service/terminal-3";
47 private ArrayList<ConfigBean> configBeans = DbManager.GetConfigs(); 47 private ArrayList<ConfigBean> configBeans = DbManager.GetConfigs();
48 48
49 public static HttpHelper getInstance(Context mContext) { 49 public static HttpHelper getInstance(Context mContext) {
@@ -90,11 +90,11 @@ public class HttpHelper extends HttpHelperCore { @@ -90,11 +90,11 @@ public class HttpHelper extends HttpHelperCore {
90 String requestParam = DataTool.envelopeData(orderRequest, MyApp 90 String requestParam = DataTool.envelopeData(orderRequest, MyApp
91 .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); 91 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
92 map.put("requestParam", requestParam); 92 map.put("requestParam", requestParam);
93 - LogUtil.i(TAG,requestParam + "requestParam"); 93 + LogUtil.i(TAG, requestParam + "requestParam");
94 executeHttpPost( 94 executeHttpPost(
95 "https://" + MyApp.getInstance().getServiceIp() + action, "", 95 "https://" + MyApp.getInstance().getServiceIp() + action, "",
96 map, httpCallback, "data", DataTrans.class); 96 map, httpCallback, "data", DataTrans.class);
97 - LogUtil.i(TAG,"url = " + "http://" + MyApp.getInstance().getServiceIp() + action); 97 + LogUtil.i(TAG, "url = " + "http://" + MyApp.getInstance().getServiceIp() + action);
98 if (testMOdel != null && testMOdel) { // 这个是调试弹框 98 if (testMOdel != null && testMOdel) { // 这个是调试弹框
99 if (type == null) { 99 if (type == null) {
100 return; 100 return;
@@ -132,7 +132,8 @@ public class HttpHelper extends HttpHelperCore { @@ -132,7 +132,8 @@ public class HttpHelper extends HttpHelperCore {
132 String requestParam = DataTool.envelopeData(consumeCount, MyApp 132 String requestParam = DataTool.envelopeData(consumeCount, MyApp
133 .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); 133 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
134 map.put("requestParam", requestParam); 134 map.put("requestParam", requestParam);
135 - LogUtil.i(TAG,"requestParam" + requestParam); 135 + LogUtil.i(TAG, "requestParam" + requestParam);
  136 + LogUtil.i(TAG, "url = " + "http://" + MyApp.getInstance().getServiceIp() + action);
136 executeHttpPost( 137 executeHttpPost(
137 "https://" + MyApp.getInstance().getServiceIp() + action, "", 138 "https://" + MyApp.getInstance().getServiceIp() + action, "",
138 map, httpCallback, "data", DataTrans.class); 139 map, httpCallback, "data", DataTrans.class);
@@ -172,7 +173,7 @@ public class HttpHelper extends HttpHelperCore { @@ -172,7 +173,7 @@ public class HttpHelper extends HttpHelperCore {
172 String requestParam = DataTool.envelopeData(consumeCount, MyApp 173 String requestParam = DataTool.envelopeData(consumeCount, MyApp
173 .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); 174 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
174 map.put("requestParam", requestParam); 175 map.put("requestParam", requestParam);
175 - LogUtil.i(TAG,"requestParam" + requestParam); 176 + LogUtil.i(TAG, "requestParam" + requestParam);
176 executeHttpPost( 177 executeHttpPost(
177 "https://" + MyApp.getInstance().getServiceIp() + action, "", 178 "https://" + MyApp.getInstance().getServiceIp() + action, "",
178 map, httpCallback, "data", DataTrans.class); 179 map, httpCallback, "data", DataTrans.class);
@@ -190,8 +191,9 @@ public class HttpHelper extends HttpHelperCore { @@ -190,8 +191,9 @@ public class HttpHelper extends HttpHelperCore {
190 + ";", Toast.LENGTH_LONG); 191 + ";", Toast.LENGTH_LONG);
191 } 192 }
192 } 193 }
  194 +
193 public void codeConsume(String orderId, String count, String password, 195 public void codeConsume(String orderId, String count, String password,
194 - String verifyPassword, String consumedSeq, List<ProductOfConsumeOrder> products, HttpCallback<DataTrans> httpCallback) { 196 + String verifyPassword, String consumedSeq, List<ProductOfConsumeOrder> products, HttpCallback<DataTrans> httpCallback) {
195 Long accountId = MyApp.getInstance().getAccountId(); 197 Long accountId = MyApp.getInstance().getAccountId();
196 ConsumeCodeRequest consumeCode = new ConsumeCodeRequest(orderId, 198 ConsumeCodeRequest consumeCode = new ConsumeCodeRequest(orderId,
197 count, password, verifyPassword, consumedSeq, products); 199 count, password, verifyPassword, consumedSeq, products);
@@ -206,8 +208,8 @@ public class HttpHelper extends HttpHelperCore { @@ -206,8 +208,8 @@ public class HttpHelper extends HttpHelperCore {
206 String requestParam = DataTool.envelopeData(consumeCode, MyApp 208 String requestParam = DataTool.envelopeData(consumeCode, MyApp
207 .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); 209 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
208 map.put("requestParam", requestParam); 210 map.put("requestParam", requestParam);
209 - LogUtil.i(TAG,"requestParam" + requestParam);  
210 - LogUtil.i(TAG,"服务器地址：" + MyApp.getInstance().getServiceIp()); 211 + LogUtil.i(TAG, "requestParam" + requestParam);
  212 + LogUtil.i(TAG, "服务器地址：" + MyApp.getInstance().getServiceIp());
211 executeHttpPost( 213 executeHttpPost(
212 "https://" + MyApp.getInstance().getServiceIp() + action, "", 214 "https://" + MyApp.getInstance().getServiceIp() + action, "",
213 map, httpCallback, "data", DataTrans.class); 215 map, httpCallback, "data", DataTrans.class);
@@ -225,6 +227,7 @@ public class HttpHelper extends HttpHelperCore { @@ -225,6 +227,7 @@ public class HttpHelper extends HttpHelperCore {
225 + ";", Toast.LENGTH_LONG); 227 + ";", Toast.LENGTH_LONG);
226 } 228 }
227 } 229 }
  230 +
228 /** 231 /**
229 * @param startdate 232 * @param startdate
230 * @param enddate 233 * @param enddate
@@ -246,7 +249,7 @@ public class HttpHelper extends HttpHelperCore { @@ -246,7 +249,7 @@ public class HttpHelper extends HttpHelperCore {
246 String requestParam = DataTool.envelopeData(consumeCount, MyApp 249 String requestParam = DataTool.envelopeData(consumeCount, MyApp
247 .getInstance().getSignkey(), MyApp.getInstance().getIdentity()); 250 .getInstance().getSignkey(), MyApp.getInstance().getIdentity());
248 map.put("requestParam", requestParam); 251 map.put("requestParam", requestParam);
249 - LogUtil.i(TAG,"requestParam" + requestParam); 252 + LogUtil.i(TAG, "requestParam" + requestParam);
250 executeHttpPost( 253 executeHttpPost(
251 "https://" + MyApp.getInstance().getServiceIp() + action, "", 254 "https://" + MyApp.getInstance().getServiceIp() + action, "",
252 map, httpCallback, "data", DataTrans.class); 255 map, httpCallback, "data", DataTrans.class);
@@ -289,7 +292,7 @@ public class HttpHelper extends HttpHelperCore { @@ -289,7 +292,7 @@ public class HttpHelper extends HttpHelperCore {
289 MyApp.getInstance().getSignkey(), MyApp.getInstance() 292 MyApp.getInstance().getSignkey(), MyApp.getInstance()
290 .getIdentity()); 293 .getIdentity());
291 map.put("requestParam", requestParam); 294 map.put("requestParam", requestParam);
292 - LogUtil.i(TAG,"requestParam" + requestParam); 295 + LogUtil.i(TAG, "requestParam" + requestParam);
293 executeHttpPost( 296 executeHttpPost(
294 "https://" + MyApp.getInstance().getServiceIp() + action, "", 297 "https://" + MyApp.getInstance().getServiceIp() + action, "",
295 map, httpCallback, "data", DataTrans.class); 298 map, httpCallback, "data", DataTrans.class);
@@ -339,7 +342,7 @@ public class HttpHelper extends HttpHelperCore { @@ -339,7 +342,7 @@ public class HttpHelper extends HttpHelperCore {
339 MyApp.getInstance().getSignkey(), MyApp.getInstance() 342 MyApp.getInstance().getSignkey(), MyApp.getInstance()
340 .getIdentity()); 343 .getIdentity());
341 map.put("requestParam", requestParam); 344 map.put("requestParam", requestParam);
342 - LogUtil.i(TAG,"requestParam" + requestParam); 345 + LogUtil.i(TAG, "requestParam" + requestParam);
343 executeHttpPost( 346 executeHttpPost(
344 "https://" + MyApp.getInstance().getServiceIp() + action, "", 347 "https://" + MyApp.getInstance().getServiceIp() + action, "",
345 map, httpCallback, "data", DataTrans.class); 348 map, httpCallback, "data", DataTrans.class);
@@ -386,7 +389,8 @@ public class HttpHelper extends HttpHelperCore { @@ -386,7 +389,8 @@ public class HttpHelper extends HttpHelperCore {
386 String requestParam = DataTool.envelopeData(detectVersionRequest, 389 String requestParam = DataTool.envelopeData(detectVersionRequest,
387 signkey, identity); 390 signkey, identity);
388 map.put("requestParam", requestParam); 391 map.put("requestParam", requestParam);
389 - LogUtil.i(TAG,"requestParam" + requestParam); 392 + LogUtil.i(TAG, "url = " + "https://" + url + action);
  393 + LogUtil.i(TAG, "requestParam" + requestParam);
390 executeHttpPost("https://" + url + action, "", map, httpCallback, 394 executeHttpPost("https://" + url + action, "", map, httpCallback,
391 "data", DataTrans.class); 395 "data", DataTrans.class);
392 } 396 }
@@ -416,7 +420,7 @@ public class HttpHelper extends HttpHelperCore { @@ -416,7 +420,7 @@ public class HttpHelper extends HttpHelperCore {
416 MyApp.getInstance().getSignkey(), MyApp.getInstance() 420 MyApp.getInstance().getSignkey(), MyApp.getInstance()
417 .getIdentity()); 421 .getIdentity());
418 map.put("requestParam", requestParam); 422 map.put("requestParam", requestParam);
419 - LogUtil.i(TAG,"requestParam" + requestParam); 423 + LogUtil.i(TAG, "requestParam" + requestParam);
420 executeHttpPost( 424 executeHttpPost(
421 "https://" + MyApp.getInstance().getServiceIp() + action, "", 425 "https://" + MyApp.getInstance().getServiceIp() + action, "",
422 map, httpCallback, "data", DataTrans.class); 426 map, httpCallback, "data", DataTrans.class);