1832dceba3a7dc137d4118fL2954">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"

Accedi - Gogs: Go Git Service

Accedi