代码优化

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

@@ -2,6 +2,7 @@ package com.electric.chargingpile.activity;
import android.Manifest;
import android.app.Activity;
import android.app.Application;
import android.content.BroadcastReceiver;
import android.content.ContentValues;
import android.content.Context;
@@ -681,32 +682,16 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                            cityList.clear();
                            aMap.clear();
                            if (ll != null && ll.size() > 0) {
//                        List<Zhan> ll = DES3.encode(l);
                                cityList.addAll(ll);
//                                Log.e("size", cityList.size() + "");
//                                initOverlayy(cityList);
                                if (center != null) {
                                    for (int i = 0; i < cityList.size(); i++) {
                                        double dwei = Double.parseDouble(list.get(i)
                                                .getPoi_wei());
                                        double djing = Double.parseDouble(list.get(i)
                                                .getPoi_jing());
                                        double dwei = Double.parseDouble(list.get(i).getPoi_wei());
                                        double djing = Double.parseDouble(list.get(i).getPoi_jing());
                                        LatLng lll = new LatLng(dwei, djing);
//                                        double d = DistanceUtil.getDistance(center, ll);
//                                        cityList.get(i).setDistance(Util.getDistance(d));
                                    }
                                }
//                                if (list.get(i).getSupplier().equals("特来电")){
//                                    zhanOne=list.get(i);
//                                    getDetailThread(list.get(i).getTid());
//                                }
//                                initOverlay(list);
                            } else {
//                            Toast.makeText(getActivity(), "没有合适的充电桩", Toast.LENGTH_SHORT)
//                                    .show();
//                                showTextToast("没有合适的充电桩");
                                if (center != null) {
                                    BitmapDescriptor point = BitmapDescriptorFactory
                                            .fromResource(R.drawable.point_icon);
@@ -1622,7 +1607,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        super.onResume();
        String from = getIntent().getStringExtra("from");
        if ("search_all_activity".equals(from)) {
        if ("search_from_activity".equals(from)) {
            searchAll();
        }
@@ -1643,8 +1628,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
        if (onResumeRefresh == true) {
//            showMap();
//            ete("{\"fun\":\"timer\"}");
            try {
                getZhanData();
            } catch (Exception e) {
@@ -2442,224 +2425,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }).start();
    }
    //这是请求回来的站点数据
    public void initOverlay(final List<Zhan> l) {
//        Toast.makeText(getApplicationContext(),android.os.Build.VERSION.RELEASE,Toast.LENGTH_SHORT).show();
        new Thread(new Runnable() {
            @Override
            public void run() {
                try {
                    if (MainApplication.search_jing != 0.0 && MainApplication.search_wei != 0.0) {
                        LatLng latLng = new LatLng(MainApplication.search_wei, MainApplication.search_jing);
                        search_marker = aMap.addMarker(new MarkerOptions().position(latLng).icon(BitmapDescriptorFactory.fromBitmap(BitmapFactory
                                .decodeResource(getResources(), R.drawable.icon_search_address))));
                        search_marker.setPeriod(8);
                    }
                    for (int i = 0; i < l.size(); i++) {
                        String wei = l.get(i).getPoi_wei().trim();
                        String jing = l.get(i).getPoi_jing().trim();
                        if (wei.equals("")) {
                            wei = "0";
                        }
                        if (jing.equals("")) {
                            jing = "0";
                        }
                        int position_jing = jing.length() - jing.indexOf(".") - 1;
                        int position_wei = wei.length() - wei.indexOf(".") - 1;
//                        Log.e("!!", position_jing + "--" + position_wei);
                        LatLng ll;
                        if (position_jing > 13 || position_wei > 13) {
                            ll = new LatLng(Double.parseDouble(wei), Double.parseDouble(jing));
                        } else {
                            double dwei = Double.parseDouble(wei);
                            double djing = Double.parseDouble(jing);
                            getGaode(djing, dwei);
//                            Log.e("qq", gd_jing + "\n" + gd_wei);
                            ll = new LatLng(Double.parseDouble(gd_wei), Double.parseDouble(gd_jing));
//                            Log.e("ll", ll.longitude + "\n" + ll.latitude);
                        }
                        String no = "";
                        if (!l.get(i).getAcNum().equals("")) {
                            //有实时状态
                            if (!l.get(i).getCompanycity().equals("")) {
                                //有活动情况
                                Bundle bundle = new Bundle();
                                bundle.putSerializable("info", l.get(i));
                                bundle.putString("type", "4");
                                oogift = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)))
                                        .anchor(0.5f, 1.0f).zIndex(3);
                                mMarkerGift = (Marker) aMap.addMarker(oogift);
                                mMarkerGift.setPeriod(10);
                                mMarkerGift.setObject(bundle);
                            } else {
                                if (l.get(i).getOwn_pay().equals("1")) {
                                    //可用本APP支付的
                                    Bundle bundle = new Bundle();
                                    bundle.putSerializable("info", l.get(i));
                                    bundle.putString("type", "3");
                                    int noo = Integer.parseInt(l.get(i).getAcableNum()) + Integer.parseInt(l.get(i).getDcableNum());
                                    BitmapDescriptor bitmap = BitmapDescriptorFactory.fromBitmap(getMarkerApps(noo));
                                    oono = new MarkerOptions().position(ll).icon(bitmap)
                                            .anchor(0.5f, 1.0f).zIndex(3);
                                    mMarkerNo = (Marker) aMap.addMarker(oono);
                                    mMarkerNo.setObject(bundle);
                                } else {
                                    //不可用本app支付
                                    Bundle bundle = new Bundle();
                                    bundle.putSerializable("info", l.get(i));
                                    bundle.putString("type", "3");
                                    int noo = Integer.parseInt(l.get(i).getAcableNum()) + Integer.parseInt(l.get(i).getDcableNum());
                                    BitmapDescriptor bitmap = BitmapDescriptorFactory.fromBitmap(getMarkerBmp(noo));
                                    oote = new MarkerOptions().position(ll).icon(bitmap)
                                            .anchor(0.5f, 1.0f).zIndex(3);
                                    mMarkerTe = (Marker) aMap.addMarker(oote);
                                    mMarkerTe.setObject(bundle);
                                }
                            }
                        } else {
                            //没有实时状态
                            if (!l.get(i).getCompanycity().equals("")) {
                                //有活动情况
                                Bundle bundle = new Bundle();
                                bundle.putSerializable("info", l.get(i));
                                bundle.putString("type", "4");
                                oogift = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)))
                                        .anchor(0.5f, 1.0f).zIndex(3);
                                mMarkerGift = (Marker) aMap.addMarker(oogift);
                                mMarkerGift.setPeriod(10);
                                mMarkerGift.setObject(bundle);
                            } else {
                                if (l.get(i).getOwn_pay().equals("1")) {
                                    //不能用本app支付
                                    Bundle bundle = new Bundle();
                                    bundle.putSerializable("info", l.get(i));
                                    bundle.putString("type", "1");
                                    ooyes = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(7)))
                                            .anchor(0.5f, 1.0f).zIndex(3);
                                    mMarkerYes = (Marker) aMap.addMarker(ooyes);
                                    mMarkerYes.setPeriod(1);
                                    mMarkerYes.setObject(bundle);
                                } else {
                                    //不能用本app支付
                                    if (l.get(i).getStatus().equals("4")) {
                                        Bundle bundle = new Bundle();
                                        bundle.putSerializable("info", l.get(i));
                                        bundle.putString("type", "1");
                                        ooyes = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(1)))
                                                .anchor(0.5f, 1.0f).zIndex(3);
                                        mMarkerYes = (Marker) aMap.addMarker(ooyes);
                                        mMarkerYes.setPeriod(1);
                                        mMarkerYes.setObject(bundle);
                                    }
                                }
                            }
                        }
//                        if (l.get(i).getStatus().equals("4") && l.get(i).getAcNum().equals("") &&
//                                l.get(i).getAcableNum().equals("") && l.get(i).getDcNum().equals("")
//                                && l.get(i).getDcableNum().equals("")) {
//                            if (!l.get(i).getCompanycity().equals("")) {
//                                Bundle bundle = new Bundle();
//                                bundle.putSerializable("info", l.get(i));
//                                bundle.putString("type", "4");
//                                oogift = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)))
//                                        .anchor(0.5f, 1.0f).zIndex(3);
//                                mMarkerGift = (Marker) aMap.addMarker(oogift);
//                                mMarkerGift.setPeriod(10);
//                                mMarkerGift.setObject(bundle);
//
//
//                            } else {
//                                Bundle bundle = new Bundle();
//                                bundle.putSerializable("info", l.get(i));
//                                bundle.putString("type", "1");
//                                ooyes = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(1)))
//                                        .anchor(0.5f, 1.0f).zIndex(3);
//                                mMarkerYes = (Marker) aMap.addMarker(ooyes);
//                                mMarkerYes.setPeriod(1);
//                                mMarkerYes.setObject(bundle);
//
//                            }
//                        } else if (l.get(i).getStatus().equals("3") && l.get(i).getAcNum().equals("") &&
//                                l.get(i).getAcableNum().equals("") && l.get(i).getDcNum().equals("")
//                                && l.get(i).getDcableNum().equals("")) {
//
//                            if (!l.get(i).getCompanycity().equals("")) {
//                                Bundle bundle = new Bundle();
//                                bundle.putSerializable("info", l.get(i));
//                                bundle.putString("type", "4");
//                                oogift = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)))
//                                        .anchor(0.5f, 1.0f).zIndex(3);
//                                mMarkerGift = (Marker) aMap.addMarker(oogift);
//                                mMarkerGift.setObject(bundle);
//                            } else {
//                                Bundle bundle = new Bundle();
//                                bundle.putSerializable("info", l.get(i));
//                                bundle.putString("type", "2");
//                                oono = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(3)))
//                                        .anchor(0.5f, 1.0f).zIndex(3);
//                                mMarkerNo = (Marker) aMap.addMarker(oono);
//                                mMarkerNo.setObject(bundle);
//                            }
//                        } else if (!l.get(i).getAcNum().equals("") &&
//                                !l.get(i).getAcableNum().equals("") && !l.get(i).getDcNum().equals("")
//                                && !l.get(i).getDcableNum().equals("")) {
//
//                            if (!l.get(i).getCompanycity().equals("")) {
//                                Bundle bundle = new Bundle();
//                                bundle.putSerializable("info", l.get(i));
//                                bundle.putString("type", "4");
//                                oogift = new MarkerOptions().position(ll).icon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)))
//                                        .anchor(0.5f, 1.0f).zIndex(3);
//                                mMarkerGift = (Marker) aMap.addMarker(oogift);
//                                mMarkerGift.setObject(bundle);
//                            } else {
//                                Bundle bundle = new Bundle();
//                                bundle.putSerializable("info", l.get(i));
//                                bundle.putString("type", "3");
//                                int noo = Integer.parseInt(l.get(i).getAcableNum()) + Integer.parseInt(l.get(i).getDcableNum());
//
//                                BitmapDescriptor bitmap = BitmapDescriptorFactory.fromBitmap(getMarkerBmp(noo));
//                                oote = new MarkerOptions().position(ll).icon(bitmap)
//                                        .anchor(0.5f, 1.0f).zIndex(3);
//                                mMarkerTe = (Marker) aMap.addMarker(oote);
//                                mMarkerTe.setObject(bundle);
//                            }
//                        }
                    }
                    if (center != null) {
                        try {
                            BitmapDescriptor point = BitmapDescriptorFactory
                                    .fromResource(R.drawable.point_icon);
                            oo = new MarkerOptions().position(center).anchor(0.5f, 0.5f).zIndex(7).draggable(false).icon(point);
                            aMap.addMarker(oo);
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }).start();
    }
    public static String getMD5(String content) {
        try {
            MessageDigest digest = MessageDigest.getInstance("MD5");
@@ -2742,8 +2507,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private Bitmap getMarkerBmp1(int num) {
        mIvMarkerBg1.setImageResource(R.drawable.icon_konglogb);
//            mTvMarkerViewNum.set
        if (num > 10) {
            mTvMarkerViewNum1.setText(Integer.toString(num));
        } else {
@@ -2755,13 +2518,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private Bitmap getMarkerBmpCity(String num) {
        String no = num;
        mIvMarkerBgcity.setImageResource(R.drawable.icon_cityno);
//            mTvMarkerViewNum.set
        mTvMarkerViewNumcity.setText(no);
        Bitmap bmp = getBitmapFromView(mMarkerViewcity);
        return bmp;
    }
@@ -2779,29 +2537,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        return bitmap;
    }
//    @Override
//    public boolean onMarkerClick(Marker marker) {
//        Log.e(TAG, "onMarkerClick: 111" );
//        return false;
//
//    }
    @Override
    public void onClick(View v) {
        SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(getApplication());
        switch (v.getId()) {
//            case R.id.rl_charging_notice:
//                startActivity(new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class));
//                Intent intent33 = new Intent(getApplication(), MainScanActivity.class);
//                intent33.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
//                startActivity(intent33);
//                overridePendingTransition(0, 0);
//                ActivityManagerApplication.addDestoryActivity(MainMapActivity.this, "MainMapActivity");
//                break;
            case R.id.iv_tuijian:
//                startActivity(new Intent(getApplicationContext(),QuestionActivity.class));
                if (null != center) {
                    MobclickAgent.onEvent(getApplicationContext(), "0111");
                    Intent i = new Intent(getApplicationContext(), RecommendZhanActivity.class);
@@ -2817,9 +2557,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                tv_search.setText("请输入地址/关键字");
                iv_clear_address.setVisibility(View.INVISIBLE);
                ProfileManager.getInstance().setSearchAddress(this, "");
//                if (search_marker != null){
//                }
                MainApplication.search_jing = 0.0;
                MainApplication.search_wei = 0.0;
                ete("{\"fun\":\"timer\"}");
@@ -2911,11 +2648,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                startActivity(adfloatIntent);
                break;
            case R.id.iv_roadCondition:
//                Intent intenti = new Intent(getApplicationContext(),MyWebViewActivity.class);
//                intenti.putExtra("url","http://evcharge.cc/test/test-js-native.html");
//                startActivity(intenti);
//                startActivity(new Intent(getApplicationContext(),ChargingStatusActivity.class));
                MobclickAgent.onEvent(getApplicationContext(), "0113");
                if (ProfileManager.getInstance().getRoadCondition(getApplicationContext()) == false) {
                    iv_roadCondition.setImageResource(R.drawable.icon_youlukuang_main);
@@ -2942,8 +2674,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                controlZoomShow();
                break;
            case R.id.recommend_more_detail:
//                recommend_more_detail.setVisibility(View.GONE);
//                sharedPreferencesUtil.putBoolean("cdz_recommend_more_detail", true);
                break;
            //地图&列表切换按钮
            case R.id.iv_list:
@@ -2987,8 +2717,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    mlocationClient.startLocation();
                }
                windowLayout.setVisibility(View.GONE);
//                iv_news.setVisibility(View.VISIBLE);
//                iv_qiandao.setVisibility(View.VISIBLE);
                rl_control.setVisibility(View.VISIBLE);
                ll_open.setVisibility(View.GONE);
                break;
@@ -3019,10 +2747,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                break;
            case R.id.tv_shaixuan:
//                ToastUtil.showToast(getApplicationContext(),"123",Toast.LENGTH_SHORT);
                isListShow = true;
                windowLayout.setVisibility(View.GONE);
//                rl_control.setVisibility(View.VISIBLE);
                if (null != current_chargePoint) {
                    resetMarker();
                }
@@ -3076,17 +2802,12 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    iintent.putExtra("cha", MainMapActivity.cha);
                    iintent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                    startActivity(iintent);
//                Intent intent3 = new Intent(getApplication(), MainScanActivity.class);
//                intent3.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
//                startActivity(intent3);
//                finish();
                    overridePendingTransition(0, 0);
                    if (count == 1) {
                        MobclickAgent.onEvent(getApplicationContext(), "0104");
                        count = 2;
                    }
                }
//                ActivityManagerApplication.addDestoryActivity(this,"MainMapActivity");
                break;
            //发现界面tab
@@ -3101,16 +2822,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                Intent intent1 = new Intent(getApplication(), FindActivity.class);
                intent1.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                startActivity(intent1);
//                if (sav.getVisibility() == View.VISIBLE) {
//                    sav.setVisibility(View.GONE);
//                }
//                finish();
                overridePendingTransition(0, 0);
                if (count == 1) {
                    MobclickAgent.onEvent(getApplicationContext(), "0105");
                    count = 2;
                }
//                ActivityManagerApplication.addDestoryActivity(this,"MainMapActivity");
                break;
            case R.id.tab_qa:
                if (socket != null) {
@@ -3144,13 +2860,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                if (sav.getVisibility() == View.VISIBLE) {
                    sav.setVisibility(View.GONE);
                }
//                finish();
                overridePendingTransition(0, 0);
                if (count == 1) {
                    MobclickAgent.onEvent(getApplicationContext(), "0106");
                    count = 2;
                }
//                ActivityManagerApplication.addDestoryActivity(this,"MainMapActivity");
                break;
            case R.id.iv_clear:
                rl_ad.setVisibility(View.GONE);
@@ -3275,11 +2989,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            }
            rl_control.setVisibility(View.GONE);
            iv_sceen.setVisibility(View.GONE);
//            mapView.setVisibility(View.GONE);
            if (windowLayout.getVisibility() == View.VISIBLE) {
                windowLayout.setVisibility(View.GONE);
//                iv_news.setVisibility(View.VISIBLE);
//                iv_qiandao.setVisibility(View.VISIBLE);
                rl_control.setVisibility(View.VISIBLE);
                ll_open.setVisibility(View.GONE);
            }
@@ -3288,67 +2999,24 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
    }
//    /**
//     * marker点击时跳动一下
//     */
//    public void jumpPoint(final Marker marker LatLng l) {
//        final Handler handler = new Handler();
//        final long start = SystemClock.uptimeMillis();
//        Projection proj = aMap.getProjection();
//        Point startPoint = proj.toScreenLocation(Constants.XIAN);
//        startPoint.offset(0, -100);
//        final LatLng startLatLng = proj.fromScreenLocation(startPoint);
//        final long duration = 1500;
//
//        final Interpolator interpolator = new BounceInterpolator();
//        handler.post(new Runnable() {
//            @Override
//            public void run() {
//                long elapsed = SystemClock.uptimeMillis() - start;
//                float t = interpolator.getInterpolation((float) elapsed
//                        / duration);
//                double lng = t * Constants.XIAN.longitude + (1 - t)
//                        * startLatLng.longitude;
//                double lat = t * Constants.XIAN.latitude + (1 - t)
//                        * startLatLng.latitude;
//                marker.setPosition(new LatLng(lat, lng));
//                if (t < 1.0) {
//                    handler.postDelayed(this, 16);
//                }
//            }
//        });
//    }
    @Override
    public void onMapLoaded() {
        aMap.setMyLocationEnabled(true);// 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
        // 设置定位的类型为定位模式 ，可以由定位、跟随或地图根据面向方向旋转几种
        aMap.setMyLocationType(AMap.LOCATION_TYPE_LOCATE);
//        aMap.moveCamera();
//        new Handler().postDelayed(new Runnable() {
//            @Override
//            public void run() {
        aMap.moveCamera(CameraUpdateFactory.zoomTo(14));
//            }
//        },200);
    }
    @Override
    public void onCameraChange(CameraPosition cameraPosition) {
    }
    @Override
    public void onCameraChangeFinish(CameraPosition cameraPosition) {
    }
    @Override
    public void onMapClick(LatLng latLng) {
//        ToastUtil.showToast(getApplicationContext(),"!!!!",Toast.LENGTH_SHORT);
        float zoom = aMap.getCameraPosition().zoom;
        aMap.moveCamera(CameraUpdateFactory.zoomTo(zoom));
        Animation animation = AnimationUtils.loadAnimation(this, R.anim.out);
@@ -3360,74 +3028,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                windowLayout.setVisibility(View.GONE);
            }
        }, 500);
//        if (mMarkerYes != null) {
//            mMarkerYes.remove();
//        }
//        if (mMarkerNo != null) {
//            mMarkerNo.remove();
//        }
//        if (mMarkerTe != null) {
//            mMarkerTe.remove();
//        }
//        if (mMarkerGift != null) {
//            mMarkerGift.remove();
//        }
//        ete("{\"fun\":\"timer\"}");
//        if (currentClickedMarker != null) {
//            SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(getApplication());
//            sharedPreferencesUtil.setFileName("CurrentMarkerInfo");
//            String status = sharedPreferencesUtil.getString("status", "");
//            String companycity = sharedPreferencesUtil.getString("companycity", "");
//            String acNum = sharedPreferencesUtil.getString("acNum", "");
//            String dcNum = sharedPreferencesUtil.getString("dcNum", "");
//            String acableNum = sharedPreferencesUtil.getString("acableNum", "");
//            String dcableNum = sharedPreferencesUtil.getString("dcableNum", "");
//            String ownpay = sharedPreferencesUtil.getString("ownpay", "");
//
//            if (!acNum.equals("")) {
//                //有实时状态
//                if (!companycity.equals("")) {
//                    //有活动情况
//                    currentClickedMarker.setIcon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)));
//                }else {
//                    int noo = Integer.parseInt(acableNum) + Integer.parseInt(dcableNum);
//                    if (ownpay.equals("1")){
//                        //可用本APP支付的
//                        currentClickedMarker.setIcon(BitmapDescriptorFactory.fromBitmap(getMarkerApps(noo)));
//                    } else {
//                        //不可用本app支付
//                        currentClickedMarker.setIcon(BitmapDescriptorFactory.fromBitmap(getMarkerBmp(noo)));
//                    }
//                }
//            }else {
//                //没有实时状态
//                if (!companycity.equals("")) {
//                    //有活动情况
//                    currentClickedMarker.setIcon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(5)));
//                }else {
//                    if (ownpay.equals("1")){
//                        //不能用本app支付
//                        currentClickedMarker.setIcon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(7)));
//                    }else {
//                        //不能用本app支付
//                        if (status.equals("4")) {
//                            currentClickedMarker.setIcon(BitmapDescriptorFactory.fromBitmap(getMarkerBmpYes(1)));
//                        }
//                    }
//                }
//            }
//            currentClickedMarker = null;
//        } else {
//
//        }
        SharedPreferencesUtil sharedPreferencesUtil1 = new SharedPreferencesUtil(getApplication());
        sharedPreferencesUtil1.setFileName("CurrentMarkerInfo");
        sharedPreferencesUtil1.clearData();
//        iv_news.setVisibility(View.VISIBLE);
//        iv_qiandao.setVisibility(View.VISIBLE);
        rl_control.setVisibility(View.VISIBLE);
        ll_open.setVisibility(View.GONE);
    }
@@ -3437,17 +3040,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        if (rCode == 1000) {
            if (weatherLiveResult != null & weatherLiveResult.getLiveResult() != null) {
                LocalWeatherLive weatherlive = weatherLiveResult.getLiveResult();
                Log.e(TAG, "onWeatherLiveSearched: " + "-------" + weatherlive.getCity() + "-------" + weatherlive.getAdCode()
                        + "-------" + weatherlive.getHumidity() + "-------" + weatherlive.getProvince() + "-------" + weatherlive.getReportTime()
                        + "-------" + weatherlive.getTemperature() + "-------" + weatherlive.getWeather() + "-------" + weatherlive.getWindDirection()
                        + "-------" + weatherlive.getWindPower());
//                reporttime1.setText(weatherlive.getReportTime()+"发布");
//                weather.setText(weatherlive.getWeather());
//                Temperature.setText(weatherlive.getTemperature()+"°");
//                wind.setText(weatherlive.getWindDirection()+"风     "+weatherlive.getWindPower()+"级");
//                humidity.setText("湿度         "+weatherlive.getHumidity()+"%");
            } else {
//                ToastUtil.show(WeatherSearchActivity.this, R.string.no_result);
            }
        } else {
            ToastUtil.showToast(MainMapActivity.this, rCode + "", Toast.LENGTH_SHORT);
@@ -3471,17 +3064,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    Log.e(TAG, "onWeatherForecastSearched: " + list.get(a).getNightWeather());
                }
//                reporttime1.setText(weatherlive.getReportTime()+"发布");
//                weather.setText(weatherlive.getWeather());
//                Temperature.setText(weatherlive.getTemperature()+"°");
//                wind.setText(weatherlive.getWindDirection()+"风     "+weatherlive.getWindPower()+"级");
//                humidity.setText("湿度         "+weatherlive.getHumidity()+"%");
            } else {
//                ToastUtil.show(WeatherSearchActivity.this, R.string.no_result);
            }
        } else {
//            ToastUtil.showToast(MainMapActivity.this, rCode+"",Toast.LENGTH_SHORT);
        }
    }

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

@@ -309,7 +309,7 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
        selectBitmap[0] = null;
        selectBitmap[1] = null;
        selectBitmap[2] = null;
        
        pop = new PopupWindow(PrivateZhuangInfoActivity.this);
        View view = getLayoutInflater().inflate(R.layout.item_popupwindows, null);

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

@@ -277,6 +277,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
            @Override
            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                Intent intent = new Intent();
                intent.putExtra("from", "search_from_activity");
                intent.putExtra("zhan_name", historyInfoList.get(position).getIds());
                intent.putExtra("jing", historyInfoList.get(position).getJing());
                intent.putExtra("wei", historyInfoList.get(position).getWei());
@@ -314,6 +315,7 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                SimpleCursorAdapter historyAdapter = new SimpleCursorAdapter(SearchActivity.this, R.layout.history_item, c, from, to, 0);
                historyList.setAdapter(historyAdapter);
                Intent intent = new Intent();
                intent.putExtra("from", "search_from_activity");
                intent.putExtra("zhan_name", addressList.get(position).get("name"));
                intent.putExtra("jing", addressList.get(position).get("jing"));
                intent.putExtra("wei", addressList.get(position).get("wei"));

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

@@ -84,7 +84,7 @@ public class SearchAllActivity extends AppCompatActivity {
            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                Intent intent = new Intent();
                intent.setClass(getApplicationContext(), MainMapActivity.class);
                intent.putExtra("from", "search_all_activity");
                intent.putExtra("from", "search_from_activity");
                intent.putExtra("zhan_name", addressAllList.get(position).get("name"));
                intent.putExtra("jing", addressAllList.get(position).get("jing"));
                intent.putExtra("wei", addressAllList.get(position).get("wei"));