修改评论上传图片功能

app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java

@@ -109,11 +109,16 @@ import cn.sharesdk.tencent.qq.QQ;
import cn.sharesdk.wechat.friends.Wechat;
import cn.sharesdk.wechat.moments.WechatMoments;
import okhttp3.Call;
import okhttp3.Response;
import okhttp3.ResponseBody;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
import static android.text.Html.FROM_HTML_MODE_LEGACY;
/**
 * 如果更改此页面，则需要同步更改 ChargingCommentActivity，
 * ChargingCommentActivity 该页面为从我的->充电记录->去评论
 * */
public class ChargingCommentActivity extends AppCompatActivity implements View.OnClickListener, PlatformActionListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
    private static final String TAG = "ChargingCommentActivity";
    private static final int PIC_NUM = 3;
@@ -520,13 +525,23 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
            par.put("file", file);
            par.put("filename", "androidapp" + i + ".jpg");
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload", par, null);
            JSONObject jsonObject = new JSONObject(u);
            String code = jsonObject.getString("code");
            if (code.equals("200")) {
                String fileUrl = jsonObject.getString("fileUrl");
                fileList.add(fileUrl);
            ResponseBody body = OkHttpUtils.post().url(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload")
                    .addParams("file", file)
                    .addParams("filename", "androidapp" + i + ".jpg")
                    .build().execute().body();
            if (body!=null){
                String u = body.string();
                JSONObject jsonObject = new JSONObject(u);
                String code = jsonObject.getString("code");
                if (code.equals("200")) {
                    String fileUrl = jsonObject.getString("fileUrl");
                    fileList.add(fileUrl);
                }else{
                    Message msg = new Message();
                    msg.what = IMG_ERROR;
                    handler.sendMessage(msg);
                    return;
                }
            }else{
                Message msg = new Message();
                msg.what = IMG_ERROR;

app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@@ -4537,7 +4537,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        final String poi_wei = JsonUtils.getKeyResult(info, "poi_wei");
        final String fenshi_is = JsonUtils.getKeyResult(info, "fenshi_is");
        String locks = JsonUtils.getKeyResult(info, "locks");
        ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
        if (locks != null && locks.equals("")){
            ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
            tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
        }
        telephone = JsonUtils.getKeyResult(info, "telephone");
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
        fenshi_info_textview.setText("");
@@ -4703,7 +4707,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        windowLabelGround.setText("0".equals(park_location) ? "地下" : "地上");
        windowLabelFreePark.setVisibility(stop_cost.contains("免费") ? View.VISIBLE : View.GONE);
        tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
        String acNum = null, dcNum = null, acableNum = null, dcableNum = null;
        if (null != JsonUtils.getKeyResult(info, "acNum")) {
            acNum = JsonUtils.getKeyResult(info, "acNum");

app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

@@ -100,13 +100,14 @@ import java.util.Set;
import cn.jpush.android.api.JPushInterface;
import okhttp3.Call;
import okhttp3.ResponseBody;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
import static android.text.Html.FROM_HTML_MODE_LEGACY;
/**
 * 如果更改此页面，则需要同步更改 ChargingCommentActivity，
 * ChargingCommentActivity 该页面为从我的->充电记录->去评论
 * 如果更改此页面，则需要同步更改 ZhanCommentActivity，
 * ZhanCommentActivity 该页面为从地图充电icon-> 列表 ->去评论
 * */
public class ZhanCommentActivity extends AppCompatActivity implements View.OnClickListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
    private static final String TAG = "ZhanCommentActivity";
@@ -473,13 +474,23 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
            par.put("file", file);
            par.put("filename", "androidapp" + i + ".jpg");
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload", par, null);
            JSONObject jsonObject = new JSONObject(u);
            String code = jsonObject.getString("code");
            if (code.equals("200")) {
                String fileUrl = jsonObject.getString("fileUrl");
                fileList.add(fileUrl);
            ResponseBody body = OkHttpUtils.post().url(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload")
                    .addParams("file", file)
                    .addParams("filename", "androidapp" + i + ".jpg")
                    .build().execute().body();
            if (body!=null){
                String u = body.string();
                JSONObject jsonObject = new JSONObject(u);
                String code = jsonObject.getString("code");
                if (code.equals("200")) {
                    String fileUrl = jsonObject.getString("fileUrl");
                    fileList.add(fileUrl);
                }else{
                    Message msg = new Message();
                    msg.what = IMG_ERROR;
                    handler.sendMessage(msg);
                    return;
                }
            }else{
                Message msg = new Message();
                msg.what = IMG_ERROR;
@@ -487,6 +498,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                return;
            }
        }
        Message msg = new Message();

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -102,13 +102,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
    public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
    public static String CDN = "https://cdn-fs.d1ev.com";

app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

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

app/src/main/java/com/electric/chargingpile/fragment/ZhanStatusFragment.java

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

app/src/main/java/com/electric/chargingpile/view/LockStatusDialog.java

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

app/src/main/res/layout/activity_new_screen.xml

@@ -737,6 +737,7 @@
                android:textSize="15sp" />
            <LinearLayout
                tools:visibility="visible"
                android:id="@+id/ll_1"
                android:layout_width="match_parent"
                android:layout_height="30dp"
@@ -788,6 +789,7 @@
            </LinearLayout>
            <LinearLayout
                tools:visibility="visible"
                android:id="@+id/ll_2"
                android:layout_width="match_parent"
                android:layout_height="31dp"