信息错误修改完成

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

@@ -90,8 +90,6 @@ public class AlbumActivityAlter extends Activity {
    private class AlbumSendListener implements OnClickListener {
        public void onClick(View v) {
            overridePendingTransition(R.anim.activity_translate_in, R.anim.activity_translate_out);
//            intent.setClass(AlbumActivityAlter.this, AlterOneActivity.class);
//            startActivity(intent);
            finish();
        }
@@ -108,15 +106,11 @@ public class AlbumActivityAlter extends Activity {
    // 取消按钮的监听
    private class CancelListener implements OnClickListener {
        public void onClick(View v) {
//            Bimp.tempSelectBitmap.clear();
//            intent.setClass(AlbumActivityAlter.this, AlterOneActivity.class);
//            startActivity(intent);
            AlbumHelper.bucketList.clear();
            finish();
        }
    }
    // 初始化，给一些对象赋值
    private void init() {
        helper = AlbumHelper.getHelper();

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

@@ -107,9 +107,6 @@ public class AlbumActivityCharging extends Activity {
    // 取消按钮的监听
    private class CancelListener implements OnClickListener {
        public void onClick(View v) {
//            Bimp.tempSelectBitmap.clear();
//            intent.setClass(AlbumActivityAlter.this, AlterOneActivity.class);
//            startActivity(intent);
            AlbumHelper.bucketList.clear();
            finish();
        }

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

@@ -113,9 +113,6 @@ public class AlbumActivityComment extends Activity {
    // 取消按钮的监听
    private class CancelListener implements OnClickListener {
        public void onClick(View v) {
//            Bimp.tempSelectBitmap.clear();
//            intent.setClass(AlbumActivityAlter.this, AlterOneActivity.class);
//            startActivity(intent);
            AlbumHelper.bucketList.clear();
            finish();
        }

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

@@ -111,9 +111,6 @@ public class AlbumActivityFeedback extends Activity {
    // 取消按钮的监听
    private class CancelListener implements View.OnClickListener {
        public void onClick(View v) {
//            Bimp.tempSelectBitmap.clear();
//            intent.setClass(AlbumActivityAlter.this, AlterOneActivity.class);
//            startActivity(intent);
            AlbumHelper.bucketList.clear();
            finish();
        }

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

@@ -49,6 +49,7 @@ import com.electric.chargingpile.data.Zhan;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.Bimp;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.FileUtils;
import com.electric.chargingpile.util.ImageItem;
import com.electric.chargingpile.util.ImageUtils;
import com.electric.chargingpile.util.PublicWay;
@@ -63,6 +64,10 @@ import com.google.android.gms.appindexing.AppIndex;
import com.google.android.gms.appindexing.Thing;
import com.google.android.gms.common.api.GoogleApiClient;
import com.umeng.analytics.MobclickAgent;
import com.zhihu.matisse.Matisse;
import com.zhihu.matisse.MimeType;
import com.zhihu.matisse.engine.impl.GlideEngine;
import com.zhihu.matisse.internal.entity.CaptureStrategy;
import org.json.JSONException;
import org.json.JSONObject;
@@ -139,8 +144,9 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
    private final int REQUEST_CAMERA_PERMISSION_CODE = 100;
    private ProgressDialog insertDialog;
    private AlertDialogTwo alertDialogTwo;
    private static final int RC_ALBUM_PERM = 123;
    public static final int REQUEST_CODE_CHOOSE = 340;
    Handler handler = new Handler() {
        public void handleMessage(Message msg) {
            switch (msg.what) {
@@ -161,47 +167,8 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
                        String rtnMsg = jsonObject.getString("rtnMsg");
                        if (rtnCode.equals("01")) {
                            dismissDialog();
//                            point.setVisibility(View.VISIBLE);
//                            point.startAnimation(animation);
//                            new Handler().postDelayed(new Runnable() {
//                                public void run() {
//                                    point.setVisibility(View.GONE);
//                                }
//                            }, 1000);
////							Toast.makeText(FeedbackActivity.this, "感谢您的反馈,祝您生活愉快", Toast.LENGTH_SHORT)
////									.show();
////							userGrowUp();
////                            etFeedback.setText("");
//                            new Handler().postDelayed(new Runnable() {
//                                public void run() {
//                                    finish();
//                                }
//                            }, 1500);
//                            userGrowUp();
//                            new com.electric.chargingpile.view.AlertDialog(AlterOneActivity.this).builder()
//                                    .setMsg()
//                                    .setNegativeButton("关闭", new View.OnClickListener() {
//                                        @Override
//                                        public void onClick(View v) {
//                                            startActivity(new Intent(AlterOneActivity.this, MainActicity.class));
//                                            finish();
//                                        }
//                                    }).show();
                            Toast.makeText(AlterOneActivity.this, "感谢您的纠错,我们会尽快审核您提供的充电站信息", Toast.LENGTH_SHORT).show();
//                            for(int i=0;i<PublicWay.activityList.size();i++){
//                                if (null != PublicWay.activityList.get(i)) {
////                                   Bimp.tempSelectBitmap.
////                                    PublicWay.activityList.get(i).
////                                    Bimp.tempSelectBitmap.remove(i);
//                                }
//                            }
////                            Bimp.tempSelectBitmap.re;
                            finish();
                        } else {
                            dismissDialog();
                            Toast.makeText(AlterOneActivity.this, "失败提交", Toast.LENGTH_SHORT).show();
@@ -308,7 +275,6 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
                        AlbumActivityAlter.class);
                startActivity(intent);
                overridePendingTransition(R.anim.activity_translate_in, R.anim.activity_translate_out);
//                startActivityForResult(intent, 1);
                pop.dismiss();
                ll_popup.clearAnimation();
            }
@@ -348,16 +314,14 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
     * 调用图库选择
     */
    private void callGallery() {
        Log.e(TAG, "callGallery: " + (Bimp.max - Bimp.tempSelectBitmap.size()));
        //调用第三方图库选择
        PhotoPicker.builder()
                .setPhotoCount(PIC_NUM - Bimp.tempSelectBitmap.size())//可选择图片数量
                .setShowCamera(true)//是否显示拍照按钮
                .setShowGif(true)//是否显示动态图
                .setPreviewEnabled(true)//是否可以预览
                .start(this, PhotoPicker.REQUEST_CODE);
        Matisse.from(AlterOneActivity.this)
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
                .countable(true)
                .maxSelectable(PIC_NUM - Bimp.tempSelectBitmap.size())
                .capture(true)
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
                .imageEngine(new GlideEngine())
                .forResult(REQUEST_CODE_CHOOSE);
    }
    @Override
@@ -367,7 +331,7 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
            if (data != null) {
                if (requestCode == 1) {
                    //处理调用系统图库
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
                } else if (requestCode == REQUEST_CODE_CHOOSE) {
                    //异步方式插入图片
                    insertImagesSync(data);
                }
@@ -387,22 +351,16 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
                    @Override
                    public ObservableSource<Boolean> apply(Intent intent) throws Exception {
                        try {
                            ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
                            //可以同时插入多张图片
                            for (String imagePath : photos) {
                                Log.e(TAG, "call: imagePath " + imagePath);
                                Bitmap bitmap = BitmapFactory.decodeFile(imagePath);//压缩图片
                                if (ImageUtils.readPictureDegree(imagePath) != 0) {
                                    bitmap = imageZoom(ImageUtils.toturn(bitmap));
                                } else {
                                    bitmap = imageZoom(bitmap);
                                }
                            List<Uri> uriList = Matisse.obtainResult(data);
                            for (Uri uri: uriList) {
                                Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
                                File file = FileUtils.from(AlterOneActivity.this, uri);
                                bitmap = FileUtils.rotateIfRequired(file, bitmap);
                                bitmap = imageZoom(bitmap);
                                ImageItem takePhoto = new ImageItem();
                                takePhoto.setBitmap(bitmap);
                                takePhoto.setImagePath(imagePath);
                                Bimp.tempSelectBitmap.add(takePhoto);
                            }
                            return Observable.just(true);

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

@@ -337,21 +337,7 @@ public class AlterTwoActivity extends Activity implements
    @Override
    public void onClick(View v) {
//        this.mapStatus = this.mBaiduMap.getMapStatus();
        switch (v.getId()) {
//            case R.id.iv_alter:
//                if (!isFirstLoc) {
//                    isFirstLoc = true;
//                   // Toast.makeText(this,"正在定位当前位置...",Toast.LENGTH_LONG);
//                    mCurrentMode = LocationMode.NORMAL;
//                    mBaiduMap
//                            .setMyLocationConfigeration(new MyLocationConfiguration(
//                                    mCurrentMode, true, mCurrentMarker));
//                    mBaiduMap.setMyLocationEnabled(true);
//                    Toast.makeText(this, "正在定位当前位置...", Toast.LENGTH_SHORT);
//                    mLocClient.start();
//                }
//                break;
            case R.id.iv_back:
                finish();
                break;
@@ -359,14 +345,6 @@ public class AlterTwoActivity extends Activity implements
                startActivity(new Intent(this, AlterOneActivity.class));
                break;
            case R.id.tv_submit:
//                tv_submit.setEnabled(false);
//               if (tv_submit.isEnabled() == false){
//                   Toast.makeText(AlterTwoActivity.this,"不可点击",Toast.LENGTH_SHORT).show();
//               }
//                if(et_remark.getText().toString().equals("")){
//                    showTextToast("请确认是否填写信息");
////                    Toast.makeText(AlterTwoActivity.this,"请确认是否填写信息",Toast.LENGTH_SHORT).show();
//                }else {
                createDialog();
                new Thread(new Runnable() {
                    @Override
@@ -374,7 +352,6 @@ public class AlterTwoActivity extends Activity implements
                        submit();
                    }
                }).start();
//                }
                break;
            case R.id.zoomin1:
@@ -388,7 +365,6 @@ public class AlterTwoActivity extends Activity implements
            case R.id.ib_location:
                if (!isFirstLoc) {
//                    isFirstLoc = true;
                    aMap.setMyLocationEnabled(true);// 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
                    // 设置定位的类型为定位模式 ，可以由定位、跟随或地图根据面向方向旋转几种
                    aMap.setMyLocationType(AMap.LOCATION_TYPE_LOCATE);
@@ -396,49 +372,7 @@ public class AlterTwoActivity extends Activity implements
                    aMap.moveCamera(CameraUpdateFactory.zoomTo(16));
                    mlocationClient.startLocation();
                }
//                if (!isFirstLoc) {
//                    isFirstLoc = true;
////                    tvLocation.setText("正在定位中...");
//                    mCurrentMode = LocationMode.NORMAL;
//                    MyLocationData locCenter = mBaiduMap.getLocationData();
//                    if (locCenter != null) {
////                            mBaiduMap.clear();
//                        selectedCenter = new LatLng(locCenter.latitude,
//                                locCenter.longitude);
//
////                        mBaiduMap.addOverlay(new MarkerOptions().position(center).icon(
////                                BitmapDescriptorFactory
////                                        .fromResource(R.drawable.position_icon)));
//                    } else {
//                        return;
//                    }
//
//
//                    mBaiduMap
//                            .setMyLocationConfigeration(new MyLocationConfiguration(
//                                    mCurrentMode, true, mCurrentMarker));
//                    mBaiduMap.setMapStatus(MapStatusUpdateFactory
//                            .newMapStatus(new MapStatus.Builder().zoom(15f).build()));
//                    mBaiduMap.setMyLocationEnabled(true);
//                    mLocClient.start();
//                }
                break;
//            case R.id.icon_jia:
//                this.mBaiduMap.setMapStatus(MapStatusUpdateFactory
//                        .zoomTo(mapStatus.zoom + 1));
//                controlZoomShow();
//                getPoint();
////                Toast.makeText(ShareChargingpileActicity.this,"+",Toast.LENGTH_SHORT).show();
//                break;
//
//            case R.id.icon_jian:
//                mBaiduMap.setMapStatus(MapStatusUpdateFactory
//                        .zoomTo(mapStatus.zoom - 1));
//                controlZoomShow();
//                getPoint();
////                Toast.makeText(ShareChargingpileActicity.this,"-",Toast.LENGTH_SHORT).show();
//                break;
            case R.id.tv_three_other:
                if (TextUtils.isEmpty(location)) {
                    Toast.makeText(this, "正在获取您的位置信息", Toast.LENGTH_SHORT).show();
@@ -455,8 +389,6 @@ public class AlterTwoActivity extends Activity implements
            if (zoom >= maxZoomLevel) {
                inBtn.setImageResource(R.drawable.icon_nojia2_0);
                inBtn.setEnabled(false);
//                Toast.makeText(getApplication(), "已放大到最大级别", Toast.LENGTH_SHORT)
//                        .show();
                return;
            } else {
                inBtn.setImageResource(R.drawable.icon_jia2_0);
@@ -466,8 +398,6 @@ public class AlterTwoActivity extends Activity implements
            if (zoom <= minZoomLevel) {
                outBtn.setImageResource(R.drawable.icon_nojian2_0);
                outBtn.setEnabled(false);
//                Toast.makeText(getApplication(), "已缩小到最小级别", Toast.LENGTH_SHORT)
//                        .show();
                return;
            } else {
                outBtn.setImageResource(R.drawable.icon_jian2_0);
@@ -479,58 +409,6 @@ public class AlterTwoActivity extends Activity implements
    }
//    public void getPoint() {
//        if (!isGetData) {
//            isGetData = true;
//            new Handler().postDelayed(new Runnable() {
//
//                @Override
//                public void run() {
//                    MyLocationData locCenter = mBaiduMap.getLocationData();
//                    if (locCenter != null) {
//                        center = new LatLng(locCenter.latitude,
//                                locCenter.longitude);
//
////                        mBaiduMap.addOverlay(new MarkerOptions().position(center).icon(
////                                BitmapDescriptorFactory
////                                        .fromResource(R.drawable.position_icon)));
//                    } else {
//                        return;
//                    }
////                    Point p1 = new Point(0, 0);
////                    LatLng locLeftTop = mBaiduMap.getProjection()
////                            .fromScreenLocation(p1);
////                    Point p2 = new Point(MainApplication.mScreenWidth, mMapView
////                            .getHeight());
////                    LatLng llRightBottom = mBaiduMap.getProjection()
////                            .fromScreenLocation(p2);
//                }
//            }, 500);
//        }
//    }
//    public void testTianjia(){
//        Intent intent = new Intent(this,
//                AlterThreeActivity.class);
//        intent.putExtra("location", "北京市海淀区");
//        intent.putExtra("jing", "116.542323");
//        intent.putExtra("wei", "39.33232");
//        intent.putExtra("city", "北京市");
//        intent.putExtra("district", "海淀区");
//        startActivity(intent);
//        this.finish();
//    }
    //    private void userGrowUp() {
//        new Thread(new Runnable() {
//            @Override
//            public void run() {
//                String url="http://www.d1ev.com/api/app/score?userid="+MainApplication.userPhone+"&type=check2";
////                submitGrow(url);
//            }
//        }).start();
//
//    }
    private Handler handler = new Handler() {
        // 主线程通过这个方法处理消息
        @Override
@@ -556,10 +434,7 @@ public class AlterTwoActivity extends Activity implements
                    } catch (JSONException e) {
                        e.printStackTrace();
                    }
                case 3:
//                    Toast.makeText(AlterTwoActivity.this, "服务器处理错误", Toast.LENGTH_SHORT).show();
                    break;
                default:
                    break;
@@ -636,89 +511,6 @@ public class AlterTwoActivity extends Activity implements
        }
    }
//    private void submitGrow( String sms) {
//
//        Log.e("url", sms);
//        Request request = new Request.Builder().url(sms).build();
//        Response response = null;
//        try{
//            if(request==null){
//                Message msg = new Message();
//                msg.what=3;
//                handler.sendMessage(msg);
//                return;
//            }
//            response = OkHttpUtil.execute(request);
//            if (response.code() == 200) {
//                String json = "";
//                try {
//                    json = response.body().string();
//                    Message msg = new Message();
//                    msg.obj = json;
//                    msg.what=1;
//                    handler.sendMessage(msg);
//                    Log.e("url", json);
//                }catch (Exception e){
//                    e.printStackTrace();
//                    Message msg = new Message();
//                    msg.what=3;
//                    handler.sendMessage(msg);
//                }
//            }
//        }catch (Exception e){
//            e.printStackTrace();
//            Message msg = new Message();
//            msg.what=3;
//            handler.sendMessage(msg);
//        }
//    }
//    public class MyLocationListenner implements BDLocationListener {
//
//        @Override
//        public void onReceiveLocation(BDLocation location) {
//            if (location == null || mMapView == null)
//                return;
//            MyLocationData locData = new MyLocationData.Builder()
//                    .accuracy(location.getRadius())
//                    .direction(100).latitude(Double.parseDouble(poi_wei))
//                    .longitude(Double.parseDouble(poi_jing)).build();
//            mBaiduMap.setMyLocationData(locData);
//            if (isFirstLoc) {
//                isFirstLoc = false;
//                mLocClient.stop();
//                mBaiduMap.setMyLocationEnabled(false);
//                LatLng ll = new LatLng(Double.parseDouble(poi_wei),Double.parseDouble(poi_jing));
////                LatLng lll = new LatLng()
//                MapStatusUpdate u = MapStatusUpdateFactory.newLatLng(ll);
//                mBaiduMap.animateMapStatus(u);
//                llposition = ll;
//                city = location.getCity();
//                district = location.getDistrict();
//                initOverlay();
//            }
//        }
//        public void createDialog() {
//            if (pd_info == null) {
//                pd_info = CustomProgressDialog.createDialog(mContext);
//                pd_info.setMessage(mContext.getResources().getString(
//                        R.string.version_updating));
//                pd_info.show();
//            }
//        }
//
//        public void dismissDialog() {
//            if (pd_info != null) {
//                pd_info.dismiss();
//                pd_info = null;
//            }
//        }
//
//        public void onReceivePoi(BDLocation poiLocation) {
//        }
//    }
    @Override
    protected void onPause() {
        mapView.onPause();
@@ -821,16 +613,6 @@ public class AlterTwoActivity extends Activity implements
        poi_wei = String.valueOf(target.latitude);
        change_jing = roundByScale(target.longitude, 5);
        change_wei = roundByScale(target.latitude, 5);
//        Log.e("++++++","+++++++++");
//        if (first_tag == true){
//            first_tag = false;
//        }else {
//            if (!change_jing.equals(original_jing) && !change_wei.equals(original_wei)) {
//                tv_submit.setEnabled(true);
//                tv_submit.setClickable(true);
//                tv_submit.setBackgroundResource(R.color.lvse);
//            }
//        }
    }
    @Override
@@ -838,7 +620,6 @@ public class AlterTwoActivity extends Activity implements
        aMap.setMyLocationEnabled(true);// 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
        // 设置定位的类型为定位模式 ，可以由定位、跟随或地图根据面向方向旋转几种
        aMap.setMyLocationType(AMap.LOCATION_TYPE_LOCATE);
//        aMap.moveCamera();
        aMap.moveCamera(CameraUpdateFactory.zoomTo(16));
        int position_jing = poi_jing.length() - poi_jing.indexOf(".") + 1;
@@ -853,9 +634,6 @@ public class AlterTwoActivity extends Activity implements
            ll = new LatLng(Double.parseDouble(gd_wei), Double.parseDouble(gd_jing));
        }
//                LatLng lll = new LatLng()
//                    MapStatusUpdate u = MapStatusUpdateFactory.newLatLng(ll);
//                    mBaiduMap.animateMapStatus(u);
        llposition = ll;
        //设置缩放级别
        aMap.moveCamera(CameraUpdateFactory.zoomTo(16));
@@ -866,8 +644,6 @@ public class AlterTwoActivity extends Activity implements
    private void getGaode(Double jing, Double wei) {
//        Log.e("jing", jing + "");
//        Log.e("wei", wei + "");
        double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
        double gg_lon;
        double gg_lat;
@@ -876,10 +652,8 @@ public class AlterTwoActivity extends Activity implements
        double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
        gg_lon = z * Math.cos(theta);
        gd_jing = String.valueOf(gg_lon);
//        Log.e("gg_lon", gg_lon + "");
        gg_lat = z * Math.sin(theta);
        gd_wei = String.valueOf(gg_lat);
//        Log.e("gg_lat", gg_lat + "");
    }
    @Override
@@ -927,11 +701,6 @@ public class AlterTwoActivity extends Activity implements
            tv.setText(zhan_name);
            et_address.setText(zhan_address);
        }
//        if (mMarker1 != null){
//            tv.setText(location);
//            et_share_address.setText(location);
//        }
//        tv.setGravity(View.TEXT_ALIGNMENT_CENTER);
        tv.setTextColor(getResources().getColor(R.color.hintColor));
        tv.setTextSize(15);
@@ -943,12 +712,6 @@ public class AlterTwoActivity extends Activity implements
        return null;
    }
//    @Override
//    public void onMapClick(LatLng latLng) {
//        llposition = latLng;
//        initOverlay1();
//    }
    @Override
    public void onLocationChanged(AMapLocation amapLocation) {
        if (amapLocation != null
@@ -956,19 +719,13 @@ public class AlterTwoActivity extends Activity implements
            try {
                Log.e("---------------", "--------------");
                mlocationClient.stopLocation();
//                tv_addressName.setText(amapLocation.getAddress());
                poi_jing = String.valueOf(amapLocation.getLongitude());
                poi_wei = String.valueOf(amapLocation.getLatitude());
            } catch (NullPointerException e) {
                e.printStackTrace();
            }
//                ProfileManager.getInstance().setAtCity(getApplicationContext(), MainApplication.atCity);
            if (!isFirstLoc) {
                center = new LatLng(amapLocation.getLatitude(), amapLocation.getLongitude());
//                Log.e("!@#$",amapLocation.getLatitude()+"```"+amapLocation.getLongitude());
////                Toast.makeText(this, amapLocation.getAddress(), Toast.LENGTH_SHORT).show();
////                Toast.makeText(this, amapLocation.getCity(), Toast.LENGTH_SHORT).show();
//                ete("{\"fun\":\"timer\"}");
                //设置缩放级别
                aMap.moveCamera(CameraUpdateFactory.zoomTo(16));
                //将地图移动到定位点
@@ -983,7 +740,6 @@ public class AlterTwoActivity extends Activity implements
        } else {
            String errText = "定位失败," + amapLocation.getErrorCode() + ": " + amapLocation.getErrorInfo();
            Log.e("AmapErr", errText);
//                mLocationErrText.setVisibility(View.VISIBLE);
            Toast.makeText(this, errText, Toast.LENGTH_SHORT).show();
        }
    }

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

@@ -43,15 +43,4 @@ public class ImageFileAlter extends Activity {
            finish();
        }
    }
//    public boolean onKeyDown(int keyCode, KeyEvent event) {
//        if (keyCode == KeyEvent.KEYCODE_BACK) {
//            Intent intent = new Intent();
//            intent.setClass(mContext, AlterOneActivity.class);
//            startActivity(intent);
//        }
//
//        return true;
//    }
}

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

@@ -43,15 +43,4 @@ public class ImageFileCharging extends Activity {
            finish();
        }
    }
//    public boolean onKeyDown(int keyCode, KeyEvent event) {
//        if (keyCode == KeyEvent.KEYCODE_BACK) {
//            Intent intent = new Intent();
//            intent.setClass(mContext, AlterOneActivity.class);
//            startActivity(intent);
//        }
//
//        return true;
//    }
}

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

@@ -43,15 +43,4 @@ public class ImageFileComment extends Activity {
            finish();
        }
    }
//    public boolean onKeyDown(int keyCode, KeyEvent event) {
//        if (keyCode == KeyEvent.KEYCODE_BACK) {
//            Intent intent = new Intent();
//            intent.setClass(mContext, AlterOneActivity.class);
//            startActivity(intent);
//        }
//
//        return true;
//    }
}

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

@@ -664,7 +664,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                            cancleButton.setOnClickListener(new View.OnClickListener() {
                                @Override
                                public void onClick(View view) {
//                        Toast.makeText(ZhanDetailsNew.this, "NO", Toast.LENGTH_SHORT).show();
                                    popupWindow.dismiss();
                                }
                            });
@@ -680,7 +679,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                    } else {
                                        getGaode(Double.parseDouble(jingdu), Double.parseDouble(weidu));
                                    }
//                                getGaode(Double.parseDouble(poi_jing),Double.parseDouble(poi_wei));
                                    Intent intent = new Intent(getApplication(), BasicNaviActivity.class);
                                    intent.putExtra("start_jing", MainMapActivity.center.longitude + "");
                                    intent.putExtra("start_wei", MainMapActivity.center.latitude + "");
@@ -701,11 +699,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                @Override
                                public void onClick(View view) {
                                    Intent intent = null;
//                                        try {
//                                            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");
//                                        } catch (URISyntaxException e) {
//                                            e.printStackTrace();
//                                        }
                                    getBaidu(MainMapActivity.center.longitude, MainMapActivity.center.latitude);
                                    int position_jing = jingdu.length() - jingdu.indexOf(".") + 1;
                                    int position_wei = weidu.length() - weidu.indexOf(".") + 1;
@@ -713,7 +706,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                        getBaidu1(Double.parseDouble(jingdu), Double.parseDouble(weidu));
                                    } else {
//                                    getGaode(Double.parseDouble(poi_jing),Double.parseDouble(poi_wei));
                                        bd_jing = Double.parseDouble(jingdu);
                                        bd_wei = Double.parseDouble(weidu);
                                    }
@@ -723,7 +715,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                                "destination=" + bd_wei + "," + bd_jing +
                                                "&mode=driving&" +
                                                "src=充电桩#Intent;scheme=bdapp;package=com.baidu.BaiduMap;end";
//                                        Log.e("sss", s);
                                        intent = Intent.getIntent(s);
                                        MainMapActivity.detailsBack = true;
                                        HashMap<String, String> mmap = new HashMap<String, String>();
@@ -736,15 +727,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                        e.printStackTrace();
                                    }
                                    startActivity(intent);
//                                                    if (MainFragment.center != null) {
//                                                        double dwei = Double.parseDouble(zhan.getPoi_wei());
//                                                        double djing = Double.parseDouble(zhan.getPoi_jing());
//                                                        LatLng ll = new LatLng(dwei, djing);
//
//                                                        startNavi(MainFragment.center, ll);
//
//                                                    }
//                                    startNavi(center, ll);
                                    popupWindow.dismiss();
                                }
@@ -763,8 +745,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                        } else {
                                            getGaode(Double.parseDouble(jingdu), Double.parseDouble(weidu));
                                        }
//                                            getGaode(Double.parseDouble(poi_jing), Double.parseDouble(poi_wei));
//                                            getBeginGaode(center.longitude, center.latitude);
                                        Intent intent4 = new Intent("android.intent.action.VIEW",
                                                android.net.Uri.parse("androidamap://route?sourceApplication=amap&slat=" + MainMapActivity.center.latitude + "&slon=" + MainMapActivity.center.longitude + "&sname=我的位置&dlat=" + gd_wei + "&dlon=" + gd_jing + "&dname=" + zhanname + "&dev=0&m=0&t=2"));
                                        intent4.setPackage("com.autonavi.minimap");
@@ -785,7 +765,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                                }
                            });
                            popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
//                                            startNavi(center, ll);
                        } else {
                            Toast.makeText(getApplication(),
                                    "没有定位到您的当前位置", Toast.LENGTH_SHORT)
@@ -804,21 +783,11 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                popupWindow.setBackgroundDrawable(new BitmapDrawable());
                // 设置PopupWindow的弹出和消失效果
                popupWindow.setAnimationStyle(R.style.popupAnimation);
//                confirmButton = (Button) popupWindowView
//                        .findViewById(R.id.confirmButton);
//                confirmButton.setOnClickListener(new View.OnClickListener() {
//                    @Override
//                    public void onClick(View view) {
//                        Toast.makeText(ShareTwoActivity.this, "YES", Toast.LENGTH_SHORT).show();
//                        popupWindow.dismiss();
//                    }
//                });
                cancleButton = (Button) popupWindowView
                        .findViewById(R.id.cancleButton);
                cancleButton.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View view) {
//                        Toast.makeText(ZhanDetailsNew.this, "NO", Toast.LENGTH_SHORT).show();
                        popupWindow.dismiss();
                    }
                });
@@ -829,7 +798,6 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                        if (!MainApplication.isLogin()) {
                            Toast.makeText(getApplication(), "请先登录", Toast.LENGTH_SHORT).show();
                            startActivity(new Intent(getApplication(), LoginActivity.class));
//                    finish();
                        } else {
                            Intent intent = new Intent(getApplication(), AlterOneActivity.class);
                            intent.putExtra("zhanname", zhanname);

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

@@ -105,7 +105,6 @@ public class ShowAllPhotoAlter extends Activity {
        public void onClick(View v) {
            //清空选择的图片
//            Bimp.tempSelectBitmap.clear();
            intent.setClass(ShowAllPhotoAlter.this, AlterOneActivity.class);
            startActivity(intent);
            finish();