bba94eacR494">494
            }else{
484 495
                Message msg = new Message();
485 496
                msg.what = IMG_ERROR;
@ -487,6 +498,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
487 498
                return;
488 499
            }
489 500
501
490 502
        }
491 503
492 504
        Message msg = new Message();

+ 6 - 6
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@ -102,13 +102,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
102 102
    public static String firstPoint = "";
103 103
    public static Boolean firstSsyd;
104 104
    public static String password = "";
105
    public static String url = "http://59.110.68.162";// 充电桩测试环境
106
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
107
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
108
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
105
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
106
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
107
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
108
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
109 109

110
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
111
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
110
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
111
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
112 112

113 113
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
114 114
    public static String CDN = "https://cdn-fs.d1ev.com";

+ 4 - 2
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@ -290,11 +290,13 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
290 290
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
291 291
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
292 292
                        String locks = JsonUtils.getKeyResult(info_decode, "locks");
293
                        ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
293
                        if (locks != null && locks.equals("")){
294
                            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
295
                            imgLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
296
                        }
294 297
                        if (detailsFragmentListener != null) {
295 298
                            detailsFragmentListener.updateScanCharge(own_pay);
296 299
                        }
297
                        imgLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
298 300
299 301
                        if ("1".equals(own_pay)) {
300 302
                            scan_charge_btn.setVisibility(View.VISIBLE);

+ 4 - 2
app/src/main/java/com/electric/chargingpile/fragment/ZhanStatusFragment.java

@ -118,8 +118,10 @@ public class ZhanStatusFragment extends Fragment {
118 118
                            String info = JsonUtils.getKeyResult(response, "info");
119 119
                            String info_decode = DES3S.decode(info);
120 120
                            String locks = JsonUtils.getKeyResult(info_decode, "locks");
121
                            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
122
                            tvLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
121
                            if (locks != null && locks.equals("")){
122
                                ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
123
                                tvLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
124
                            }
123 125
                        }catch (Exception e) {
124 126
                            e.printStackTrace();
125 127
                        }

+ 9 - 8
app/src/main/java/com/electric/chargingpile/view/LockStatusDialog.java

@ -195,16 +195,17 @@ public class LockStatusDialog extends BottomSheetDialogFragment implements AMapL
195 195
196 196
                            info_decode = DES3S.decode(info);
197 197
                            String locks = JsonUtils.getKeyResult(info_decode, "locks");
198
                            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
199
                            mAdapter.setData(locksBeans);
200
                            int available = 0;
201
                            for (LocksBean bean: locksBeans) {
202
                                if (bean.getLockStatus() == 1){
203
                                    ++available;
198
                            if (locks != null && locks.equals("")){
199
                                ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
200
                                mAdapter.setData(locksBeans);
201
                                int available = 0;
202
                                for (LocksBean bean: locksBeans) {
203
                                    if (bean.getLockStatus() == 1){
204
                                        ++available;
205
                                    }
204 206
                                }
207
                                tvNum.setText(Html.fromHtml("空 <font color='#333333'>"+available+"/</font> <font color='#A5A5A5'>"+mAdapter.getItemCount()+"</font>",FROM_HTML_MODE_LEGACY));
205 208
                            }
206
                            tvNum.setText(Html.fromHtml("空 <font color='#333333'>"+available+"/</font> <font color='#A5A5A5'>"+mAdapter.getItemCount()+"</font>",FROM_HTML_MODE_LEGACY));
207
208 209
                        }catch (Exception e) {
209 210
                            e.printStackTrace();
210 211
                        }

+ 2 - 0
app/src/main/res/layout/activity_new_screen.xml

@ -737,6 +737,7 @@
737 737
                android:textSize="15sp" />
738 738
739 739
            <LinearLayout
740
                tools:visibility="visible"
740 741
                android:id="@+id/ll_1"
741 742
                android:layout_width="match_parent"
742 743
                android:layout_height="30dp"
@ -788,6 +789,7 @@
788 789
            </LinearLayout>
789 790
790 791
            <LinearLayout
792
                tools:visibility="visible"
791 793
                android:id="@+id/ll_2"
792 794
                android:layout_width="match_parent"
793 795
                android:layout_height="31dp"

Marilynn Helms - Gogs: Go Git Service
single-ovens-electric6083 (Marilynn Helms)

Подписчики