hy 1 gadu atpakaļ
vecāks
revīzija
27f525e6ea

+ 2 - 2
app/src/main/AndroidManifest.xml

@ -2,8 +2,8 @@
2 2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    xmlns:tools="http://schemas.android.com/tools"
4 4
    package="com.electric.chargingpile"
5
    android:versionCode="107"
6
    android:versionName="3.5.21">
5
    android:versionCode="109"
6
    android:versionName="3.5.23">
7 7
8 8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9 9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

+ 4 - 0
app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateActivity.java

@ -601,6 +601,10 @@ public class CarOwnerCertificateActivity extends AppCompatActivity implements Vi
601 601
            ToastUtil.showToast(this, "请输入注册日期", Toast.LENGTH_SHORT);
602 602
            return;
603 603
        }
604
        if (TextUtils.isEmpty(identification_code.getText().toString().trim())) {
605
            ToastUtil.showToast(this, "请输入车辆识别代号", Toast.LENGTH_SHORT);
606
            return;
607
        }
604 608
605 609
606 610
        insertDialog.setMessage("数据提交中");

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

@ -109,6 +109,7 @@ import com.electric.chargingpile.cluster.RegionItem;
109 109
import com.electric.chargingpile.constant.BaseConstants;
110 110
import com.electric.chargingpile.constant.UrlConstants;
111 111
import com.electric.chargingpile.data.Adin;
112
import com.electric.chargingpile.data.CarOwnerCertificateBean;
112 113
import com.electric.chargingpile.data.ChargingShareBean;
113 114
import com.electric.chargingpile.data.City;
114 115
import com.electric.chargingpile.data.DataRefresh;
@ -119,6 +120,7 @@ import com.electric.chargingpile.data.UpdateZhanDataBean;
119 120
import com.electric.chargingpile.data.Zhan;
120 121
import com.electric.chargingpile.data.ZhanDB;
121 122
import com.electric.chargingpile.data.zhan_list;
123
import com.electric.chargingpile.entity.CarSeriesEntity;
122 124
import com.electric.chargingpile.gen.DaoMaster;
123 125
import com.electric.chargingpile.gen.DaoSession;
124 126
import com.electric.chargingpile.gen.zhan_listDao;
@ -141,6 +143,7 @@ import com.electric.chargingpile.util.ToastUtil;
141 143
import com.electric.chargingpile.util.Util;
142 144
import com.electric.chargingpile.util.ZhanDBHelper;
143 145
import com.electric.chargingpile.view.AlertDialogCommon;
146
import com.electric.chargingpile.view.AlertDialogTwo;
144 147
import com.electric.chargingpile.view.AlertDialogUpdate;
145 148
import com.electric.chargingpile.view.LocationPermissionsDialog;
146 149
import com.electric.chargingpile.view.NotRegisterDialog;
@ -270,7 +273,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
270 273
    private Marker search_marker;
271 274
    public static Marker recommend_marker_one, recommend_marker_two, recommend_marker_three;
272 275
    private double bd_lon, bd_lat, bd_jing, bd_wei;
273
    private LoadingDialog loadingDialog;
276
274 277
    Context context;
275 278
    public static boolean moveRefresh = true;
276 279
    public static LinearLayout ll_map_control;
@ -2449,7 +2452,12 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
2449 2452
                }
2450 2453
                break;
2451 2454
            case R.id.second_hand_car:
2452
                CarOwnerCertificateActivity.actionStart(this);
2455
                if (!MainApplication.isLogin()) {
2456
                    Toast.makeText(getApplication(), "请先登录", Toast.LENGTH_SHORT).show();
2457
                    startActivity(new Intent(getApplication(), LoginActivity.class));
2458
                } else {
2459
                    getCarOwnerCertificateList("certificate");
2460
                }
2453 2461
                break;
2454 2462
            case R.id.iv_roadCondition:
2455 2463
                MobclickAgent.onEvent(getApplicationContext(), "0113");
@ -5965,6 +5973,67 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
5965 5973
                });
5966 5974
    }
5967 5975
5976
    private void getCarOwnerCertificateList(String from) {
5977
        dialog.show();
5978
        long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
5979
        String token = null;
5980
        try {
5981
            token = DES3.encode(String.valueOf(tokenTime));
5982
            token = URLEncoder.encode(token, "UTF-8");
5983
        } catch (Exception e) {
5984
            e.printStackTrace();
5985
        }
5986
5987
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId + "&order=1" + "&token=" + token;
5988
        Log.e(TAG, "getCarOwnerCertificateList: "+url);
5989
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
5990
            @Override
5991
            public void onError(Call call, Exception e) {
5992
                e.printStackTrace();
5993
                dialog.dismiss();
5994
                Toast.makeText(getApplicationContext(), e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
5995
            }
5996
5997
            @Override
5998
            public void onResponse(String response) {
5999
                dialog.dismiss();
6000
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
6001
                if ("01".equals(rtnCode)) {
6002
                    String data = JsonUtils.getKeyResult(response, "data");
6003
                    List<CarOwnerCertificateBean> list =new ArrayList<>();
6004
                    try{
6005
                        list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
6006
                    }catch (com.alibaba.fastjson.JSONException e){
6007
6008
                    }
6009
                    if ("certificate".equals(from)) {
6010
                        if (list.size() == 0) {
6011
                            CarOwnerCertificateActivity.actionStart(MainMapActivity.this);
6012
                        } else {
6013
                            boolean isType=false ;
6014
                            for (int i = 0; i < list.size(); i++) {
6015
                                if (list.get(i).getStatus()!= 2){ //不等于2 则表示为认证车型
6016
                                    isType=true;
6017
                                }
6018
                            }
6019
                            if (isType){
6020
                                Intent intent = new Intent(getApplication(), CarOwnerCertificateListActivity.class);
6021
                                intent.putExtra("data", data);
6022
                                startActivity(intent);
6023
                            }else{
6024
                                CarOwnerCertificateActivity.actionStart(MainMapActivity.this);
6025
                            }
6026
                        }
6027
                    }
6028
                } else {
6029
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
6030
                    Toast.makeText(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT).show();
6031
                }
6032
            }
6033
        });
6034
    }
6035
6036
5968 6037
    private void switchRecommend() {
5969 6038
        OkHttpUtils.get().url(MainApplication.url + "/zhannew/basic/web/index.php/zhangonggao/switchindex").build().connTimeOut(3000).readTimeOut(3000)
5970 6039
                .execute(new StringCallback() {