Browse Source

修改评论上传图片功能

hy 1 year ago
parent
commit
e4ba5e35a5

+ 23 - 8
app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java

109
import cn.sharesdk.wechat.friends.Wechat;
109
import cn.sharesdk.wechat.friends.Wechat;
110
import cn.sharesdk.wechat.moments.WechatMoments;
110
import cn.sharesdk.wechat.moments.WechatMoments;
111
import okhttp3.Call;
111
import okhttp3.Call;
112
import okhttp3.Response;
113
import okhttp3.ResponseBody;
112
import pub.devrel.easypermissions.AfterPermissionGranted;
114
import pub.devrel.easypermissions.AfterPermissionGranted;
113
import pub.devrel.easypermissions.EasyPermissions;
115
import pub.devrel.easypermissions.EasyPermissions;
114
116
115
import static android.text.Html.FROM_HTML_MODE_LEGACY;
117
import static android.text.Html.FROM_HTML_MODE_LEGACY;
116
118
/**
119
 * 如果更改此页面,则需要同步更改 ChargingCommentActivity,
120
 * ChargingCommentActivity 该页面为从我的->充电记录->去评论
121
 * */
117
public class ChargingCommentActivity extends AppCompatActivity implements View.OnClickListener, PlatformActionListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
122
public class ChargingCommentActivity extends AppCompatActivity implements View.OnClickListener, PlatformActionListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
118
    private static final String TAG = "ChargingCommentActivity";
123
    private static final String TAG = "ChargingCommentActivity";
119
    private static final int PIC_NUM = 3;
124
    private static final int PIC_NUM = 3;
520
525
521
            par.put("file", file);
526
            par.put("file", file);
522
            par.put("filename", "androidapp" + i + ".jpg");
527
            par.put("filename", "androidapp" + i + ".jpg");
523
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload", par, null);
524
            JSONObject jsonObject = new JSONObject(u);
525
526
            String code = jsonObject.getString("code");
527
            if (code.equals("200")) {
528
                String fileUrl = jsonObject.getString("fileUrl");
529
                fileList.add(fileUrl);
528
            ResponseBody body = OkHttpUtils.post().url(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload")
529
                    .addParams("file", file)
530
                    .addParams("filename", "androidapp" + i + ".jpg")
531
                    .build().execute().body();
532
            if (body!=null){
533
                String u = body.string();
534
                JSONObject jsonObject = new JSONObject(u);
535
                String code = jsonObject.getString("code");
536
                if (code.equals("200")) {
537
                    String fileUrl = jsonObject.getString("fileUrl");
538
                    fileList.add(fileUrl);
539
                }else{
540
                    Message msg = new Message();
541
                    msg.what = IMG_ERROR;
542
                    handler.sendMessage(msg);
543
                    return;
544
                }
530
            }else{
545
            }else{
531
                Message msg = new Message();
546
                Message msg = new Message();
532
                msg.what = IMG_ERROR;
547
                msg.what = IMG_ERROR;

+ 5 - 2
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

4537
        final String poi_wei = JsonUtils.getKeyResult(info, "poi_wei");
4537
        final String poi_wei = JsonUtils.getKeyResult(info, "poi_wei");
4538
        final String fenshi_is = JsonUtils.getKeyResult(info, "fenshi_is");
4538
        final String fenshi_is = JsonUtils.getKeyResult(info, "fenshi_is");
4539
        String locks = JsonUtils.getKeyResult(info, "locks");
4539
        String locks = JsonUtils.getKeyResult(info, "locks");
4540
        ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
4540
        if (locks != null && locks.equals("")){
4541
            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
4542
            tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
4543
4544
        }
4541
        telephone = JsonUtils.getKeyResult(info, "telephone");
4545
        telephone = JsonUtils.getKeyResult(info, "telephone");
4542
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
4546
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
4543
        fenshi_info_textview.setText("");
4547
        fenshi_info_textview.setText("");
4703
        windowLabelGround.setText("0".equals(park_location) ? "地下" : "地上");
4707
        windowLabelGround.setText("0".equals(park_location) ? "地下" : "地上");
4704
        windowLabelFreePark.setVisibility(stop_cost.contains("免费") ? View.VISIBLE : View.GONE);
4708
        windowLabelFreePark.setVisibility(stop_cost.contains("免费") ? View.VISIBLE : View.GONE);
4705
4709
4706
        tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
4707
        String acNum = null, dcNum = null, acableNum = null, dcableNum = null;
4710
        String acNum = null, dcNum = null, acableNum = null, dcableNum = null;
4708
        if (null != JsonUtils.getKeyResult(info, "acNum")) {
4711
        if (null != JsonUtils.getKeyResult(info, "acNum")) {
4709
            acNum = JsonUtils.getKeyResult(info, "acNum");
4712
            acNum = JsonUtils.getKeyResult(info, "acNum");

+ 21 - 9
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

100
100
101
import cn.jpush.android.api.JPushInterface;
101
import cn.jpush.android.api.JPushInterface;
102
import okhttp3.Call;
102
import okhttp3.Call;
103
import okhttp3.ResponseBody;
103
import pub.devrel.easypermissions.AfterPermissionGranted;
104
import pub.devrel.easypermissions.AfterPermissionGranted;
104
import pub.devrel.easypermissions.EasyPermissions;
105
import pub.devrel.easypermissions.EasyPermissions;
105
106
106
import static android.text.Html.FROM_HTML_MODE_LEGACY;
107
import static android.text.Html.FROM_HTML_MODE_LEGACY;
107
/**
108
/**
108
 * 如果更改此页面,则需要同步更改 ChargingCommentActivity,
109
 * ChargingCommentActivity 该页面为从我的->充电记录->去评论
109
 * 如果更改此页面,则需要同步更改 ZhanCommentActivity,
110
 * ZhanCommentActivity 该页面为从地图充电icon-> 列表 ->去评论
110
 * */
111
 * */
111
public class ZhanCommentActivity extends AppCompatActivity implements View.OnClickListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
112
public class ZhanCommentActivity extends AppCompatActivity implements View.OnClickListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
112
    private static final String TAG = "ZhanCommentActivity";
113
    private static final String TAG = "ZhanCommentActivity";
473
474
474
            par.put("file", file);
475
            par.put("file", file);
475
            par.put("filename", "androidapp" + i + ".jpg");
476
            par.put("filename", "androidapp" + i + ".jpg");
476
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload", par, null);
477
            JSONObject jsonObject = new JSONObject(u);
478
479
            String code = jsonObject.getString("code");
480
            if (code.equals("200")) {
481
                String fileUrl = jsonObject.getString("fileUrl");
482
                fileList.add(fileUrl);
477
            ResponseBody body = OkHttpUtils.post().url(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload")
478
                    .addParams("file", file)
479
                    .addParams("filename", "androidapp" + i + ".jpg")
480
                    .build().execute().body();
481
            if (body!=null){
482
                String u = body.string();
483
                JSONObject jsonObject = new JSONObject(u);
484
                String code = jsonObject.getString("code");
485
                if (code.equals("200")) {
486
                    String fileUrl = jsonObject.getString("fileUrl");
487
                    fileList.add(fileUrl);
488
                }else{
489
                    Message msg = new Message();
490
                    msg.what = IMG_ERROR;
491
                    handler.sendMessage(msg);
492
                    return;
493
                }
483
            }else{
494
            }else{
484
                Message msg = new Message();
495
                Message msg = new Message();
485
                msg.what = IMG_ERROR;
496
                msg.what = IMG_ERROR;
487
                return;
498
                return;
488
            }
499
            }
489
500
501
490
        }
502
        }
491
503
492
        Message msg = new Message();
504
        Message msg = new Message();

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

102
    public static String firstPoint = "";
102
    public static String firstPoint = "";
103
    public static Boolean firstSsyd;
103
    public static Boolean firstSsyd;
104
    public static String password = "";
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
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
113
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
114
    public static String CDN = "https://cdn-fs.d1ev.com";
114
    public static String CDN = "https://cdn-fs.d1ev.com";

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

290
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
290
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
291
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
291
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
292
                        String locks = JsonUtils.getKeyResult(info_decode, "locks");
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
                        if (detailsFragmentListener != null) {
297
                        if (detailsFragmentListener != null) {
295
                            detailsFragmentListener.updateScanCharge(own_pay);
298
                            detailsFragmentListener.updateScanCharge(own_pay);
296
                        }
299
                        }
297
                        imgLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
298
300
299
                        if ("1".equals(own_pay)) {
301
                        if ("1".equals(own_pay)) {
300
                            scan_charge_btn.setVisibility(View.VISIBLE);
302
                            scan_charge_btn.setVisibility(View.VISIBLE);

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

118
                            String info = JsonUtils.getKeyResult(response, "info");
118
                            String info = JsonUtils.getKeyResult(response, "info");
119
                            String info_decode = DES3S.decode(info);
119
                            String info_decode = DES3S.decode(info);
120
                            String locks = JsonUtils.getKeyResult(info_decode, "locks");
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
                        }catch (Exception e) {
125
                        }catch (Exception e) {
124
                            e.printStackTrace();
126
                            e.printStackTrace();
125
                        }
127
                        }

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

195
195
196
                            info_decode = DES3S.decode(info);
196
                            info_decode = DES3S.decode(info);
197
                            String locks = JsonUtils.getKeyResult(info_decode, "locks");
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
                        }catch (Exception e) {
209
                        }catch (Exception e) {
209
                            e.printStackTrace();
210
                            e.printStackTrace();
210
                        }
211
                        }

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

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