代码修改

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

@@ -57,140 +57,6 @@ public class LoginActivity extends Activity implements View.OnClickListener {
    String encode_token;
    Context mContext;
    public static final int RESULT_SUCCESS = 0;
//    private Bitmap download_bmp;
//
//    private Handler handler = new Handler() {
//        // 主线程通过这个方法处理消息
//        @Override
//        public void handleMessage(Message msg) {
//            switch (msg.what) {
//                case 1:
//                    try {
//                        JSONObject jsonObj = new JSONObject(msg.obj.toString());
//                        String status = jsonObj.getString("status");
//                        String info = jsonObj.getString("info");
//                        Log.e("成长模块测试", info);
//                    } catch (JSONException e) {
//                        e.printStackTrace();
//                    }
//                    break;
//                case 2:
//
//                    try {
//                        JSONObject jsonObj = new JSONObject(msg.obj.toString());
//                        String rtnCode = jsonObj.getString("rtnCode");
//
//
////                        String jifen = jsonObj.getString("jifen");
//                        if (rtnCode.equals("01")) {
//                            dismissDialog();
////                            ProfileManager.getInstance().setPassword(this,password.getText().toString());
////                            MainApplication.password = ProfileManager.getInstance().getPassword(mContext);
//                            String data = jsonObj.getString("data");
//                            try {
//                                Gson g = new Gson();
//                                User u = g.fromJson(data, User.class);
//                                Log.d("Nickname-----", u.getNickname());
//                                userid = u.getUserid().toString();
//                                if (!u.getUserpic().toString().equals("")) {
//                                    usericon = "http://123.57.6.131/zhannew//uploadfile/" + u.getUserpic().toString();
//                                } else {
//                                    usericon = "";
//                                }
//                                nickname = u.getNickname();
//                                username = u.getUsername();
//                                usersex = u.getSex();
//                                hascar = u.getChexing();
//                                nocar = u.getYichexing();
//                                if (nickname == null) {
//                                    nickname = "";
//                                }
//                                Log.e("usericon", usericon);
//                            } catch (Exception e) {
//                                e.printStackTrace();
//                            }
//
//                            SharedPreferences mySharedPreferences = getSharedPreferences("loginUserName",
//                                    Activity.MODE_PRIVATE);
//                            SharedPreferences.Editor editor1 = mySharedPreferences.edit();
//                            editor1.putString("username", phone.getText().toString());
//                            editor1.commit();
//
//
//                            SharedPreferences mSharedPreferences = getSharedPreferences("userInfo",
//                                    Activity.MODE_PRIVATE);
//                            SharedPreferences.Editor editor = mSharedPreferences.edit();
//                            editor.putString("nickname", nickname);
//                            editor.putString("username", username);
//                            editor.putString("sex", usersex);
//                            editor.putString("chexing", hascar);
//                            editor.putString("yichexing", nocar);
//                            editor.putString("password", password.getText().toString());
//                            editor.putString("yonghuming", phone.getText().toString());
////                            editor.putString("usericon",usericon);
//
//
//                            editor.commit();
//                            CreditActivity.canFresh = true;
//                            MainApplication.ok = "1";
//
//                            MainApplication.userPhone = phone.getText().toString().trim();
//                            MainApplication.userPassword = password.getText().toString();
//
//                            ProfileManager.getInstance().setUsername(LoginActivity.this,
//                                    phone.getText().toString().trim());
//                            ProfileManager.getInstance().setId(LoginActivity.this, phone.getText().toString().trim());
//                            ProfileManager.getInstance().setKeyUserpassword(LoginActivity.this, password.getText().toString().trim());
//
////                            Toast.makeText(LoginActivity.this,MainApplication.userId,Toast.LENGTH_SHORT).show();
//                            ProfileManager.getInstance().setUserid(LoginActivity.this, userid);
//                            ProfileManager.getInstance().setUsericon(LoginActivity.this, usericon);
//                            ProfileManager.getInstance().setNickname(LoginActivity.this, nickname);
//                            ProfileManager.getInstance().setUsercar(LoginActivity.this, hascar);
//                            MobclickAgent.onProfileSignIn(MainApplication.userId);
////                            startActivity(new Intent(LoginActivity.this, MainActicity.class));
////                            Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show();
//                            showTextToast("登录成功");
////                            MainFragment.showLogin();
////                            startActivity(new Intent(LoginActivity.this,UserCenterActivity.class));
//                            setResult(RESULT_SUCCESS);
//                            ProfileManager.getInstance().setCount(getApplicationContext(), 0);
//                            MainApplication.count = 0;
//                            finish();
//                        } else if (rtnCode.equals("03")) {
//                            dismissDialog();
//                            String rtnMsg = jsonObj.getString("rtnMsg");
////                            Toast.makeText(LoginActivity.this, "登录超时，请重新登录", Toast.LENGTH_SHORT).show();
//                            showTextToast("登录超时，请重新登录");
//                        } else if (rtnCode.equals("02")) {
//                            dismissDialog();
//                            String rtnMsg = jsonObj.getString("rtnMsg");
////                            Toast.makeText(LoginActivity.this, "用户不存在", Toast.LENGTH_SHORT).show();
//                            showTextToast("用户不存在，请核对后重新填写");
//                        } else if (rtnCode.equals("04")) {
//                            dismissDialog();
//                            String rtnMsg = jsonObj.getString("rtnMsg");
////                            Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
//                            showTextToast("密码错误，请重新输入");
//                        }
//                        return;
//                    } catch (Exception e) {
//                        e.printStackTrace();
//                    }
//                    break;
//                case 3:
////                    Toast.makeText(getApplication(), "服务器处理错误", Toast.LENGTH_SHORT).show();
//                    showTextToast("服务器处理错误");
//                    break;
//                case 5:
//
//                    break;
//                default:
//
//                    break;
//            }
//        }
//    };
    public void createDialog() {
        if (pd_info == null) {
@@ -286,13 +152,6 @@ public class LoginActivity extends Activity implements View.OnClickListener {
            @Override
            public void afterTextChanged(Editable s) {
//                if (phone.hasFocus()){
//                    if (!password.getText().toString().equals("") && password.getText().toString() != null ){
//                        btn_clear.setVisibility(View.GONE);
//                    }else {
//                        btn_clear.setVisibility(View.GONE);
//                    }
//                }else{
                if (!password.getText().toString().equals("") && password.getText().toString() != null) {
                    btn_clear.setVisibility(View.VISIBLE);
                } else {
@@ -309,8 +168,6 @@ public class LoginActivity extends Activity implements View.OnClickListener {
                    login.setTextColor(getResources().getColor(R.color.white));
                }
            }
//            }
        });
        //登陆按钮
@@ -345,15 +202,8 @@ public class LoginActivity extends Activity implements View.OnClickListener {
    @Override
    public void onClick(View view) {
//        if (imm.isActive()) {
//            View v = getWindow().peekDecorView();
//            if (view != null) {
//                imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
//            }
//        }
        switch (view.getId()) {
            case R.id.iv_back:
//                startActivity(new Intent(LoginActivity.this,MainActicity.class));
                finish();
                break;
            case R.id.tv_userLogin:
@@ -363,31 +213,21 @@ public class LoginActivity extends Activity implements View.OnClickListener {
                        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
                    }
                }
                userLogin();
//                userGrowUp();
                break;
            case R.id.tv_newUser:
                startActivity(new Intent(this, RegisterActivity.class));
                ActivityManagerApplication.addDestoryActivity(this, "login");
//                startActivity(new Intent(this, UserInfoActivity.class));
//                finish();
                break;
            case R.id.tv_forgetPassword:
                ActivityManagerApplication.addDestoryActivity(LoginActivity.this, "LoginActivity");
                startActivity(new Intent(this, ForgetPasswordActivity.class));
//                finish();
                break;
            case R.id.btn_clear:
                password.setText("");
                break;
            case R.id.username_clear:
                phone.setText("");
                break;
@@ -427,9 +267,6 @@ public class LoginActivity extends Activity implements View.OnClickListener {
                @Override
                public void onResponse(String response) {
                    LogUtils.e(response);
//                    Log.e(TAG, "onResponse: "+response );
                    dismissDialog();
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
                    if ("01".equals(rtnCode)) {
@@ -457,7 +294,6 @@ public class LoginActivity extends Activity implements View.OnClickListener {
    }
    private void saveUserInfo(String info) {
//        Log.e(TAG, "saveUserInfo: "+info );
        String userid = JsonUtils.getKeyResult(info, "userid");
        String nickname = JsonUtils.getKeyResult(info, "nickname");
        String tel = JsonUtils.getKeyResult(info, "tel");

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

@@ -12,8 +12,10 @@ import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.KeyEvent;
@@ -83,57 +85,14 @@ public class MainActicity extends FragmentActivity {
    }
//    @TargetApi(19)
//    protected void setTranslucentStatus(boolean on) {
//        Window win = getWindow();
//        WindowManager.LayoutParams winParams = win.getAttributes();
//        final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
//        if (on) {
//            winParams.flags |= bits;
//        } else {
//            winParams.flags &= ~bits;
//        }
//        win.setAttributes(winParams);
//    }
//
//    public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
//        Class<? extends Window> clazz = activity.getWindow().getClass();
//        try {
//            int darkModeFlag = 0;
//            Class<?> layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
//            Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
//            darkModeFlag = field.getInt(layoutParams);
//            Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
//            extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//    }
//    @TargetApi(19)
//    private void setTranslucentStatus(boolean on) {
//        Window win = getWindow();
//        WindowManager.LayoutParams winParams = win.getAttributes();
//        final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
//        if (on) {
//            winParams.flags |= bits;
//        } else {
//            winParams.flags &= ~bits;
//        }
//        win.setAttributes(winParams);
//    }
    protected void dialog() {
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActicity.this);
//        builder.setMessage("请选择要显示的电桩类型");
        builder.setTitle("请选择要显示的电桩类型");
        builder.setPositiveButton("国标", new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialog, int which) {
                MainApplication.userTpye = "1";
                ProfileManager.getInstance().setType(MainActicity.this, "1");
//                MainFragment.firstSelect();
                dialog.dismiss();
            }
        });
@@ -142,37 +101,14 @@ public class MainActicity extends FragmentActivity {
            public void onClick(DialogInterface dialog, int which) {
                MainApplication.userTpye = "2";
                ProfileManager.getInstance().setType(MainActicity.this, "2");
//                MainFragment.firstSelect();
                dialog.dismiss();
            }
        });
        builder.create().show();
//        Dialog.showSelectDialog(MainActicity.this, "选择对话框", new Dialog.DialogClickListener() {
//            @Override
//            public void confirm() {
//
//                MainApplication.userTpye="1";
//                ProfileManager.getInstance().setType(MainActicity.this, "1");
//                MainFragment.firstSelect();
//                Toast.makeText(MainActicity.this, "国标", Toast.LENGTH_SHORT).show();
//            }
//
//            @Override
//            public void cancel() {
//                MainApplication.userTpye="2";
//                ProfileManager.getInstance().setType(MainActicity.this, "2");
//                MainFragment.firstSelect();
//                Toast.makeText(MainActicity.this, "特斯拉", Toast.LENGTH_SHORT).show();
//            }
//        });
    }
    private void init() {
        if (!ProfileManager.getInstance().getGuide(this)) {
//            dialog();
            MainApplication.messageToken = "0";
            MainApplication.userTpye = "1";
            ProfileManager.getInstance().setGuide(this, true);
@@ -189,22 +125,12 @@ public class MainActicity extends FragmentActivity {
            Log.i("MainApplication.costWay", MainApplication.costWay);
            MainApplication.messageToken = ProfileManager.getInstance().getKeyMessageToken(this);
//            MainApplication.userTpye=ProfileManager.getInstance().get(this);
        }
        mSlidingMenu = (SlidingMenu) findViewById(R.id.slidingMenu);
        mSlidingMenu.setLeftView(getLayoutInflater().inflate(
                R.layout.right_frame, null));
        mSlidingMenu.setCenterView(getLayoutInflater().inflate(
                R.layout.center_frame, null));
        FragmentTransaction t = this.getSupportFragmentManager()
                .beginTransaction();
        mSlidingMenu.setLeftView(getLayoutInflater().inflate(R.layout.right_frame, null));
        mSlidingMenu.setCenterView(getLayoutInflater().inflate(R.layout.center_frame, null));
//        mainFragment = new MainFragment();
//        t.replace(R.id.center_frame, mainFragment);
//        t.commit();
        FragmentTransaction t = this.getSupportFragmentManager().beginTransaction();
        mSlidingMenu.setCanSliding(false, false);
    }
@@ -322,17 +248,7 @@ public class MainActicity extends FragmentActivity {
                if (!ExampleUtil.isEmpty(extras)) {
                    showMsg.append(KEY_EXTRAS + " : " + extras + "\n");
                }
                setCostomMsg(showMsg.toString());
            }
        }
    }
    private void setCostomMsg(String msg) {
//        if (null != msgText) {
//            msgText.setText(msg);
//            msgText.setVisibility(android.view.View.VISIBLE);
//        }
    }
}

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

@@ -2,7 +2,6 @@ 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;
@@ -378,8 +377,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    public static boolean isStatusBack = false;
    private static final int RC_CAMERA_PERM = 123;
    private static final int RC_Location_FIRST_PERM = 124;
    private static final int RC_Location_PERM = 125;
    private static final int RC_Location_FIRST_PERM = 126;
    private String adfloatUrl = "";
@@ -681,14 +680,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                    aMap.addMarker(oo);
                                }
                            }
//                            listt = list;
//                            if (list.size() > 0) {
//                                dialog.show();
//                                list = Util.getSortList(listt);
//                                list1 = list;
//                                dialog.cancel();
//                            }
//                            adapter.notifyDataSetChanged();
                        } catch (Exception e) {
                            BitmapDescriptor point = BitmapDescriptorFactory
                                    .fromResource(R.drawable.point_icon);
@@ -696,7 +687,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                                    anchor(0.5f, 0.5f).zIndex(7)
                                    .draggable(true).icon(point);
                            aMap.addMarker(oo);
//                            Toast.makeText(getActivity(),"该范围内没有充电桩",Toast.LENGTH_SHORT).show();
                        }
                    } catch (Exception e) {
@@ -733,18 +723,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        BarColorUtil.initStatusBarColor(MainMapActivity.this);
        m = this;
//        mquery = new WeatherSearchQuery("北京", WeatherSearchQuery.WEATHER_TYPE_FORECAST);
//        mweathersearch=new WeatherSearch(this);
//        mweathersearch.setOnWeatherSearchListener(this);
//        mweathersearch.setQuery(mquery);
//        mweathersearch.searchWeatherAsyn(); //异步搜索
//
//        mquery1 = new WeatherSearchQuery("北京", WeatherSearchQuery.WEATHER_TYPE_LIVE);
//        mweathersearch1=new WeatherSearch(this);
//        mweathersearch1.setOnWeatherSearchListener(this);
//        mweathersearch1.setQuery(mquery1);
//        mweathersearch1.searchWeatherAsyn(); //异步搜索
        mainMapActivity = MainMapActivity.this;
        intentFilter = new IntentFilter();
@@ -757,12 +735,9 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        if (MainApplication.ad_link.equals("1")) {
            againPoint = "1";
            is_dui = getIntent().getStringExtra("is_dui");
//            Log.e("is_dui===", is_dui);
            String url1 = getIntent().getStringExtra("shareUrl"); // web address
//            Log.e("z222", url1);
            if (is_dui.equals("0")) {
                Intent intent2 = new Intent(getApplication(), HomeWebActivity.class);
//        intent2.putExtra("shareUrl",url1);
                intent2.putExtra("shareUrl", url1);
                intent2.putExtra("shareTitle", getIntent().getStringExtra("shareTitle"));
                intent2.putExtra("shareIcon", getIntent().getStringExtra("shareIcon"));
@@ -774,11 +749,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                overridePendingTransition(0, 0);
            } else {
                long appTime11 = System.currentTimeMillis() / 1000;
//                Log.e("sfv_url===", getIntent().getStringExtra("shareUrl"));
//                Log.i("appTime(long)---", appTime11 + "");
                long updatetime1 = appTime11 - MainMapActivity.cha - 5;
//                Log.i("updatetime(long)---", updatetime1 + "");
//                Log.i("cha---", MainMapActivity.cha + "");
                String token1 = String.valueOf(updatetime1);
                String encode_token = null;
                try {
@@ -787,14 +758,12 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                    e.printStackTrace();
                }
                String replace = URLEncoder.encode(encode_token);
//                    startActivity(new Intent(getApplication(), ShopActivity.class));
                Intent intent11 = new Intent();
                intent11.setClass(getApplicationContext(), CreditActivity.class);
                intent11.putExtra("navColor", "#fcfcfc");    //配置导航条的背景颜色，请用#ffffff长格式。
                intent11.putExtra("titleColor", "#222222");    //配置导航条标题的颜色，请用#ffffff长格式。
                MainApplication.goods_type = "details";
                MainApplication.current_url = getIntent().getStringExtra("shareUrl");
//                MainApplication.current_url = "http://www.duiba.com.cn/mobile/appItemDetail?appItemId=453087";
                if (!MainApplication.isLogin()) {
                    intent11.putExtra("url", "http://cdz.evcharge.cc/zhannew/basic/web/index.php/duiba/active?token=" + replace + "&url=" + MainApplication.current_url);    //配置自动登陆地址，每次需服务端动态生成。
                } else {
@@ -880,13 +849,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
        context = this;
        gestureguide = ProfileManager.getInstance().getGestureguide(getApplicationContext());
//        //开启logcat输出，方便debug，发布时请关闭
//        XGPushConfig.enableDebug(this, false);
//        XGPushManager.registerPush(context);
//
//        Context context = getApplicationContext();
//        Intent service = new Intent(context, XGPushService.class);
//        context.startService(service);
        dialog = new LoadingDialog(this);
        dialog.setCanceledOnTouchOutside(false);
@@ -975,7 +937,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                }
            }
        }, 2000);
    }
@@ -1515,18 +1476,24 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            //设置是否强制刷新WIFI，默认为强制刷新
            //mLocationOption.setWifiActiveScan(false);
            mLocationOption.setWifiScan(true);
            if (ProfileManager.getInstance().getRequestLocationPermission(MainMapActivity.this)) {
            if (ProfileManager.getInstance().getStartedRequestLocationPermission(MainMapActivity.this)) {
                if (hasLocationPermission()) {
                    requestLocationPermission();
                }
            } else { // 首次启动
                ProfileManager.getInstance().setRequestLocationPermission(MainMapActivity.this, true);
                ProfileManager.getInstance().setStartedRequestLocationPermission(MainMapActivity.this, true);
                EasyPermissions.requestPermissions(
                        this,
                        "为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?",
                        RC_Location_FIRST_PERM,
                        Manifest.permission.ACCESS_FINE_LOCATION);
            }
            if (hasLocationPermission()) {
                requestLocationPermission();
            }
        }
    }
@@ -2504,24 +2471,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                break;
            case R.id.tv_switch_city:
                if (isListShow == false) {
                    windowLayout.setVisibility(View.GONE);
                    rl_control.setVisibility(View.VISIBLE);
                }
                if (null != current_chargePoint) {
                    resetMarker();
                }
                MobclickAgent.onEvent(getApplicationContext(), "0107");
                startActivity(new Intent(getApplicationContext(), NewSelectCityActivity.class));
                if (ll_tuijian.getVisibility() == View.VISIBLE) {
                    ll_tuijian.setVisibility(View.GONE);
                    rl_tuijian_tip.setVisibility(View.VISIBLE);
                    ll_top_right.setVisibility(View.VISIBLE);
                    ll_map_control.setVisibility(View.VISIBLE);
                }
                startNewSelectCityActivity();
                break;
            case R.id.tab_screening:
                if (socket != null) {
                    try {
@@ -2619,6 +2570,24 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
    }
    private void startNewSelectCityActivity() {
        if (isListShow == false) {
            windowLayout.setVisibility(View.GONE);
            rl_control.setVisibility(View.VISIBLE);
        }
        if (null != current_chargePoint) {
            resetMarker();
        }
        MobclickAgent.onEvent(getApplicationContext(), "0107");
        startActivity(new Intent(getApplicationContext(), NewSelectCityActivity.class));
        if (ll_tuijian.getVisibility() == View.VISIBLE) {
            ll_tuijian.setVisibility(View.GONE);
            rl_tuijian_tip.setVisibility(View.VISIBLE);
            ll_top_right.setVisibility(View.VISIBLE);
            ll_map_control.setVisibility(View.VISIBLE);
        }
    }
    public void showMap() {
        if (MainApplication.isMap) {
            if (list.size() == 0) {
@@ -3814,7 +3783,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
            MainApplication.sudu = ProfileManager.getInstance().getSudu(this);
        } else {
            MainApplication.userTpye = ProfileManager.getInstance().getTpey(this);
//            Log.e("type!", MainApplication.userTpye);
            MainApplication.mapStatus = ProfileManager.getInstance().getMapstatus(this);
            MainApplication.costWay = ProfileManager.getInstance().getCostway(this);
            MainApplication.map = ProfileManager.getInstance().getMap(this);
@@ -3882,57 +3850,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        });
    }
//    private void chargingStatus() {
//        long appTime1 = System.currentTimeMillis() / 1000;
//        long updatetime = appTime1 - MainMapActivity.cha - 3;
//        String token = String.valueOf(updatetime);
//        String url = MainApplication.url + "/zhannew/basic/web/index.php/xxapi/status_v2" +
//                "?supplier=星星充电&timer=" + token + "&user_id=" + MainApplication.userId + "&password="+MainApplication.userPassword+"&ver=1.0&sign="
//                + Md5Util.md5("password="+MainApplication.userPassword+"supplier=星星充电&timer=" + token + "&user_id=" + MainApplication.userId + "&key=661f9efdcb4f46fe7ab5f2e78a705a2a");
////        Log.e("urlstatus", url);
//        OkHttpUtils.get()
//                .url(url)
//                .build()
//                .connTimeOut(10000)
//                .readTimeOut(10000)
//                .execute(new StringCallback() {
//                    @Override
//                    public void onError(Call call, Exception e) {
//                        Toast.makeText(getApplicationContext(), "网络不给力", Toast.LENGTH_SHORT).show();
//                    }
//
//                    @Override
//                    public void onResponse(final String response) {
//                        new Handler().postDelayed(new Runnable() {
//                            @Override
//                            public void run() {
//                                String code = JsonUtils.getKeyResult(response, "code");
//                                if (code.equals("200")) {
//                                    rl_charging_notice.setVisibility(View.VISIBLE);
//                                    if (firstCheck) {
//                                        Intent intent3 = new Intent(getApplication(), MainScanActivity.class);
//                                        intent3.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
//                                        startActivity(intent3);
//                                        overridePendingTransition(0, 0);
//                                        ActivityManagerApplication.addDestoryActivity(MainMapActivity.this, "MainMapActivity");
//                                        MainScanActivity.tag = "1";
//                                        firstCheck = false;
//                                    }
//                                    Log.e("首页查询订单=", "有");
//                                } else {
//                                    rl_charging_notice.setVisibility(View.GONE);
//                                    MainScanActivity.tag = "";
//                                    Log.e("首页查询订单=", "没有");
//                                    MainApplication.isAppStart = false;
//                                    ProfileManager.getInstance().setAppStart(getApplicationContext(),MainApplication.isAppStart);
//                                }
//                            }
//                        }, 2000);
//
//                    }
//                });
//    }
    private void getZhanListData(int level) {
        aMap.clear();
@@ -3974,12 +3891,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
                for (int i = 0; i < list_del.size(); i++) {
                    String[] args = {String.valueOf(list_del.get(i).getId())};
                    int mub = db.delete("zhan_list", "id=?", args);
                    if (mub > 0) {
//                        Log.e(TAG, "删除成功");
                    } else {
//                        Log.e(TAG, "删除失败---" + list_del.get(i).getId());
                    }
                }
                db.setTransactionSuccessful();//调用此方法会在执行到endTransaction() 时提交当前事务，如果不调用此方法会回滚事务
            } finally {

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

@@ -1,13 +1,17 @@
package com.electric.chargingpile.activity;
import android.Manifest;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -43,13 +47,16 @@ import com.electric.chargingpile.data.CityTopHeaderBean;
import com.electric.chargingpile.gen.CityRecordDao;
import com.electric.chargingpile.helper.SuspensionDecoration;
import com.electric.chargingpile.iview.ISelectCityView;
import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.table.CityRecord;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.EventBusUtil;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LifeCycleEvent;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.SystemTypeUtil;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.AlertDialogCommon;
import com.electric.chargingpile.view.IndexBar;
import com.electric.chargingpile.view.MyItemDecoration;
import com.google.gson.Gson;
@@ -66,9 +73,11 @@ import java.util.ArrayList;
import java.util.List;
import io.reactivex.subjects.PublishSubject;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
public class NewSelectCityActivity extends AppCompatActivity implements ISelectCityView, AMapLocationListener {
public class NewSelectCityActivity extends AppCompatActivity implements ISelectCityView, AMapLocationListener, EasyPermissions.PermissionCallbacks {
    private RecyclerView evsdkRvSearch;
    private Context mContext;
    private RecyclerView mRv;
@@ -103,6 +112,9 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
    private ImageView ivBack, ivSearchClear;
    private EditText etSearch;
    private LinearLayout llLayout;
    private static final int RC_Location_PERM = 125;
    Handler hand = new Handler() {
        public void handleMessage(android.os.Message msg) {
            switch (msg.what) {
@@ -117,18 +129,13 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                    break;
                default:
                    break;
            }
        }
        ;
@@ -139,7 +146,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_new_select_city);
        BarColorUtil.initStatusBarColor(NewSelectCityActivity.this);
        initViews();
    }
@@ -153,19 +159,13 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
        llLayout.setFocusable(true);
        llLayout.setFocusableInTouchMode(true);
        mContext = this;
//        selectCityPresenter = new SelectCityPresenter(this, SelectCityActivity.this);
        mRv = (RecyclerView) findViewById(R.id.evsdk_rv);
        mRv.setLayoutManager(mManager = new LinearLayoutManager(this));
        mSourceDatas = new ArrayList<>();
        mHeaderDatas = new ArrayList<>();
//        List<AllCityBean> locationCity = new ArrayList<>();
//        locationCity.add("定位中");
//        mHeaderDatas.add(new CityHeaderBean(locationCity, "定位城市", "定"));
        List<AllCityBean> recentCitys = new ArrayList<>();
        mHeaderDatas.add(new CityHeaderBean(recentCitys, "最近访问", "近"));
//        List<String> hotCitys = new ArrayList<>();
//        mHeaderDatas.add(new CityHeaderBean(recentCitys, "热门城市", "热"));
        mSourceDatas.addAll(mHeaderDatas);
        mAdapter = new SelectCityAdapter(this, R.layout.evsdk_item_select_city, mBodyDatas, NewSelectCityActivity.this);
@@ -208,8 +208,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                    mTvCity = holder.getView(R.id.evsdk_tv_current_city);
                    holder.setText(R.id.evsdk_tv_current_city, cityTopHeaderBean.getTxt() + currentLocationCity);
                    mTvLocation = holder.getView(R.id.evsdk_tv_location);
//                        holder.setText(R.id.evsdk_tv_location, cityTopHeaderBean.getTxt());
                    holder.setOnClickListener(R.id.evsdk_tv_location, new View.OnClickListener() {
                        @Override
                        public void onClick(View view) {
@@ -217,7 +215,7 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                            if (null == mlocationClient) {
                                initLocation();
                            } else {
                                mlocationClient.startLocation();
                                requestLocationPermission();
                            }
                            mTvLocation.setEnabled(false);
                        }
@@ -244,9 +242,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
        };
        mHeaderAdapter.setHeaderView(0, R.layout.evsdk_item_header_top, new CityTopHeaderBean("定位城市：" + currentLocationCity));
        mHeaderAdapter.setHeaderView(1, R.layout.evsdk_item_header, mHeaderDatas.get(0));
//        mHeaderAdapter.setHeaderView(2, R.layout.evsdk_item_header, mHeaderDatas.get(1));
//        mHeaderAdapter.setHeaderView(3, R.layout.meituan_item_header, mHeaderDatas.get(2));
        mRv.setAdapter(mHeaderAdapter);
        mRv.addItemDecoration(mDecoration = new SuspensionDecoration(this, mSourceDatas)
                .setmTitleHeight((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 28, getResources().getDisplayMetrics()))
@@ -254,7 +249,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                .setTitleFontSize((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 14, getResources().getDisplayMetrics()))
                .setColorTitleFont(mContext.getResources().getColor(R.color.ui_68))
                .setHeaderViewCount(mHeaderAdapter.getHeaderViewCount() - mHeaderDatas.size()));
//        mRv.addItemDecoration(new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL_LIST));
        mRv.addItemDecoration(new MyItemDecoration());
        //使用indexBar
@@ -384,10 +378,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                .invalidate();
        mDecoration.setmDatas(mSourceDatas);
//        CityHeaderBean header1 = mHeaderDatas.get(0);
//        header1.getCityList().clear();
//        header1.getCityList().add("北京");
        //初始化选择过的城市信息
        List<CityRecord> localRecordList = getLocalCityRecordData();
        List<AllCityBean> showCityList = new ArrayList<>();
@@ -404,44 +394,38 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
        initLocation();
        CityHeaderBean header2 = mHeaderDatas.get(0);
        header2.setCityList(showCityList);
//
////        添加热门城市
//                CityHeaderBean header3 = mHeaderDatas.get(1);
//                List<String> hotCitys = new ArrayList<>();
//                hotCitys.add("上海");
//                hotCitys.add("北京");
//                hotCitys.add("杭州");
//                hotCitys.add("广州");
//                header3.setCityList(showCityList);
//
//        mHeaderAdapter.notifyItemRangeChanged(1, 3);
//        initLocation();
    }
    private void initLocation() {
//        AMapLocationClientOption mLocationOption = null;
        mlocationClient = new AMapLocationClient(this);
//初始化定位参数
        //初始化定位参数
        mLocationOption = new AMapLocationClientOption();
//设置定位监听
        //设置定位监听
        mlocationClient.setLocationListener(this);
//设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
        //设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
        mLocationOption.setOnceLocation(true);
        //设置是否强制刷新WIFI，默认为强制刷新
        mLocationOption.setWifiActiveScan(false);
//设置定位间隔,单位毫秒,默认为2000ms
//        mLocationOption.setInterval(2000);
//设置定位参数
        //设置定位间隔,单位毫秒,默认为2000ms
        // mLocationOption.setInterval(2000);
        // 设置定位参数
        mlocationClient.setLocationOption(mLocationOption);
// 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
// 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
// 在定位结束后，在合适的生命周期调用onDestroy()方法
// 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
//启动定位
        mlocationClient.startLocation();
        // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
        // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
        // 在定位结束后，在合适的生命周期调用onDestroy()方法
        // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
        //启动定位
        if (hasLocationPermission()) {
            requestLocationPermission();
        } else {
            mTvLocation.setText("定位失败");
            if (!ProfileManager.getInstance().getFirstRequestLocationPermission(NewSelectCityActivity.this)) {
                ProfileManager.getInstance().setFirstRequestLocationPermission(NewSelectCityActivity.this, true);
                requestLocationPermission();
            }
        }
    }
    private void insertData(CityRecord cityRecord) {
@@ -476,17 +460,11 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                try {
                    socket = new Socket("cdz.evcharge.cc", 9503); // IP：10.14.114.127，端口54321
                    // 向服务器发送消息
                    PrintWriter out = new PrintWriter(new BufferedWriter(
                            new OutputStreamWriter(socket.getOutputStream())), true);
                    PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream())), true);
                    out.println(params);
                    // out.println("{\"fun\":\"getcity\"}");
                    // 接收来自服务器的消息
                    BufferedReader br = new BufferedReader(new InputStreamReader(
                            socket.getInputStream()));
                    BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
                    String msg = br.readLine();
//                        Log.d("dddddmsg",msg);
                    if (msg != null) {
                        Message mes = new Message();
                        mes.obj = msg;
@@ -498,7 +476,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                    br.close();
                    // 关闭Socket
                    socket.close();
//                    }
                } catch (Exception e) {
                }
            }
@@ -506,39 +483,23 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
    }
    public static String getMD5(String content) {
        try {
            MessageDigest digest = MessageDigest.getInstance("MD5");
            digest.update(content.getBytes());
            return getHashString(digest);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return null;
    }
    private static String getHashString(MessageDigest digest) {
        StringBuilder builder = new StringBuilder();
        for (byte b : digest.digest()) {
            builder.append(Integer.toHexString((b >> 4) & 0xf));
            builder.append(Integer.toHexString(b & 0xf));
        }
        return builder.toString().toLowerCase();
    }
    @Override
@@ -560,7 +521,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
                String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
                LogUtils.e(errText);
                mTvLocation.setText("定位失败");
            }
        }
    }
@@ -575,7 +535,6 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
        mLoadingDialog.show();
    }
    /**
     * 关闭进度对话框
     */
@@ -606,29 +565,63 @@ public class NewSelectCityActivity extends AppCompatActivity implements ISelectC
        } else {
            ToastUtil.showToast(getApplicationContext(), "抱歉，暂时没有找到相关城市", Toast.LENGTH_SHORT);
        }
//        return findCityList;
//        if (null != mIView) {
//            Observable.create(new ObservableOnSubscribe<List<AllCityBean>>() {
//                @Override
//                public void subscribe(@NonNull ObservableEmitter<List<AllCityBean>> e) throws Exception {
//                    e.onNext(cityModel.getSearchDataList(allCityBeanList, searchString));
//                }
//            }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<List<AllCityBean>>() {
//                @Override
//                public void accept(List<AllCityBean> list) throws Exception {
//                    LogUtils.e(list.size());
//                    if (list.size() > 0) {
//                        mIView.showSearchCityData(list);
//                    } else {
//                        mIView.showFailToast(activity.getResources().getString(R.string.evsdk_select_city_error));
//                    }
//                }
//            });
//        }
    }
    @Override
    public PublishSubject<LifeCycleEvent> getLifeSubject() {
        return null;
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
        dismissLoadingDialog();
        mTvLocation.setEnabled(true);
    }
    @Override
    public void onPermissionsDenied(int requestCode, List<String> perms) {
        dismissLoadingDialog();
        mTvLocation.setEnabled(true);
        if (SystemTypeUtil.isEmui()) {
            return;
        }
        if (requestCode == RC_Location_PERM) {
            new AlertDialogCommon(NewSelectCityActivity.this).builder()
                    .setMsg("为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?")
                    .setPositiveButton("去开启", new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {
                            SystemTypeUtil.goToPermissionManager(NewSelectCityActivity.this);
                        }
                    }).setNegativeButton("取消", new View.OnClickListener() {
                @Override
                public void onClick(View v) {
                }
            }).show();
        }
    }
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
    }
    private boolean hasLocationPermission() {
        return EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_FINE_LOCATION);
    }
    @AfterPermissionGranted(RC_Location_PERM)
    public void requestLocationPermission() {
        if (hasLocationPermission()) {
            mlocationClient.startLocation();
        } else {
            EasyPermissions.requestPermissions(
                    this,
                    "为了定位您的位置，推荐充电桩，充电桩位置路线导航需要开启位置权限，是否前往开启?",
                    RC_Location_PERM,
                    Manifest.permission.ACCESS_FINE_LOCATION);
        }
    }
}

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

@@ -525,16 +525,6 @@ public class SwitchCityActivity extends Activity implements OnScrollListener, AM
                Log.e("info", "city = " + amapLocation.getCity());
                locateProcess = 2; // 定位成功
                Log.e(TAG, "onLocationChanged: " + locateProcess);
//                if (!isNeedFresh) {
//                    return;
//                }
//                isNeedFresh = false;
//                if (amapLocation.getCity() == null) {
//                    locateProcess = 3; // 定位失败
//                    personList.setAdapter(adapter);
//                    adapter.notifyDataSetChanged();
//                    return;
//                }
                currentCity = amapLocation.getCity().substring(0,
                        amapLocation.getCity().length() - 1);
                MainMapActivity.tv_atCity.setText(currentCity);
@@ -554,39 +544,6 @@ public class SwitchCityActivity extends Activity implements OnScrollListener, AM
        }
    }
//    /**
//     * 实现实位回调监听
//     */
//    public class MyLocationListener implements BDLocationListener {
//
//        @Override
//        public void onReceiveLocation(BDLocation arg0) {
//            MainFragment.tv_switch.setText(arg0.getCity());
//            Log.e("info", "city = " + arg0.getCity());
//            if (!isNeedFresh) {
//                return;
//            }
//            isNeedFresh = false;
//            if (arg0.getCity() == null) {
//                locateProcess = 3; // 定位失败
//                personList.setAdapter(adapter);
//                adapter.notifyDataSetChanged();
//                return;
//            }
//            currentCity = arg0.getCity().substring(0,
//                    arg0.getCity().length() - 1);
//
//            locateProcess = 2; // 定位成功
//            personList.setAdapter(adapter);
//            adapter.notifyDataSetChanged();
//        }
//
//        @Override
//        public void onReceivePoi(BDLocation arg0) {
//
//        }
//    }
    private class ResultListAdapter extends BaseAdapter {
        private LayoutInflater inflater;
        private ArrayList<SwitchCity> results = new ArrayList<SwitchCity>();

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

@@ -85,16 +85,9 @@ import okhttp3.Call;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
public class WelcomeActivity extends Activity implements OnClickListener {
public class WelcomeActivity extends Activity {
    private static final String TAG = "WelcomeActivity";
    private ViewPager viewPager;
    private List<View> views;
    private ImageView img_welcome;
    private View one, two, three, four;
    private RelativeLayout rl_welcome;
    private TextView androidd;
    Bitmap bitmap;
    private ImageView enter;
    private String imgUrl = "", app_version = "";
    String img = "";
    String url = "";
@@ -102,7 +95,7 @@ public class WelcomeActivity extends Activity implements OnClickListener {
    private Timer mTimer;
    private int count = 0;
    private LinearLayout ll_1;
    public static List<AdDetail> list_ad = new ArrayList<AdDetail>();
//    public static List<AdDetail> list_ad = new ArrayList<AdDetail>();
    public static List<OperatorData> ll = new ArrayList<OperatorData>();
    public static String canCost = "";
    private static final int RC_CAMERA_PERM = 123;
@@ -287,41 +280,22 @@ public class WelcomeActivity extends Activity implements OnClickListener {
        getVersion();
        MapsInitializer.sdcardDir = MAP_FILE_PATH;
        mTimer = new Timer();
        if (ProfileManager.getInstance().getGuide(this)) {
            new Handler().postDelayed(new Runnable() {
                @Override
                public void run() {
                    eteinit("{\"fun\":\"timer\"}");
                }
            }, 1000);
        } else {
            androidd.setVisibility(View.GONE);
            ll_1.setVisibility(View.GONE);
            viewPager = (ViewPager) findViewById(R.id.viewpager);
            viewPager.setVisibility(View.VISIBLE);
            views = new ArrayList<View>();
            one = LayoutInflater.from(this).inflate(R.layout.viewpager_guide_one, null);
            two = LayoutInflater.from(this).inflate(R.layout.viewpager_guide_two, null);
            three = LayoutInflater.from(this).inflate(R.layout.viewpager_guide_three, null);
            four = LayoutInflater.from(this).inflate(R.layout.viewpager_guide_four, null);
            enter = (ImageView) four.findViewById(R.id.bt_enter);
            enter.setOnClickListener(this);
            views.add(one);
            views.add(two);
            views.add(three);
            views.add(four);
            viewPager.setAdapter(new ViewPagerAdapter(views));
            viewPager.setCurrentItem(0);
            if (!NotificationManagerCompat.from(WelcomeActivity.this).areNotificationsEnabled()) {
                openNotification();
        new Handler().postDelayed(new Runnable() {
            @Override
            public void run() {
                eteinit("{\"fun\":\"timer\"}");
            }
        }
        }, 1000);
//            if (!NotificationManagerCompat.from(WelcomeActivity.this).areNotificationsEnabled()) {
//                openNotification();
//            }
    }
    /**
     * 打开消息推送权限
     */
    private void openNotification() {
        AlertDialog.Builder builder = new AlertDialog.Builder(WelcomeActivity.this);
        builder.setTitle("\"充电桩\"想给您发送通知");
@@ -535,7 +509,7 @@ public class WelcomeActivity extends Activity implements OnClickListener {
                    long appTime1 = System.currentTimeMillis() / 1000;
                    long updatetime = appTime1 - 7200;
                    String token = String.valueOf(updatetime);
                    String replace = URLEncoder.encode(DES3.encode(token));
                    String replace = URLEncoder.encode(DES3.encode(token), "UTF-8");
                    url = MainApplication.url + "/zhannew/basic/web/index.php/ad/get?timer=" + replace;
                } catch (Exception e) {
                    e.printStackTrace();
@@ -594,24 +568,6 @@ public class WelcomeActivity extends Activity implements OnClickListener {
        JPushInterface.onPause(this);
    }
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.guideone:
                viewPager.setCurrentItem(1);
                break;
            case R.id.guidetwo:
                viewPager.setCurrentItem(2);
                break;
            case R.id.guidethree:
                viewPager.setCurrentItem(3);
            case R.id.bt_enter:
                startActivity(new Intent(this, MainMapActivity.class));
                finish();
                break;
        }
    }
    private void dealOperatorData() {
        String operator = ProfileManager.getInstance().getKeyOperator(getApplicationContext());
        String localOperators = "";
@@ -659,26 +615,4 @@ public class WelcomeActivity extends Activity implements OnClickListener {
            }
        });
    }
    public static void DeleteFile(File file) {
        if (file.exists() == false) {
            return;
        } else {
            if (file.isFile()) {
                file.delete();
                return;
            }
            if (file.isDirectory()) {
                File[] childFile = file.listFiles();
                if (childFile == null || childFile.length == 0) {
                    file.delete();
                    return;
                }
                for (File f : childFile) {
                    DeleteFile(f);
                }
                file.delete();
            }
        }
    }
}

app/src/main/java/com/electric/chargingpile/adapter/CityListAdapter.java

@@ -259,15 +259,7 @@ public class CityListAdapter extends BaseAdapter implements AMapLocationListener
            if (amapLocation != null
                    && amapLocation.getErrorCode() == 0) {
                Log.e("info", "city = " + amapLocation.getCity());
//					if (!isNeedFresh) {
//						return;
//					}
                isNeedRefresh = false;
                if (amapLocation.getCity() == null) {
//						locateProcess = 3; // 定位失败
//						personList.setAdapter(adapter);
//						adapter.notifyDataSetChanged();
                    return;
                }
                currentCity = amapLocation.getCity().substring(0,
@@ -280,10 +272,6 @@ public class CityListAdapter extends BaseAdapter implements AMapLocationListener
                mlocationClient.stopLocation();
                pbLocate.setVisibility(View.GONE);
                SelectCityActivity.locateProcess = 2;
//					locateProcess = 2; // 定位成功
//					personList.setAdapter(adapter);
//					adapter.notifyDataSetChanged();
            } else {
                String errText = "定位失败," + amapLocation.getErrorCode() + ": " + amapLocation.getErrorInfo();
                Log.e("AmapErr", errText);
@@ -298,62 +286,6 @@ public class CityListAdapter extends BaseAdapter implements AMapLocationListener
        LinearLayout llMain;
    }
//	public void initLocation() {
//		myLocationClient = new LocationClient(mContext);
//		myLocationListener=new MyLocationListener();
//		myLocationClient.registerLocationListener(myLocationListener);
//		// 设置定位参数
//		LocationClientOption option = new LocationClientOption();
//		option.setCoorType("bd09ll"); // 设置坐标类型
//		option.setScanSpan(10000); // 10分钟扫描1次
//		// 需要地址信息，设置为其他任何值（string类型，且不能为null）时，都表示无地址信息。
//		option.setAddrType("all");
//		// 设置是否返回POI的电话和地址等详细信息。默认值为false，即不返回POI的电话和地址信息。
//		option.setPoiExtraInfo(true);
//		// 设置产品线名称。强烈建议您使用自定义的产品线名称，方便我们以后为您提供更高效准确的定位服务。
//		option.setProdName("通过GPS定位我当前的位置");
//		// 禁用启用缓存定位数据
//		option.disableCache(true);
//		// 设置最多可返回的POI个数，默认值为3。由于POI查询比较耗费流量，设置最多返回的POI个数，以便节省流量。
//		option.setPoiNumber(3);
//		// 设置定位方式的优先级。
//		// 当gps可用，而且获取了定位结果时，不再发起网络请求，直接返回给用户坐标。这个选项适合希望得到准确坐标位置的用户。如果gps不可用，再发起网络请求，进行定位。
//		option.setPriority(LocationClientOption.GpsFirst);
//		myLocationClient.setLocOption(option);
//		myLocationClient.start();
//	}
//
//	public class MyLocationListener implements BDLocationListener{
//
//		@Override
//		public void onReceiveLocation(BDLocation arg0) {
//
//			isNeedRefresh=false;
//			if(arg0.getCity()==null){
//				//定位失败
//				tvLocate.setText("未定位到城市,请选择");
//				tvCurrentLocateCity.setVisibility(View.VISIBLE);
//				tvCurrentLocateCity.setText("重新选择");
//				pbLocate.setVisibility(View.GONE);
//				return;
//			}else{
//				//定位成功
//				currentCity=arg0.getCity().substring(0,arg0.getCity().length()-1);
//				tvLocate.setText("当前定位城市");
//				tvCurrentLocateCity.setVisibility(View.VISIBLE);
//				tvCurrentLocateCity.setText(currentCity);
//				myLocationClient.stop();
//				pbLocate.setVisibility(View.GONE);
//			}
//		}
//
//		@Override
//		public void onReceivePoi(BDLocation arg0) {
//
//		}
//
//	}
    private void setUpMap() {
//        //声明mLocationOption对象
//        AMapLocationClientOption mLocationOption = null;

app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java

@@ -15,7 +15,8 @@ public class ProfileManager {
    private static final String KEY_GUIDE = "key_guide";
    private static final String KEY_PRIVACY_AGREEMENT = "key_privacy_agreement";
    private static final String KEY_PRIVACY_PERMISSION = "key_privacy_permission";
    private static final String KEY_LOCATION_PERMISSION = "key_location_permission";
    private static final String KEY_FIRST_REQUEST_LOCATION_PERMISSION = "key_first_requrest_location_permission";
    private static final String KEY_STARTED_REQUEST_LOCATION_PERMISSION = "key_started_requrest_location_permission";
    private static final String KEY_TYPE = "key_type";
    private static final String KEY_USERID = "key_userid";
    private static final String KEY_USERICON = "key_usericon";
@@ -593,13 +594,20 @@ public class ProfileManager {
                false);
    }
    public void setRequestLocationPermission(Context context, boolean permission) {
        PreferenceManager.getInstance(context).putBoolean(KEY_LOCATION_PERMISSION, permission);
    public void setFirstRequestLocationPermission(Context context, boolean permission) {
        PreferenceManager.getInstance(context).putBoolean(KEY_FIRST_REQUEST_LOCATION_PERMISSION, permission);
    }
    public boolean getRequestLocationPermission(Context context) {
        return PreferenceManager.getInstance(context).getBoolean(KEY_LOCATION_PERMISSION,
                false);
    public boolean getFirstRequestLocationPermission(Context context) {
        return PreferenceManager.getInstance(context).getBoolean(KEY_FIRST_REQUEST_LOCATION_PERMISSION, false);
    }
    public void setStartedRequestLocationPermission(Context context, boolean permission) {
        PreferenceManager.getInstance(context).putBoolean(KEY_STARTED_REQUEST_LOCATION_PERMISSION, permission);
    }
    public boolean getStartedRequestLocationPermission(Context context) {
        return PreferenceManager.getInstance(context).getBoolean(KEY_STARTED_REQUEST_LOCATION_PERMISSION, false);
    }

app/src/main/java/com/electric/chargingpile/util/SystemTypeUtil.java

@@ -7,6 +7,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -50,6 +51,7 @@ public class SystemTypeUtil {
    private static String sName;
    private static String sVersion;
    // 华为
    public static boolean isEmui() {
        return check(ROM_EMUI);
@@ -172,15 +174,26 @@ public class SystemTypeUtil {
            }
        } else if (isMiui()) {
//            ToastUtil.show("我是小米");
            Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
            ComponentName componentName = new ComponentName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
            intent.setComponent(componentName);
            intent.putExtra("extra_pkgname", BuildConfig.APPLICATION_ID);
            try {
                context.startActivity(intent);
                // MIUI 7/8
                Intent localIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
                localIntent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity");
                localIntent.putExtra("extra_pkgname", context.getPackageName());
                context.startActivity(localIntent);
            } catch (Exception e) {
                e.printStackTrace();
                context.startActivity(getAppDetailSettingIntent(context));
                try {
                    // MIUI 5/6
                    Intent localIntent = new Intent("miui.intent.action.APP_PERM_EDITOR");
                    localIntent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
                    localIntent.putExtra("extra_pkgname", context.getPackageName());
                    context.startActivity(localIntent);
                } catch (Exception e1) {
                    // 否则跳转到应用详情
                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
                    Uri uri = Uri.fromParts("package", context.getPackageName(), null);
                    intent.setData(uri);
                    context.startActivity(intent);
                }
            }
        } else if (isEmui()) {
//            ToastUtil.show("我是华为");
@@ -314,7 +327,7 @@ public class SystemTypeUtil {
    /*
     * 将时间戳转换为时间
     */
    public static String stampToDate(String s){
    public static String stampToDate(String s) {
        String res;
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd");
        long lt = new Long(s);

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

@@ -22,29 +22,10 @@
            android:layout_marginTop="240dp"
            android:contentDescription="@null"
            android:src="@drawable/bg_welcome_text"
            android:visibility="visible"
            tools:visibility="gone" />
            android:visibility="visible" />
    </LinearLayout>
    <!-- logo end    -->
    <!-- 360 首发标识 start -->
    <!--<ImageView-->
    <!--android:src="@drawable/logo_360"-->
    <!--android:layout_width="wrap_content"-->
    <!--android:layout_centerHorizontal="true"-->
    <!--android:layout_alignParentBottom="true"-->
    <!--android:layout_marginBottom="80dp"-->
    <!--android:layout_height="wrap_content" />-->
    <!-- 360 首发标识 end -->
    <!-- guide start    -->
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/viewpager"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:visibility="gone" />
    <!-- guide end    -->
    <!-- 版本信息 start    -->
    <TextView
        android:id="@+id/android"