Bladeren bron

充电桩详情页,扫码充电按钮,可支付时显示

huyuguo 5 jaren geleden
bovenliggende
commit
4525235ac1

BIN
app/src/main/assets/amap_custom_style_2019080601.data


+ 1 - 22
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -584,30 +584,19 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
584 584
                                    public void onItemClick(AdapterView<?> parent, View view,
585 585
                                                            int position, long id) {
586 586
                                        MainApplication.details_flag = "2";
587
                                        Intent intent = new Intent(getApplication(),
588
                                                NewZhanDetailsActivity.class);
587
                                        Intent intent = new Intent(getApplication(), NewZhanDetailsActivity.class);
589 588
                                        intent.putExtra("zhan_id", list.get(position).getZhan_id());
590
//                                        Log.e(TAG, "onItemClick: zhan_id==="+list.get(position).getZhan_id() );
591 589
                                        startActivity(intent);
592 590
                                    }
593 591
                                });
594 592
595 593
                                if (list.size() > 0) {
596 594
                                    if (sortTye == 1) {
597
//                                        dialog.show();
598 595
                                        list = Util.getSortList(listt);
599
//                                        list1 = list;
600
//                                        dialog.cancel();
601 596
                                    } else if (sortTye == 2) {
602
//                                        dialog.show();
603 597
                                        list = Util.getSortPFList(listt);
604
//                                        list2 = list;
605
//                                        dialog.cancel();
606 598
                                    } else if (sortTye == 3) {
607
//                                        dialog.show();
608 599
                                        list = Util.getSortFTList(listt);
609
//                                        list3 = list;
610
//                                        dialog.cancel();
611 600
                                    }
612 601
613 602
                                    if (MainApplication.isMap == false) {
@ -5296,16 +5285,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5296 5285
                windowCost.setText(charge_cost_way2);
5297 5286
            }
5298 5287
        }
5299
//        windowZhanDetails.setOnClickListener(new View.OnClickListener() {
5300
//            @Override
5301
//            public void onClick(View v) {
5302
//                Intent intent = new Intent(getApplication(), NewZhanDetailsActivity.class);
5303
//                intent.putExtra("zhan_id", id);
5304
//                intent.putExtra("poi_jing", poi_jing);
5305
//                intent.putExtra("poi_wei", poi_wei);
5306
//                startActivity(intent);
5307
//            }
5308
//        });
5309 5288
5310 5289
        windowZhanDetails.setOnClickListener(new View.OnClickListener() {
5311 5290
            @Override

+ 6 - 124
app/src/main/java/com/electric/chargingpile/activity/NewZhanDetailsActivity.java

@ -195,76 +195,16 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
195 195
                        JSONObject object = new JSONObject(msg.obj.toString());
196 196
                        JSONArray jsonArray = object.getJSONArray("pic");
197 197
                        JSONObject obj = object.getJSONObject("info");
198
//                        Log.e("jsonarray", jsonArray.toString());
199
//                        /zhan_id = object.getString("id");
200 198
201 199
                        zhan_name = obj.getString("zhan_name");
202 200
                        zhan_address = obj.getString("zhan_address");
203
//                        zhan_id = obj.getString("id");
204 201
                        fast_num = obj.getString("fast_num");
205 202
                        slow_num = obj.getString("slow_num");
206 203
                        poi_jing = obj.getString("poi_jing");
207
//                        Log.e("poi_jing",poi_jing);
208 204
                        poi_wei = obj.getString("poi_wei");
209
//                        Log.e("poi_wei",poi_wei);
210 205
                        cityy = obj.getString("city");
211
//                        Log.e("cityy===",cityy);
212 206
                        charge_cost_way = obj.getString("charge_cost_way");
213
//                        Log.e("charge_cost_way===",charge_cost_way);
214
//                        isCollect(zhan_name);
215 207
                        zhanname = zhan_name;
216
//                        if (MainApplication.details_flag.equals("1") || MainApplication.details_flag.equals("2") ||MainApplication.details_flag.equals("8")){
217
//                            jingdu = poi_jing;
218
//                            weidu = poi_wei;
219
//                        }
220
//                        zhan_address = obj.getString("zhan_address");
221
//                        supplier = obj.getString("supplier");
222
//                        total_num = obj.getString("total_num");
223
//                        fast_num = obj.getString("fast_num");
224
//                        slow_num = obj.getString("slow_num");
225
//                        tid = obj.getString("tid");
226
//                        stop_cost = obj.getString("stop_cost");
227
//                        charge_cost = obj.getString("charge_cost");
228
//                        telephone = obj.getString("telephone");
229
//                        remarks = obj.getString("tid");
230
//                        claimer = obj.getString("claimer");
231
//                        belong_attribute = obj.getString("belong_attribute");
232
//
233
//                        charge_cost_way = obj.getString("charge_cost_way");
234
//                        other_cost = obj.getString("other_cost");
235
//                        work_open = obj.getString("work_open");
236
//                        work_close = obj.getString("work_close");
237
238
239
//                            String a[] = new String[jsonArray.length()];
240
//                            Pattern p = Pattern.compile("p");
241
//                            Matcher m;s
242
//                        String[] strArray = new String[jsonArray.length()];
243
//                        StringBuffer strbuf = new StringBuffer();
244
//
245
//                        for (int i =0;i<jsonArray.length();i++){
246
//                            JSONObject jsonObject = (JSONObject) jsonArray.opt(i);
247
//                            String s = jsonObject.getString("url");
248
//                            strbuf.append("|").append(MainApplication.url+"/zhannew//uploadfile/" + s);
249
//                            Log.e("url", s);
250
//
251
//                        }
252
//
253
//                        String str="";
254
////                            for(int i = 0; i < strArray.length; i++)
255
////                            {
256
////                                strbuf.append("|").append("http://123.57.6.131/zhannew//uploadfile/"+strArray[i]);
257
////                            }
258
//                        try {
259
//                            str = strbuf.deleteCharAt(0).toString();
260
//                            Log.e("data",str);
261
//                            ssv.initData(str);
262
//                        }catch (Exception e){
263
//                            str = "";
264
//                            Log.e("data",str);
265
//                            ssv.initData(str);
266
//                        }
267
268 208
                    } catch (JSONException e) {
269 209
                        e.printStackTrace();
270 210
                    }
@ -274,10 +214,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
274 214
                    ArrayList<JSONObject> datas = new ArrayList<JSONObject>();
275 215
                    try {
276 216
                        JSONArray jsonArray = new JSONArray(msg.obj.toString());
277
//                        JSONObject jsonObject = jsonArray.getJSONObject()
278
//                        JSONObject jsonObj = new JSONObject(msg.obj.toString());
279
280
//                        JSONArray jsonArray=jsonObj.getJSONArray("comment");
281 217
                        datas.clear();
282 218
                        for (int j = 0; j < jsonArray.length(); j++) {
283 219
                            JSONObject jsonObject4 = (JSONObject) jsonArray
@ -285,18 +221,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
285 221
                            datas.add(jsonObject4);
286 222
                        }
287 223
                        comment_num = datas.size();
288
//                        if (comment_num != 0){
289
//                            btn_zhanCommentNo.setVisibility(View.VISIBLE);
290
//                        }
291 224
                        tv_pinglun.setText("评论(" + comment_num + ")");
292
//                        btn_zhanCommentNo.setVisibility(View.VISIBLE);
293
//                        btn_zhanCommentNo.setText("(" + comment_num + ")");
294
//                        Log.e("@@@@@@@@@@@@", datas.size() + "");
295
296
297
//                        setListViewHeightBasedOnChildren(web_content);
298
299
//                        Toast.makeText(ZhanDetailsNew.this,msg.obj+"", Toast.LENGTH_SHORT).show();
300 225
                    } catch (Exception e) {
301 226
                        e.printStackTrace();
302 227
                    }
@ -349,25 +274,13 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
349 274
                            pr.remove(prov);
350 275
                            pr.add(prov);
351 276
352
//                            spinnerProvince.setSelection(de);
353
//                                    spinnerCity
354 277
                        }
355 278
356 279
                    } catch (JSONException e) {
357 280
                        e.printStackTrace();
358 281
                    }
359
//				pr =(List<Province>) JsonUtils.parseToObjectBean(msg.obj.toString(), Province.class);
360
//                    Log.e("pe", pr.size() + "");
361
//                    Log.e("pe", pr.get(0).getCities().size() + "");
362
//                    Log.e("pe", pr.get(1).getCities().size() + "");
363
//                    Log.e("pe", pr.get(2).getCities().size() + "");
364
//                    Log.e("pe", pr.get(3).getCities().size() + "");
365
//				Log.e("pe", pr.size()+"");
366
//				Log.e("pe", pr.size()+"");
367
368 282
369 283
                    ArrayAdapter<Province> provinceAdapter = new ArrayAdapter<Province>(NewZhanDetailsActivity.this, R.layout.simple_spinner_item, pr);
370
//                    spinnerProvince.setAdapter(provinceAdapter);
371 284
372 285
                    provinceAdapter.notifyDataSetChanged();
373 286
                    if (default_brand != -1) {
@ -380,7 +293,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
380 293
                        JSONObject object = new JSONObject(msg.obj.toString());
381 294
                        String rtnCode = object.getString("rtnCode");
382 295
                        String rtnMsg = object.getString("rtnMsg");
383
//                        Log.e("rtnMsg", rtnMsg);
384 296
                    } catch (JSONException e) {
385 297
                        e.printStackTrace();
386 298
                    }
@ -406,34 +318,23 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
406 318
407 319
        dialog = new LoadingDialog(this);
408 320
        dialog.setCanceledOnTouchOutside(false);
409
//        System.out.print("canCollect===="+canCollect);
410 321
        imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
411 322
        commentsBean = null;
412 323
413 324
        String intent_id = getIntent().getStringExtra("zhan_id");
414 325
415
//        zhan = (Zhan) getIntent().getSerializableExtra("zhan");
416
417 326
        initView();
418 327
        if (MainApplication.details_flag.equals("1")) {
419 328
            zhan_id = getIntent().getStringExtra("zhanid");
420 329
            viewPager.setCurrentItem(2);
421
//            jingdu = poi_jing;
422
//            weidu = poi_wei;
423
//            MainApplication.details_flag = "0";
424 330
        } else if (MainApplication.details_flag.equals("2")) {
425 331
426 332
            zhan_id = getIntent().getStringExtra("zhan_id");
427
//            Log.e("9999",zhan_id);
428
//            jingdu = poi_jing;
429
//            weidu = poi_wei;
430
//            MainApplication.details_flag = "0";
431 333
        } else if (MainApplication.details_flag.equals("3")) {
432 334
            zhan_id = intent_id;
433 335
            viewPager.setCurrentItem(2);
434 336
            jingdu = getIntent().getStringExtra("poi_jing");
435 337
            weidu = getIntent().getStringExtra("poi_wei");
436
//            MainApplication.details_flag = "0";
437 338
        } else if (MainApplication.details_flag.equals("4")) {
438 339
            zhan_id = getIntent().getStringExtra("zhan_id");
439 340
            viewPager.setCurrentItem(2);
@ -451,24 +352,11 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
451 352
            jingdu = getIntent().getStringExtra("poi_jing");
452 353
            weidu = getIntent().getStringExtra("poi_wei");
453 354
        }
454
//        getPic();//获得图片
455
456 355
        getZhanCommentNum(zhan_id);
457 356
458 357
459 358
        mapp = (MainApplication) getApplication();
460 359
        mContext = this;
461
//        getComment("","");
462
463
//         int j = AboutActivity.i;
464
//            int w = AboutActivity.j;
465
//        if (zhan.getSupplier().toString().equals("特来电")){
466
//            getDetailThread(zhan.getTid());
467
//        }
468
469
470
//        resetViewPagerHeight(viewPager.getCurrentItem());
471
//        fragments = new ArrayList<Fragment>();
472 360
473 361
474 362
        // 模拟网络请求完成之后重置ViewPager高度
@ -494,14 +382,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
494 382
        tv_submit_comment.setOnClickListener(this);
495 383
        iv_back = (ImageView) findViewById(R.id.iv_back);
496 384
        iv_back.setOnClickListener(this);
497
//        ll_zhanComment = (LinearLayout) findViewById(R.id.ll_zhanComment);
498
//        ll_zhanComment.setOnClickListener(this);
499
//        ll_zhanSuit = (LinearLayout) findViewById(R.id.ll_zhanSuit);
500
//        btn_zhanSuitNo = (TextView) findViewById(R.id.btn_zhanSuitNo);
501
//        btn_zhanComment.setText("车友评论"+"("+SuitCarFragment+")");
502
//        btn_zhanComment.setOnClickListener(this);
503
//        btn_zhanSuit = (TextView) findViewById(R.id.btn_zhanSuit);
504
//        btn_zhanSuit.setOnClickListener(this);
505 385
        share = (ImageView) findViewById(R.id.iv_share);
506 386
        share.setOnClickListener(this);
507 387
        collect = (ImageView) findViewById(R.id.iv_collect);
@ -514,17 +394,19 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
514 394
515 395
        viewPager = (ViewPager) findViewById(R.id.viewPager);
516 396
        addDetailsFragment = new DetailsFragment();
517
//        addCommentFragment = new CommentFragment();
397
        addDetailsFragment.setOnUpdateScanChargeFragmentListener(new DetailsFragment.OnDetailsFragmentListener() {
398
            @Override
399
            public void updateScanCharge(String ownPay) {
400
                rl_detail_scan.setVisibility("1".equals(ownPay) ? View.VISIBLE : View.GONE);
401
            }
402
        });
518 403
        addZhanCommentFragment = new ZhanCommentFragment();
519 404
        addZhanStatusFragment = new ZhanStatusFragment();
520
//        addSuitCarFragment = new SuitCarFragment();
521 405
522 406
        adapter = new ViewPagerFragmentAdapter(getSupportFragmentManager());
523 407
        adapter.addFragment(addDetailsFragment);
524 408
        adapter.addFragment(addZhanStatusFragment);
525 409
        adapter.addFragment(addZhanCommentFragment);
526
//        adapter.addFragment(addCommentFragment);
527
//        adapter.addFragment(addSuitCarFragment);
528 410
        viewPager.setOffscreenPageLimit(2);
529 411
        viewPager.setOnPageChangeListener(listener);
530 412
        viewPager.setAdapter(adapter);

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/PileCostDetailsActivity.java

@ -62,7 +62,6 @@ public class PileCostDetailsActivity extends AppCompatActivity {
62 62
            String end = list.get(i).getEnd();
63 63
            String service_free = list.get(i).getService_free();
64 64
            String charge_free = list.get(i).getCharge_free();
65
//            String is_dui = DetailsFragment.datas.get(i).getString("is_dui");
66 65
67 66
            item_time.setText(start + "-" + end);
68 67

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/PriceDetailsActivity.java

@ -53,7 +53,6 @@ public class PriceDetailsActivity extends Activity implements View.OnClickListen
53 53
            String end = DetailsFragment.datas.get(i).getString("end");
54 54
            String service_free = DetailsFragment.datas.get(i).getString("service_free");
55 55
            String charge_free = DetailsFragment.datas.get(i).getString("charge_free");
56
//            String is_dui = DetailsFragment.datas.get(i).getString("is_dui");
57 56
58 57
            item_time.setText(start + "-" + end);
59 58

+ 0 - 280
app/src/main/java/com/electric/chargingpile/activity/RoutePlanMapActivity.java

@ -2683,286 +2683,6 @@ public class RoutePlanMapActivity extends Activity implements LocationSource, AM
2683 2683
                        String info = JsonUtils.getKeyResult(response, "info");
2684 2684
                        ZhanData zhanInfo = JsonUtils.parseToObjectBean(info, ZhanData.class);
2685 2685
                        showInfoWindowData(zhan_id, infoWindow, zhanInfo, marker);
2686
//                        try {
2687
//                            JSONObject object = new JSONObject(response);
2688
//                            JSONObject obj = object.getJSONObject("info");
2689
//                            final String zhan_name = obj.getString("zhan_name");
2690
//                            final String fast_num = obj.getString("fast_num");
2691
//                            String slow_num = obj.getString("slow_num");
2692
//                            String charge_cost = obj.getString("charge_cost");
2693
//                            String stop_cost = obj.getString("stop_cost");
2694
//                            String other_cost = obj.getString("other_cost");
2695
//                            String charge_cost_way = obj.getString("supplier");
2696
//                            String belong_attribute = obj.getString("belong_attribute");
2697
////                                    rl_infowindow.setVisibility(View.VISIBLE);
2698
//                            tv_route_name.setText(zhan_name);
2699
//                            if (charge_cost_way.equals("") || belong_attribute.equals("私人")) {
2700
//                                tv_route_costway.setText("");
2701
//                            } else {
2702
//                                tv_route_costway.setText(charge_cost_way);
2703
//                            }
2704
////                            Log.e("123", "onResponse: 111111");
2705
//
2706
//                            if (fast_num.equals("")) {
2707
//                                tv_route_fast.setText("0");
2708
//                            } else {
2709
//                                tv_route_fast.setText(fast_num);
2710
//                            }
2711
//
2712
//                            if (slow_num.equals("")) {
2713
//                                tv_route_slow.setText("0");
2714
//                            } else {
2715
//                                tv_route_slow.setText(slow_num);
2716
//                            }
2717
//
2718
//
2719
//                            rl_details.setOnClickListener(new View.OnClickListener() {
2720
//                                @Override
2721
//                                public void onClick(View v) {
2722
//                                    MainApplication.details_flag = "2";
2723
//                                    Intent intent = new Intent(getApplication(), NewZhanDetailsActivity.class);
2724
//                                    intent.putExtra("zhan_id", zhan_id);
2725
//                                    startActivity(intent);
2726
//                                }
2727
//                            });
2728
//
2729
////                            rl_routebtn.setOnClickListener(new View.OnClickListener() {
2730
////                                @Override
2731
////                                public void onClick(View v) {
2732
////
2733
////                                }
2734
////                            });
2735
//
2736
//
2737
//                            final String poi_wei = wei;
2738
//                            final String poi_jing = jing;
2739
//
2740
//                            LatLng ll = new LatLng(Double.parseDouble(start_wei), Double.parseDouble(start_jing));
2741
//                            LatLng l = new LatLng(Double.parseDouble(wei), Double.parseDouble(jing));
2742
////                        double d = DistanceUtil.getDistance(MainMapActivity.center, ll);
2743
//
2744
//                            double d = AMapUtils.calculateLineDistance(l, ll);
2745
////                                Toast.makeText(getApplicationContext(),Util.getDistance(d),Toast.LENGTH_SHORT).show();
2746
//                            tv_distance.setText(Util.getDistance(d));
2747
//
2748
//                            String acNum = "", dcNum = "", acableNum = "", dcableNum = "";
2749
//                            if (!obj.isNull("acNum")) {
2750
//                                acNum = obj.getString("acNum");
2751
//                                dcNum = obj.getString("dcNum");
2752
//                                acableNum = obj.getString("acableNum");
2753
//                                dcableNum = obj.getString("dcableNum");
2754
//                            }
2755
//
2756
//                            detail_name.setText(zhan_name);
2757
//
2758
//                            tv_charge.setText(charge_cost);
2759
//                            tv_service.setText(other_cost);
2760
//                            tv_park.setText(stop_cost);
2761
//                            tv_cost_way.setText(charge_cost_way);
2762
//                            if (!obj.isNull("acNum") && !obj.isNull("dcNum")) {
2763
//                                tv_slowNum.setText("空闲" + acableNum + "/共" + acNum + "个");
2764
//                                tv_fastNum.setText("空闲" + dcableNum + "/共" + dcNum + "个");
2765
//                            } else {
2766
//                                if (fast_num.equals("")) {
2767
//                                    tv_fastNum.setText("0");
2768
//                                } else {
2769
//                                    tv_fastNum.setText(fast_num);
2770
//                                }
2771
//                                if (slow_num.equals("")) {
2772
//                                    tv_slowNum.setText("0");
2773
//                                } else {
2774
//                                    tv_slowNum.setText(slow_num);
2775
//                                }
2776
//                            }
2777
//                            if (list_zhong != null) {
2778
//                                if (zhan_id.equals(p1) || zhan_id.equals(p2) || zhan_id.equals(p3)) {
2779
////                                    tv_zhong.setText("删除此途经站点");
2780
//                                    rl_routebtn.setBackgroundResource(R.drawable.icon_route_minus);
2781
//                                } else {
2782
////                                    tv_zhong.setText("设置为途经站点");
2783
//                                    rl_routebtn.setBackgroundResource(R.drawable.icon_route_plus);
2784
//                                }
2785
//                            }
2786
////                            rela_paopao.setVisibility(View.VISIBLE);
2787
//
2788
//
2789
2790
//
2791
//                            ll_paoxiang.setOnClickListener(new View.OnClickListener() {
2792
//                                @Override
2793
//                                public void onClick(View v) {
2794
//                                    MainApplication.details_flag = "2";
2795
//                                    Intent intent = new Intent(getApplication(), NewZhanDetailsActivity.class);
2796
//                                    intent.putExtra("zhan_id", zhan_id);
2797
//                                    startActivity(intent);
2798
//
2799
//                                }
2800
//                            });
2801
//
2802
//                            ll_comment.setOnClickListener(new View.OnClickListener() {
2803
//                                @Override
2804
//                                public void onClick(View v) {
2805
//                                    MainApplication.details_flag = "4";
2806
//                                    Intent intent = new Intent(getApplication(), NewZhanDetailsActivity.class);
2807
//                                    intent.putExtra("zhan_id", zhan_id);
2808
//                                    startActivity(intent);
2809
//                                }
2810
//                            });
2811
//
2812
//                            tv_daohang.setOnClickListener(new View.OnClickListener() {
2813
//                                @Override
2814
//                                public void onClick(View v) {
2815
//
2816
//                                    if (!isAvilible(getApplicationContext(), "com.baidu.BaiduMap") &&
2817
//                                            !isAvilible(getApplicationContext(), "com.autonavi.minimap")) {
2818
//                                        Intent intent = new Intent(getApplication(), BasicNaviActivity.class);
2819
//                                        intent.putExtra("start_jing", center.longitude + "");
2820
//                                        intent.putExtra("start_wei", center.latitude + "");
2821
//                                        intent.putExtra("stop_jing", jing + "");
2822
//                                        intent.putExtra("stop_wei", wei + "");
2823
//                                        startActivity(intent);
2824
////                                        detailsBack = true;
2825
////                                        HashMap<String,String> map = new HashMap<String,String>();
2826
////                                        map.put("Name",finalMarkerInfo.getZhan_name());
2827
////                                        map.put("CostWay",finalMarkerInfo.getCharge_cost_way());
2828
////                                        map.put("City",finalMarkerInfo.getCity());
2829
////                                        MobclickAgent.onEvent(context, "0033", map);
2830
////                                        map.clear();
2831
//                                    } else {
2832
//                                        if (center != null) {
2833
//                                            LayoutInflater inflater1 = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
2834
//                                            popupWindowView = inflater1.inflate(R.layout.item_selectmap, null);
2835
//                                            popupWindow = new PopupWindow(popupWindowView,
2836
//                                                    ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
2837
//                                                    true);
2838
//                                            popupWindow.setBackgroundDrawable(new BitmapDrawable());
2839
//                                            // 设置PopupWindow的弹出和消失效果
2840
//                                            popupWindow.setAnimationStyle(R.style.popupAnimation);
2841
//                                            LinearLayout ll_tvTwo = (LinearLayout) popupWindowView.findViewById(R.id.ll_tvTwo);
2842
//                                            if (!isAvilible(getApplicationContext(), "com.autonavi.minimap")) {
2843
//                                                ll_tvTwo.setVisibility(View.GONE);
2844
//                                            }
2845
//                                            LinearLayout ll_tvOne = (LinearLayout) popupWindowView.findViewById(R.id.ll_tvOne);
2846
//                                            if (!isAvilible(getApplicationContext(), "com.baidu.BaiduMap")) {
2847
//                                                ll_tvOne.setVisibility(View.GONE);
2848
//                                            }
2849
//                                            cancleButton = (Button) popupWindowView
2850
//                                                    .findViewById(R.id.cancleButton);
2851
//                                            cancleButton.setOnClickListener(new View.OnClickListener() {
2852
//                                                @Override
2853
//                                                public void onClick(View view) {
2854
////                        Toast.makeText(ZhanDetailsNew.this, "NO", Toast.LENGTH_SHORT).show();
2855
//                                                    popupWindow.dismiss();
2856
//                                                }
2857
//                                            });
2858
//                                            tvThree = (TextView) popupWindowView.findViewById(R.id.tvThree);
2859
//                                            tvThree.setOnClickListener(new View.OnClickListener() {
2860
//                                                @Override
2861
//                                                public void onClick(View v) {
2862
//                                                    Intent intent = new Intent(getApplication(), BasicNaviActivity.class);
2863
//                                                    intent.putExtra("start_jing", center.longitude + "");
2864
//                                                    intent.putExtra("start_wei", center.latitude + "");
2865
//                                                    intent.putExtra("stop_jing", jing + "");
2866
//                                                    intent.putExtra("stop_wei", wei + "");
2867
//                                                    startActivity(intent);
2868
////                                                    detailsBack = true;
2869
//                                                    popupWindow.dismiss();
2870
//                                                    HashMap<String, String> map = new HashMap<String, String>();
2871
////                                                    map.put("Name",finalMarkerInfo.getZhan_name());
2872
////                                                    map.put("CostWay",finalMarkerInfo.getCharge_cost_way());
2873
////                                                    map.put("City",finalMarkerInfo.getCity());
2874
////                                                    MobclickAgent.onEvent(context, "0033", map);
2875
////                                                    map.clear();
2876
//                                                }
2877
//                                            });
2878
//                                            tvOne = (TextView) popupWindowView.findViewById(R.id.tvOne);
2879
//                                            tvOne.setOnClickListener(new View.OnClickListener() {
2880
//                                                @Override
2881
//                                                public void onClick(View view) {
2882
//                                                    Intent intent = null;
2883
////                                        try {
2884
//////                                            intent = Intent.getIntent("intent://map/direction?origin=latlng:"+center.latitude+","+center.longitude+"&destination=latlng:"+ll.latitude+","+ll.longitude+"|name:"+finalMarkerInfo.getZhan_name()+"&mode=driving&region=&src=充电桩#Intent;scheme=bdapp;package=com.baidu.BaiduMap;end");
2885
////                                        } catch (URISyntaxException e) {
2886
////                                            e.printStackTrace();
2887
////                                        }
2888
//                                                    double dwei = Double.parseDouble(poi_wei);
2889
//                                                    double djing = Double.parseDouble(poi_jing);
2890
//                                                    getBaidu(center.longitude, center.latitude);
2891
//                                                    try {
2892
//                                                        String s = "intent://map/direction?" +
2893
//                                                                "origin=" + bd_lat + "," + bd_lon + "&" +
2894
//                                                                "destination=" + dwei + "," + djing +
2895
//                                                                "&mode=driving&" +
2896
//                                                                "src=充电桩#Intent;scheme=bdapp;package=com.baidu.BaiduMap;end";
2897
//                                                        Log.e("sss", s);
2898
//                                                        intent = Intent.getIntent(s);
2899
////                                                        detailsBack = true;
2900
////                                                        HashMap<String,String> map = new HashMap<String,String>();
2901
////                                                        map.put("Name",finalMarkerInfo.getZhan_name());
2902
////                                                        map.put("CostWay",finalMarkerInfo.getCharge_cost_way());
2903
////                                                        map.put("City",finalMarkerInfo.getCity());
2904
////                                                        MobclickAgent.onEvent(context, "0031", map);
2905
////                                                        map.clear();
2906
//                                                    } catch (URISyntaxException e) {
2907
//                                                        e.printStackTrace();
2908
//                                                    }
2909
//                                                    startActivity(intent);
2910
////                                                    if (MainFragment.center != null) {
2911
////                                                        double dwei = Double.parseDouble(zhan.getPoi_wei());
2912
////                                                        double djing = Double.parseDouble(zhan.getPoi_jing());
2913
////                                                        LatLng ll = new LatLng(dwei, djing);
2914
////
2915
////                                                        startNavi(MainFragment.center, ll);
2916
////
2917
////                                                    }
2918
////                                    startNavi(center, ll);
2919
//                                                    popupWindow.dismiss();
2920
//
2921
//                                                }
2922
//
2923
//                                            });
2924
//                                            tvTwo = (TextView) popupWindowView.findViewById(R.id.tvTwo);
2925
//                                            tvTwo.setOnClickListener(new View.OnClickListener() {
2926
//                                                @Override
2927
//                                                public void onClick(View view) {
2928
//                                                    try {
2929
////                                            getGaode(ll.longitude, ll.latitude);
2930
////                                            getBeginGaode(center.longitude, center.latitude);
2931
//                                                        Intent intent4 = new Intent("android.intent.action.VIEW",
2932
//                                                                android.net.Uri.parse("androidamap://route?sourceApplication=amap&slat=" + center.latitude + "&slon=" + center.longitude + "&sname=我的位置&dlat=" + wei + "&dlon=" + jing + "&dname=" + zhan_name + "&dev=0&m=0&t=2"));
2933
//                                                        intent4.setPackage("com.autonavi.minimap");
2934
//                                                        startActivity(intent4);
2935
////                                                        detailsBack = true;
2936
//                                                        popupWindow.dismiss();
2937
////                                                        HashMap<String,String> map = new HashMap<String,String>();
2938
////                                                        map.put("Name",finalMarkerInfo.getZhan_name());
2939
////                                                        map.put("CostWay",finalMarkerInfo.getCharge_cost_way());
2940
////                                                        map.put("City",finalMarkerInfo.getCity());
2941
////                                                        MobclickAgent.onEvent(context, "0032", map);
2942
////                                                        map.clear();
2943
//                                                    } catch (Exception e) {
2944
//                                                        e.printStackTrace();
2945
//                                                        Toast.makeText(getApplication(), "请您确认是否安装高德地图APP", Toast.LENGTH_SHORT).show();
2946
//                                                    }
2947
//
2948
//                                                }
2949
//                                            });
2950
//                                            popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
2951
////                                            startNavi(center, ll);
2952
//                                        } else {
2953
//                                            Toast.makeText(getApplication(),
2954
//                                                    "没有定位到您的当前位置", Toast.LENGTH_SHORT)
2955
//                                                    .show();
2956
//                                        }
2957
//                                    }
2958
//                                }
2959
//                            });
2960
//
2961
//                        } catch (Exception e) {
2962
//                            e.printStackTrace();
2963
//                        }
2964
2965
2966 2686
                    }
2967 2687
                });
2968 2688

+ 0 - 143
app/src/main/java/com/electric/chargingpile/adapter/CommentAdapter.java

@ -74,58 +74,6 @@ public class CommentAdapter extends BaseAdapter {
74 74
    private String zhan_id, name0, name1;
75 75
    private Context mContext;
76 76
    private String[] stringArr;
77
//    private Handler handler = new Handler() {
78
//        // 主线程通过这个方法处理消息
79
//        @Override
80
//        public void handleMessage(Message msg) {
81
//            switch (msg.what) {
82
//
83
//                case 6:
84
////                    InputMethodManager imm =(InputMethodManager)getSystemService(
85
////                            Context.INPUT_METHOD_SERVICE);
86
////                    imm.hideSoftInputFromWindow(et_comment.getWindowToken(), 0);
87
////                    try {
88
////                        JSONObject jsonObjadd = new JSONObject(msg.obj.toString());
89
////                        String rtnCode = jsonObjadd.getString("rtnCode");
90
////                        dismissDialog();
91
////                        if (rtnCode.equals("01")){
92
//////                            userGrowUp();
93
////                            et_comment.setText("");
94
////                        }
95
//////                        resetViewPagerHeight(1);
96
////                        addCommentFragment.reference();
97
//////                        CommentFragment.point.setVisibility(View.VISIBLE);
98
//////                        CommentFragment.point.startAnimation(CommentFragment.animation);
99
//////                        new Handler().postDelayed(new Runnable() {
100
//////                            public void run() {
101
//////                                CommentFragment.point.setVisibility(View.GONE);
102
//////                            }
103
//////                        }, 1000);
104
////                        CommentFragment.relativeLayout.setVisibility(View.VISIBLE);
105
////                        CommentFragment.textView.setVisibility(View.VISIBLE);
106
////                        CommentFragment.textView.startAnimation(CommentFragment.animation);
107
////                        new Handler().postDelayed(new Runnable() {
108
////                            public void run() {
109
////                                CommentFragment.textView.setVisibility(View.GONE);
110
////                            }
111
////                        }, 2000);
112
////
113
//////                        resetViewPagerHeight(1);
114
////
115
////                        Toast.makeText(NewZhanDetailsActivity.this, "评论成功", Toast.LENGTH_SHORT).show();
116
////                    } catch (Exception e) {
117
////                        e.printStackTrace();
118
////                    }
119
//
120
//                    break;
121

122
//                default:
123
//                    break;
124
//            }
125
//        }
126
//    };
127

128
//    public static int open =0;
129 77

130 78
    public CommentsBean getParentBean(String parentId) {
131 79
        for (CommentsBean cb : datas) {
@ -327,22 +275,7 @@ public class CommentAdapter extends BaseAdapter {
327 275
            childIndex = 0;
328 276
            if (!imm.isActive()) {
329 277
                ZhanCommentActivity.commentType = 1;
330
//                ZhanCommentActivity.et_pinglun.setHint("有什么想吐槽的吗?来跟其他车友分享一下吧...");
331 278
            }
332
//            holder.rl_parent.setOnClickListener(new OnClickListener() {
333
//                @Override
334
//                public void onClick(View v) {
335
//                    NewZhanDetailsActivity.commentType = 2;
336
////                    Toast.makeText(v.getContext(),commentsBean.getNickname(),Toast.LENGTH_SHORT).show();
337
//                    NewZhanDetailsActivity.et_comment.setFocusable(true);
338
//                    NewZhanDetailsActivity.et_comment.setFocusableInTouchMode(true);
339
//                    NewZhanDetailsActivity.et_comment.requestFocus();
340
//                    NewZhanDetailsActivity.et_comment.setHint("回复:"+commentsBean.getNickname());
341
//                    NewZhanDetailsActivity.commentsBean = commentsBean;
342
//                    imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
343
//                    imm.showSoftInput(NewZhanDetailsActivity.et_comment,InputMethodManager.SHOW_FORCED);
344
//                }
345
//            });
346 279
            String tag = commentsBean.getTag();
347 280

348 281

@ -555,17 +488,8 @@ public class CommentAdapter extends BaseAdapter {
555 488
                @Override
556 489
                public void onClick(View v) {
557 490

558
//                    WindowManager.LayoutParams params = mActivity.getWindow().getAttributes();
559
//                    if (imm.isActive()) {
560
//                        // 隐藏软键盘
561
//
562
//                        NewZhanDetailsActivity.commentType = 1;
563
//                        NewZhanDetailsActivity.et_comment.setHint("说点什么吧...");
564
//                        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
565
//                    }else {
566 491
                    CommentFragment.web_content.smoothScrollToPosition(3);
567 492
                    NewZhanDetailsActivity.commentType = 2;
568
//                    Toast.makeText(v.getContext(),commentsBean.getNickname(),Toast.LENGTH_SHORT).show();
569 493
                    NewZhanDetailsActivity.et_comment.setFocusable(true);
570 494
                    NewZhanDetailsActivity.et_comment.setFocusableInTouchMode(true);
571 495
                    NewZhanDetailsActivity.et_comment.requestFocus();
@ -579,16 +503,6 @@ public class CommentAdapter extends BaseAdapter {
579 503
                    imm.showSoftInput(NewZhanDetailsActivity.et_comment, InputMethodManager.SHOW_FORCED);
580 504
                    NewZhanDetailsActivity.ll_comment.setVisibility(View.VISIBLE);
581 505
                    NewZhanDetailsActivity.tv_submit_comment.setVisibility(View.GONE);
582
//                    }
583
//                    Intent intent = new Intent(finalConvertView.getContext(),ZhanCommentActivity.class);
584
//                    intent.putExtra("zhan_id",NewZhanDetailsActivity.zhan_id);
585
//                    if (!commentsBean.getNickname().equals("")) {
586
//                        intent.putExtra("show_txt","回复:" + commentsBean.getNickname());
587
//                    }else{
588
//                        intent.putExtra("show_txt","回复:" + Util.handlePhoneComment(commentsBean.getTel()));
589
//                    }
590
//
591
//                    finalConvertView.getContext().startActivity(intent);
592 506
                }
593 507
            });
594 508
        } else if (commentsBean.getType() == CommentsBean.CHILD_MOMMENT) {
@ -597,39 +511,11 @@ public class CommentAdapter extends BaseAdapter {
597 511
            holder.vvv.setVisibility(View.GONE);
598 512
            holder.vvvv.setVisibility(View.VISIBLE);
599 513
            holder.rl_son.setVisibility(View.VISIBLE);
600
//            LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) holder.ll_main.getLayoutParams();
601
//            lp.setMargins(135, 45, 0, 0);
602
//            holder.ll_main.setLayoutParams(lp);
603 514
            childIndex++;
604 515
            if (childIndex <= 3 && masterCount == childIndex) {
605 516
                holder.vvv.setVisibility(View.VISIBLE);
606 517
                holder.vvvv.setVisibility(View.GONE);
607 518
            }
608
//            if (!imm.isActive()){
609
//                NewZhanDetailsActivity.commentType = 1;
610
//                NewZhanDetailsActivity.et_comment.setHint("说点什么吧...");
611
//            }
612
//            holder.ll_out.setOnClickListener(new OnClickListener() {
613
//                @Override
614
//                public void onClick(View v) {
615
//
616
//                        NewZhanDetailsActivity.commentType = 1;
617
//                        NewZhanDetailsActivity.et_comment.setHint("说点什么吧...");
618
//                        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
619
//                }
620
//            });
621
//            holder.rl_son.setOnClickListener(new OnClickListener() {
622
//                @Override
623
//                public void onClick(View v) {
624
//                    NewZhanDetailsActivity.commentType = 2;
625
//                    NewZhanDetailsActivity.et_comment.setFocusable(true);
626
//                    NewZhanDetailsActivity.et_comment.setFocusableInTouchMode(true);
627
//                    NewZhanDetailsActivity.et_comment.requestFocus();
628
//                    NewZhanDetailsActivity.et_comment.setHint("回复:"+commentsBean.getNickname());
629
//                    imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
630
//                    imm.showSoftInput(NewZhanDetailsActivity.et_comment,InputMethodManager.SHOW_FORCED);
631
//                }
632
//            });
633 519
            String tel = commentsBean.getTel();
634 520
            String chexing = commentsBean.getChexing();
635 521
            if (!commentsBean.getNickname().equals("") && !commentsBean.getNickname().equals("null")) {
@ -638,12 +524,10 @@ public class CommentAdapter extends BaseAdapter {
638 524
                holder.tv_carTypeson.setText(Util.handlePhoneComment(tel));
639 525
            }
640 526
            String[] strarray = chexing.split("\\$\\$");
641
//
642 527
            if (strarray.length > 1) {
643 528
                name0 = strarray[0];//江淮
644 529
                name1 = strarray[1];//iEV3
645 530
            }
646
//            Log.e("name0+name1",name0+name1);
647 531

648 532
            holder.tv_commentson.setText(commentsBean.getContent());
649 533
            if (chexing == null || chexing.equals("") || chexing.equals("null") || chexing.equals("品牌$$车型") || chexing.equals("null$$null")) {
@ -666,38 +550,11 @@ public class CommentAdapter extends BaseAdapter {
666 550
            holder.vvv.setVisibility(View.GONE);
667 551
            holder.vvvv.setVisibility(View.VISIBLE);
668 552
            holder.rl_son.setVisibility(View.VISIBLE);
669
//            LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) holder.ll_main.getLayoutParams();
670
//            lp.setMargins(135, 45, 0, 0);
671
//            holder.ll_main.setLayoutParams(lp);
672 553
            childIndex++;
673 554
            if (childIndex <= 3 && masterCount == childIndex) {
674 555
                holder.vvv.setVisibility(View.VISIBLE);
675 556
                holder.vvvv.setVisibility(View.GONE);
676 557
            }
677
//            if (!imm.isActive()){
678
//                NewZhanDetailsActivity.commentType = 1;
679
//                NewZhanDetailsActivity.et_comment.setHint("说点什么吧...");
680
//            }
681
//            holder.ll_out.setOnClickListener(new OnClickListener() {
682
//                @Override
683
//                public void onClick(View v) {
684
//                    NewZhanDetailsActivity.commentType = 1;
685
//                    NewZhanDetailsActivity.et_comment.setHint("说点什么吧...");
686
//                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
687
//                }
688
//            });
689
//            holder.rl_son.setOnClickListener(new OnClickListener() {
690
//                @Override
691
//                public void onClick(View v) {
692
//                    NewZhanDetailsActivity.commentType = 2;
693
//                    NewZhanDetailsActivity.et_comment.setFocusable(true);
694
//                    NewZhanDetailsActivity.et_comment.setFocusableInTouchMode(true);
695
//                    NewZhanDetailsActivity.et_comment.requestFocus();
696
//                    NewZhanDetailsActivity.et_comment.setHint("回复:"+commentsBean.getNickname());
697
//                    imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
698
//                    imm.showSoftInput(NewZhanDetailsActivity.et_comment,InputMethodManager.SHOW_FORCED);
699
//                }
700
//            });
701 558
            String tel = commentsBean.getTel();
702 559
            String chexing = commentsBean.getChexing();
703 560
            if (!commentsBean.getNickname().equals("") && !commentsBean.getNickname().equals("null")) {

+ 0 - 73
app/src/main/java/com/electric/chargingpile/adapter/SonCommentAdapter.java

@ -141,28 +141,7 @@ public class SonCommentAdapter extends BaseAdapter {
141 141
            try {
142 142
                String tel = datas.get(position).getString("tel");
143 143
                String chexing = datas.get(position).getString("chexing");
144
//                String[] strarray=chexing.split("$$");
145
//
146
//                if(strarray.length>1){
147
//                   name0=strarray[0];//江淮
148
//                     name1=strarray[1];//iEV3
149
//                }
150
151
//                String a[] = chexing.split("$$");
152
//                name0 =a[0];
153
//                name1 = a[1];
154
//                System.out.println(strarray[0]);
155
//                System.out.println(strarray[1]);
156
157
158
//                String[] newStr = chexing.split("//$//$");
159 144
                Log.e("!!!", chexing);
160
//                Log.e("@@@",newStr);
161
//                if (datas.get(position).getString(
162
//                        "nickname").equals("") || datas.get(position).getString(
163
//                        "nickname").equals(null)){
164
//                    holder.tv_carType.setText(Util.handlePhoneComment(tel));
165
//                }
166 145
                if (!datas.get(position).getString(
167 146
                        "nickname").equals("") && !datas.get(position).getString(
168 147
                        "nickname").equals("null")) {
@ -172,49 +151,6 @@ public class SonCommentAdapter extends BaseAdapter {
172 151
                    holder.tv_carType.setText(Util.handlePhoneComment(tel));
173 152
                }
174 153
175
176
//                if (datas.get(position).getJSONArray("childs").length() >0){
177
//                    holder.list_son.setVisibility(View.VISIBLE);
178
//                }else {
179
//                    holder.list_son.setVisibility(View.GONE);
180
//                }
181
//                ArrayList<JSONObject> son=new ArrayList<JSONObject>();
182
//                try {
183
//                    JSONArray jsonArray = new JSONArray(datas.get(position).getJSONArray("childs").toString());
184
////                    Log.e("@!@",msg.obj.toString());
185
////                        JSONObject jsonObject = jsonArray.getJSONObject()
186
////                        JSONObject jsonObj = new JSONObject(msg.obj.toString());
187
//
188
////                        JSONArray jsonArray=jsonObj.getJSONArray("comment");
189
//                    son.clear();
190
//                    for (int j = 0; j < jsonArray.length(); j++) {
191
//                        JSONObject jsonObject4 = (JSONObject) jsonArray
192
//                                .opt(j);
193
//                        son.add(jsonObject4);
194
//                    }
195
//                    Log.e("#1#",son.size()+"");
196
197
////                        comment_num.setText("车友评论"+"("+num+")");
198
////                        if (num != 0){
199
//                    NewZhanDetailsActivity.btn_zhanCommentNo.setVisibility(View.VISIBLE);
200
////                        }
201
//                    NewZhanDetailsActivity.btn_zhanCommentNo.setText("(" + num + ")");
202
//                    Log.e("!!!!!", datas.size() + "");
203
//                    holder.list_son.setAdapter(new CommentAdapter(datas, , handler, zhan_id));
204
205
//                    NewZhanDetailsActivity.resetViewPagerHeight(1);
206
//                    Utility.setListViewHeightBasedOnChildren(web_content);
207
208
//                        setListViewHeightBasedOnChildren(web_content);
209
210
//                        Toast.makeText(ZhanDetailsNew.this,msg.obj+"", Toast.LENGTH_SHORT).show();
211
//                } catch (Exception e) {
212
//                    e.printStackTrace();
213
//                }
214
215
216
//                PicassoUtil.loadingNetImage(convertView.getContext(), "http://cdz.d1ev.com/zhannew/uploadfile/"+datas.get(position).getString(
217
//                        "userpic"), holder.iv_icon);
218 154
                Picasso.with(MainApplication.context)
219 155
                        .load("http://cdz.d1ev.com/zhannew/uploadfile/" + datas.get(position).getString("userpic"))
220 156
                        .error(R.drawable.icon_face2_0)
@ -237,14 +173,8 @@ public class SonCommentAdapter extends BaseAdapter {
237 173
                Log.e("name0+name1", name0 + name1);
238 174
239 175
240
//                if((datas.get(position).getString("nickname"))==null){
241
//                    holder.tv_carType.setText("充电桩app用户");
242
//                }
243
//                holder.tv_id.setText(datas.get(position).getString(
244
//                        "zhan_id"));
245 176
                holder.tv_comment.setText(datas.get(position).getString(
246 177
                        "content"));
247
//                holder.tv_city.setText(name0+""+name1);
248 178
                if (chexing == null || chexing.equals("") || chexing.equals("null") || chexing.equals("品牌$$车型") || chexing.equals("null$$null")) {
249 179
                    holder.tv_city.setText("");
250 180
                } else {
@ -252,9 +182,6 @@ public class SonCommentAdapter extends BaseAdapter {
252 182
                }
253 183
                holder.tv_time.setText(TimeStamp2Date(datas.get(position).getString("addtime"), "yyyy-MM-dd HH:mm:ss"));
254 184
                holder.tv_parentName.setText((datas.get(position).getString("nickname")));
255
//                if ((datas.get(position).getString("nickname")).equals("")){
256
//                    holder.tv_parentName.setText("未绑定车型用户");
257
//                }
258 185
                holder.tv_reply.setOnClickListener(new OnClickListener() {
259 186
                    @Override
260 187
                    public void onClick(View v) {

+ 0 - 18
app/src/main/java/com/electric/chargingpile/fragment/CommentFragment.java

@ -711,24 +711,6 @@ public class CommentFragment extends Fragment {
711 711
                        mes.obj = dealJackson(mes);
712 712
                        handler.sendMessage(mes);
713 713
                    }
714
//                    Log.d("dddddss",msg);
715
//                    JSONArray jsonArray = new JSONArray(msg);
716
//                    int i = jsonArray.length();
717
//                    Log.e("length==",jsonArray.length()+"");
718
//                    String s = jsonArray.get(0).toString();
719
//                    Log.e("get(0)==",s);
720
//
721
//                    if (i>0){
722
//                        DetailsFragment.rl_new_comment.setVisibility(View.VISIBLE);
723
//                        String nickname = JsonUtils.getKeyResult(s,"nickname");
724
//                        String tel = JsonUtils.getKeyResult(s,"tel");
725
//                        String content = JsonUtils.getKeyResult(s,"content");
726
//
727
//                        DetailsFragment.tv_new_comment.setText(content);
728
////                        DetailsFragment.tv_new_name.setText(nickname);
729
//                    }else if (i == 0){
730
//                        DetailsFragment.rl_new_comment.setVisibility(View.GONE);
731
//                    }
732 714
                } catch (JSONException e) {
733 715
                } catch (UnknownHostException e) {
734 716
                    e.printStackTrace();

+ 13 - 42
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@ -142,6 +142,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
142 142
    private String[] stringArr;
143 143
    private RelativeLayout rlclaimer;
144 144
    private View detail_view;
145
    private OnDetailsFragmentListener detailsFragmentListener;
145 146
    private Handler handler = new Handler() {
146 147
        // 主线程通过这个方法处理消息
147 148
        @TargetApi(Build.VERSION_CODES.KITKAT)
@ -150,34 +151,16 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
150 151
            switch (msg.what) {
151 152
                case 1:
152 153
                    try {
153
//                        new Thread(new Runnable() {
154
//                            @Override
155
//                            public void run() {
156
//                                createDialog();
157
//                            }
158
//                        }).start();
159 154
                        final JSONObject object = new JSONObject(msg.obj.toString());
160
//                        Log.e(TAG, "handleMessage: msg="+msg.obj.toString() );
161 155
                        String info = JsonUtils.getKeyResult(msg.obj.toString(), "info");
162
//                        Log.e(TAG, "handleMessage: info="+info );
163 156
                        String info_decode = DES3S.decode(info);
164
//                        Log.e(TAG, "handleMessage: info_decode="+info_decode );
165
//                            JSONObject jsonObject1 = object.optJSONObject("info");
166
//                            claimer_name = jsonObject1.getString("claimer");
167
//                            Log.e("claimer", claimer_name);
168
169 157
170 158
                        JSONArray jsonArray = null;
171 159
                        try {
172 160
                            jsonArray = object.getJSONArray("pic");
173
//                            Log.e("pic===&&",jsonArray.toString());
174 161
                        } catch (JSONException e) {
175 162
                            e.printStackTrace();
176 163
                        }
177
//                        Log.e("jsonarray",jsonArray.length()+"");
178
//                            String a[] = new String[jsonArray.length()];
179
//                            Pattern p = Pattern.compile("p");
180
//                            Matcher m;s
181 164
                        String[] strArray = new String[jsonArray.length()];
182 165
                        StringBuffer strbuf = new StringBuffer();
183 166
@ -192,7 +175,6 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
192 175
                            }
193 176
                            Log.e("!!!", MainApplication.url + "/zhannew//uploadfile/" + s);
194 177
                            strbuf.append("|").append(MainApplication.url + "/zhannew//uploadfile/" + s);
195
//                            Log.e("url===", s);
196 178
197 179
                        }
198 180
@ -202,13 +184,11 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
202 184
                        if (jsonArray.length() > 0) {
203 185
                            String result;
204 186
                            str = strbuf.deleteCharAt(0).toString();
205
//                            Log.e("data===",str);
206 187
                            if (str.contains("|")) {
207 188
                                result = str.substring(0, str.indexOf("|"));
208 189
                            } else {
209 190
                                result = str;
210 191
                            }
211
//                            Log.e("result====",result);
212 192
                            final String[] s = str.split("\\|");
213 193
                            detail_picnum.setText(s.length + "");
214 194
@ -219,13 +199,10 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
219 199
                                    .into(detail_zhan_pic);
220 200
221 201
222
//                            ssv.initData(str);
223
//                            Log.e("ssv===",str);
224 202
                            detail_zhan_pic.setOnClickListener(new View.OnClickListener() {
225 203
                                @Override
226 204
                                public void onClick(View v) {
227 205
                                    Intent intent = new Intent(getContext(), ImagePagerActivity.class);
228
//                                    Log.e(TAG, "onClick: s="+s );
229 206
                                    // 图片url,为了演示这里使用常量,一般从数据库中或网络中获取
230 207
                                    intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_URLS, s);
231 208
                                    intent.putExtra(ImagePagerActivity.EXTRA_IMAGE_INDEX, 0);
@ -241,7 +218,6 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
241 218
                                    if (!MainApplication.isLogin()) {
242 219
                                        Toast.makeText(getContext(), "请先登录", Toast.LENGTH_SHORT).show();
243 220
                                        startActivity(new Intent(getContext(), LoginActivity.class));
244
//                    finish();
245 221
                                    } else {
246 222
                                        Intent intent = new Intent(getContext(), AlterOneActivity.class);
247 223
                                        intent.putExtra("zhanname", NewZhanDetailsActivity.zhanname);
@ -249,18 +225,10 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
249 225
                                        intent.putExtra("title", "添加站点图片");
250 226
                                        startActivity(intent);
251 227
                                    }
252
//                                    ToastUtil.showToast(getContext(),"没图片", Toast.LENGTH_SHORT);
253 228
                                }
254 229
                            });
255 230
                        }
256 231
257
258
//                        String info = DES3S.decode(object.getString("info"));
259
//                        Log.e(TAG, "handleMessage: info="+info );
260
261
//                        JSONObject obj = object.getJSONObject("info");
262
263
264 232
                        zhan_id = JsonUtils.getKeyResult(info_decode, "id");
265 233
                        zhan_name = JsonUtils.getKeyResult(info_decode, "zhan_name");
266 234
                        zhan_address = JsonUtils.getKeyResult(info_decode, "zhan_address");
@ -284,6 +252,9 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
284 252
285 253
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
286 254
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
255
                        if (detailsFragmentListener != null) {
256
                            detailsFragmentListener.updateScanCharge(own_pay);
257
                        }
287 258
                        String fenshi_info = JsonUtils.getKeyResult(info_decode, "fenshi_info");
288 259
                        String fenshi_is = JsonUtils.getKeyResult(info_decode, "fenshi_is");
289 260
@ -317,11 +288,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
317 288
                                Date curDate = new Date(System.currentTimeMillis());
318 289
                                String token = formatter.format(curDate);
319 290
320
//                                long appTime1 = System.currentTimeMillis() / 1000;
321
//                                String token = String.valueOf(appTime1);
322
//                                Log.e(TAG, "handleMessage: token="+token );
323 291
                                String t = String.valueOf(DateUtils.getShortStringToDate(token));
324
//                                Log.e(TAG, "handleMessage: t="+t );
325 292
                                for (int i = 0; i < datas.size(); i++) {
326 293
                                    if (Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("start")))) < Integer.parseInt(t)
327 294
                                            && Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("end")))) > Integer.parseInt(t)) {
@ -579,11 +546,6 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
579 546
                case 111:
580 547
                    try {
581 548
                        String mssg = DES.decrypt(msg.obj.toString(), key);
582
//                        System.out.print("mssg==="+mssg);
583
//                    if (NewZhanDetailsActivity.addDetailsFragment != null){
584
//                        NewZhanDetailsActivity.addDetailsFragment.setViewValues(mssg);
585
//                        Log.e("@@@!!!!@##",mssg);
586
//                    }
587 549
                        setViewValues(mssg);
588 550
                    } catch (Exception e) {
589 551
                        e.printStackTrace();
@ -1564,4 +1526,13 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1564 1526
            }
1565 1527
        });
1566 1528
    }
1529
1530
1531
    public interface OnDetailsFragmentListener {
1532
        void updateScanCharge(String ownPay);
1533
    }
1534
1535
    public void setOnUpdateScanChargeFragmentListener(OnDetailsFragmentListener listener) {
1536
        this.detailsFragmentListener = listener;
1537
    }
1567 1538
}

+ 0 - 9
app/src/main/java/com/electric/chargingpile/view/SlideShowView.java

@ -397,15 +397,6 @@ public class SlideShowView extends FrameLayout {
397 397
//                }
398 398
//                Log.e("imageUrls!",imageUrls);
399 399
                imageUrls = params[0].split("\\|");
400
//                new Thread(new Runnable() {
401
//                    @Override
402
//                    public void run() {
403
//                        DetailsFragment.tv_picnum.setText(imageUrls.length+"");
404
//                    }
405
//                }).start();
406
407
//                System.out.print(imageUrls);
408
//                Log.d("123456",imageUrls.length+"");
409 400
                return true;
410 401
            } catch (Exception e) {
411 402
                e.printStackTrace();

+ 4 - 1
app/src/main/res/layout/activity_new_zhan_details.xml

@ -1,4 +1,5 @@
1 1
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2
    xmlns:tools="http://schemas.android.com/tools"
2 3
    android:layout_width="match_parent"
3 4
    android:layout_height="match_parent"
4 5
    android:background="@color/activity_bgcolor"
@ -240,7 +241,9 @@
240 241
            android:layout_width="0dp"
241 242
            android:layout_height="match_parent"
242 243
            android:layout_weight="1"
243
            android:background="#00B536">
244
            android:background="#00B536"
245
            android:visibility="gone"
246
            tools:visibility="visible">
244 247
245 248
            <TextView
246 249
                android:layout_width="wrap_content"