125 
            geocoderSearch = new GeocodeSearch(this);
126 
            geocoderSearch.setOnGeocodeSearchListener(this);
127 
            setUpMap();
126 
            try {
127 
                geocoderSearch = new GeocodeSearch(this);
128 
                geocoderSearch.setOnGeocodeSearchListener(this);
129 
                setUpMap();
130 
            } catch (AMapException e) {
131 
                e.printStackTrace();
132 
            }
128 133 
        }
129 134 
    }
130 135 
@ -267,23 +272,28 @@ public class RouteSelectPointActivity extends Activity implements View.OnClickLi
267 272 
    public void activate(OnLocationChangedListener onLocationChangedListener) {
268 273 
        mListener = onLocationChangedListener;
269 274 
        if (mlocationClient == null) {
270 
            mlocationClient = new AMapLocationClient(this);
271 
            mLocationOption = new AMapLocationClientOption();
272 
            //设置定位监听
273 
            mlocationClient.setLocationListener(this);
274 
            //设置为高精度定位模式
275 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
276 
            //设置定位参数
277 
            mlocationClient.setLocationOption(mLocationOption);
278 
            // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
279 
            // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
280 
            // 在定位结束后，在合适的生命周期调用onDestroy()方法
281 
            // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
282 
            // 设置是否只定位一次,默认为false
283 
            mLocationOption.setOnceLocation(true);
284 
            //设置是否强制刷新WIFI，默认为强制刷新
285 
            mLocationOption.setWifiActiveScan(false);
286 
            mlocationClient.startLocation();
275 
            try {
276 
                mlocationClient = new AMapLocationClient(this);
277 
                mLocationOption = new AMapLocationClientOption();
278 
                //设置定位监听
279 
                mlocationClient.setLocationListener(this);
280 
                //设置为高精度定位模式
281 
                mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
282 
                //设置定位参数
283 
                mlocationClient.setLocationOption(mLocationOption);
284 
                // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
285 
                // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
286 
                // 在定位结束后，在合适的生命周期调用onDestroy()方法
287 
                // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
288 
                // 设置是否只定位一次,默认为false
289 
                mLocationOption.setOnceLocation(true);
290 
                //设置是否强制刷新WIFI，默认为强制刷新
291 
                mLocationOption.setWifiActiveScan(false);
292 
                mlocationClient.startLocation();
293
294 
            } catch (Exception e) {
295 
                e.printStackTrace();
296 
            }
287 297
288 298 
        }
289 299 
    }

+ 9 - 3
app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java
查看文件 

@ -42,6 +42,7 @@ import android.widget.Toast;
42 42
43 43 
import com.amap.api.maps.AMapUtils;
44 44 
import com.amap.api.maps.model.LatLng;
45 
import com.amap.api.services.core.AMapException;
45 46 
import com.amap.api.services.core.PoiItem;
46 47 
import com.amap.api.services.core.SuggestionCity;
47 48 
import com.amap.api.services.help.Inputtips;

@ -912,9 +913,14 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
912 913 
        query.setPageSize(30);// 设置每页最多返回多少条poiitem
913 914 
        query.setPageNum(currentPage);// 设置查第一页
914 915
915 
        poiSearch = new PoiSearch(this, query);
916 
        poiSearch.setOnPoiSearchListener(this);
917 
        poiSearch.searchPOIAsyn();
916 
        try {
917 
            poiSearch = new PoiSearch(this, query);
918 
            poiSearch.setOnPoiSearchListener(this);
919 
            poiSearch.searchPOIAsyn();
920 
        } catch (AMapException e) {
921 
            e.printStackTrace();
922 
        }
923
918 924 
    }
919 925
920 926 
    private void doPointNameSearchQuery() {

+ 16 - 11
app/src/main/java/com/electric/chargingpile/activity/SelectCityActivity.java
查看文件 

@ -293,7 +293,7 @@ public class SelectCityActivity extends Activity implements AMapLocationListener
293 293 
        SQLiteDatabase recentVisitDb = cityOpenHelper.getWritableDatabase();
294 294 
        Cursor cursor = recentVisitDb.rawQuery("select * from recentcity order by date desc limit 0, 3", null);
295 295 
        while (cursor.moveToNext()) {
296 
            String recentVisitCityName = cursor.getString(cursor.getColumnIndex("name"));
296 
            @SuppressLint("Range") String recentVisitCityName = cursor.getString(cursor.getColumnIndex("name"));
297 297 
            recentCityList.add(recentVisitCityName);
298 298 
        }
299 299 
        cursor.close();
 
@ -599,27 +599,32 @@ public class SelectCityActivity extends Activity implements AMapLocationListener
599 599 
    private void setUpMap() {
600 600 
//        //声明mLocationOption对象
601 601 
//        AMapLocationClientOption mLocationOption = null;
602 
        mlocationClient = new AMapLocationClient(this);
603 
//初始化定位参数
604 
        mLocationOption = new AMapLocationClientOption();
602 
        try {
603 
            mlocationClient = new AMapLocationClient(this);
604 
            //初始化定位参数
605 
            mLocationOption = new AMapLocationClientOption();
605 606 
//设置定位监听
606 
        mlocationClient.setLocationListener(this);
607 
            mlocationClient.setLocationListener(this);
607 608 
//设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
608 
        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
609 
        mLocationOption.setOnceLocation(true);
610 
        //设置是否强制刷新WIFI，默认为强制刷新
611 
        mLocationOption.setWifiActiveScan(false);
609 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
610 
            mLocationOption.setOnceLocation(true);
611 
            //设置是否强制刷新WIFI，默认为强制刷新
612 
            mLocationOption.setWifiActiveScan(false);
612 613 
//设置定位间隔,单位毫秒,默认为2000ms
613 614 
//        mLocationOption.setInterval(2000);
614 615 
//设置定位参数
615 
        mlocationClient.setLocationOption(mLocationOption);
616 
            mlocationClient.setLocationOption(mLocationOption);
616 617 
// 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
617 618 
// 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
618 619 
// 在定位结束后，在合适的生命周期调用onDestroy()方法
619 620 
// 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
620 621
621 622 
//启动定位
622 
        mlocationClient.startLocation();
623 
            mlocationClient.startLocation();
624 
        } catch (Exception e) {
625 
            e.printStackTrace();
626 
        }
627
623 628 
    }
624 629
625 630

+ 31 - 20
app/src/main/java/com/electric/chargingpile/activity/ShareMapActivity.java
查看文件 

@ -28,6 +28,7 @@ import com.amap.api.maps.model.BitmapDescriptorFactory;
28 28 
import com.amap.api.maps.model.CameraPosition;
29 29 
import com.amap.api.maps.model.LatLng;
30 30 
import com.amap.api.maps.model.MyLocationStyle;
31 
import com.amap.api.services.core.AMapException;
31 32 
import com.amap.api.services.core.LatLonPoint;
32 33 
import com.amap.api.services.geocoder.GeocodeResult;
33 34 
import com.amap.api.services.geocoder.GeocodeSearch;
 
@ -112,9 +113,14 @@ public class ShareMapActivity extends Activity implements View.OnClickListener,
112 113 
            //获得地图的最大和最小缩放级别
113 114 
            maxZoomLevel = aMap.getMaxZoomLevel();
114 115 
            minZoomLevel = aMap.getMinZoomLevel();
115 
            geocoderSearch = new GeocodeSearch(this);
116 
            geocoderSearch.setOnGeocodeSearchListener(this);
117 
            setUpMap();
116 
            try {
117 
                geocoderSearch = new GeocodeSearch(this);
118 
                geocoderSearch.setOnGeocodeSearchListener(this);
119 
                setUpMap();
120 
            } catch (AMapException e) {
121 
                e.printStackTrace();
122 
            }
123
118 124 
        }
119 125 
    }
120 126 
@ -399,24 +405,29 @@ public class ShareMapActivity extends Activity implements View.OnClickListener,
399 405 
    public void activate(OnLocationChangedListener onLocationChangedListener) {
400 406 
        mListener = onLocationChangedListener;
401 407 
        if (mlocationClient == null) {
402 
            mlocationClient = new AMapLocationClient(this);
403 
            mLocationOption = new AMapLocationClientOption();
404 
            //设置定位监听
405 
            mlocationClient.setLocationListener(this);
406 
            //设置为高精度定位模式
407 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
408 
            //设置定位参数
409 
            mlocationClient.setLocationOption(mLocationOption);
410 
            // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
411 
            // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
412 
            // 在定位结束后，在合适的生命周期调用onDestroy()方法
413 
            // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
414 
            // 设置是否只定位一次,默认为false
415 
            mLocationOption.setOnceLocation(true);
408 
            try {
409 
                mlocationClient = new AMapLocationClient(this);
410 
                mLocationOption = new AMapLocationClientOption();
411 
                //设置定位监听
412 
                mlocationClient.setLocationListener(this);
413 
                //设置为高精度定位模式
414 
                mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
415 
                //设置定位参数
416 
                mlocationClient.setLocationOption(mLocationOption);
417 
                // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
418 
                // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
419 
                // 在定位结束后，在合适的生命周期调用onDestroy()方法
420 
                // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
421 
                // 设置是否只定位一次,默认为false
422 
                mLocationOption.setOnceLocation(true);
416 423 
//            mLocationOption.setOnceLocationLatest(true);
417 
            //设置是否强制刷新WIFI，默认为强制刷新
418 
            mLocationOption.setWifiActiveScan(false);
419 
            mlocationClient.startLocation();
424 
                //设置是否强制刷新WIFI，默认为强制刷新
425 
                mLocationOption.setWifiActiveScan(false);
426 
                mlocationClient.startLocation();
427 
            } catch (Exception e) {
428 
                e.printStackTrace();
429 
            }
430
420 431
421 432 
        }
422 433 
    }

+ 22 - 17
app/src/main/java/com/electric/chargingpile/activity/ShowBuildLocationActivity.java
查看文件 

@ -154,23 +154,28 @@ public class ShowBuildLocationActivity extends Activity implements AMap.OnCamera
154 154 
    public void activate(OnLocationChangedListener onLocationChangedListener) {
155 155 
        mListener = onLocationChangedListener;
156 156 
        if (mlocationClient == null) {
157 
            mlocationClient = new AMapLocationClient(this);
158 
            mLocationOption = new AMapLocationClientOption();
159 
            //设置定位监听
160 
            mlocationClient.setLocationListener(this);
161 
            //设置为高精度定位模式
162 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
163 
            //设置定位参数
164 
            mlocationClient.setLocationOption(mLocationOption);
165 
            // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
166 
            // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
167 
            // 在定位结束后，在合适的生命周期调用onDestroy()方法
168 
            // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
169 
            // 设置是否只定位一次,默认为false
170 
            mLocationOption.setOnceLocation(true);
171 
            //设置是否强制刷新WIFI，默认为强制刷新
172 
            mLocationOption.setWifiActiveScan(false);
173 
            mlocationClient.startLocation();
157 
            try {
158 
                mlocationClient = new AMapLocationClient(this);
159 
                mLocationOption = new AMapLocationClientOption();
160 
                //设置定位监听
161 
                mlocationClient.setLocationListener(this);
162 
                //设置为高精度定位模式
163 
                mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
164 
                //设置定位参数
165 
                mlocationClient.setLocationOption(mLocationOption);
166 
                // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
167 
                // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
168 
                // 在定位结束后，在合适的生命周期调用onDestroy()方法
169 
                // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
170 
                // 设置是否只定位一次,默认为false
171 
                mLocationOption.setOnceLocation(true);
172 
                //设置是否强制刷新WIFI，默认为强制刷新
173 
                mLocationOption.setWifiActiveScan(false);
174 
                mlocationClient.startLocation();
175 
            } catch (Exception e) {
176 
                e.printStackTrace();
177 
            }
178
174 179 
        }
175 180 
    }
176 181

+ 18 - 9
app/src/main/java/com/electric/chargingpile/activity/SimpleNaviActivity.java
查看文件 

@ -8,6 +8,7 @@ import android.util.Log;
8 8 
import android.view.Window;
9 9 
import android.view.WindowManager;
10 10
11 
import com.amap.api.maps.AMapException;
11 12 
import com.amap.api.maps.model.BitmapDescriptor;
12 13 
import com.amap.api.maps.model.BitmapDescriptorFactory;
13 14 
import com.amap.api.navi.AMapNaviViewOptions;
 
@ -24,7 +25,7 @@ import com.amap.api.navi.model.AMapLaneInfo;
24 25 
import com.amap.api.navi.model.AMapModelCross;
25 26 
import com.amap.api.navi.model.AMapNaviCameraInfo;
26 27 
import com.amap.api.navi.model.AMapNaviCross;
27 
import com.amap.api.navi.model.AMapNaviInfo;
28
28 29 
import com.amap.api.navi.model.AMapNaviLocation;
29 30 
import com.amap.api.navi.model.AMapNaviPath;
30 31 
import com.amap.api.navi.model.AMapNaviRouteNotifyData;
 
@ -33,7 +34,7 @@ import com.amap.api.navi.model.AMapServiceAreaInfo;
33 34 
import com.amap.api.navi.model.AimLessModeCongestionInfo;
34 35 
import com.amap.api.navi.model.AimLessModeStat;
35 36 
import com.amap.api.navi.model.NaviInfo;
36 
import com.autonavi.tbt.TrafficFacilityInfo;
37
37 38 
import com.electric.chargingpile.R;
38 39
39 40 
import java.util.List;
 
@ -73,7 +74,11 @@ public class SimpleNaviActivity extends Activity implements AMapNaviListener, AM
73 74 
        options.setAfterRouteAutoGray(true);
74 75 
        mAMapNaviView.setViewOptions(options);
75 76
76 
        mAMapNavi = AMapNavi.getInstance(getApplicationContext());
77 
        try {
78 
            mAMapNavi = AMapNavi.getInstance(getApplicationContext());
79 
        } catch (AMapException e) {
80 
            e.printStackTrace();
81 
        }
77 82 
        mAMapNavi.addAMapNaviListener(this);
78 83 
        mAMapNavi.setEmulatorNaviSpeed(60);
79 84 
        mAMapNavi.setUseInnerVoice(true);
 
@ -189,9 +194,6 @@ public class SimpleNaviActivity extends Activity implements AMapNaviListener, AM
189 194 
    public void onGpsOpenStatus(boolean b) {
190 195 
    }
191 196
192 
    @Override
193 
    public void onNaviInfoUpdated(AMapNaviInfo aMapNaviInfo) {
194 
    }
195 197
196 198 
    @Override
197 199 
    public void updateCameraInfo(AMapNaviCameraInfo[] aMapNaviCameraInfos) {
 
@ -215,9 +217,6 @@ public class SimpleNaviActivity extends Activity implements AMapNaviListener, AM
215 217 
        }
216 218 
    }
217 219
218 
    @Override
219 
    public void OnUpdateTrafficFacility(TrafficFacilityInfo trafficFacilityInfo) {
220 
    }
221 220
222 221 
    @Override
223 222 
    public void OnUpdateTrafficFacility(AMapNaviTrafficFacilityInfo aMapNaviTrafficFacilityInfo) {
 
@ -302,6 +301,11 @@ public class SimpleNaviActivity extends Activity implements AMapNaviListener, AM
302 301 
    }
303 302
304 303 
    @Override
304 
    public void onGpsSignalWeak(boolean b) {
305
306 
    }
307
308 
    @Override
305 309 
    public void onNaviSetting() {
306 310 
    }
307 311 
@ -346,4 +350,9 @@ public class SimpleNaviActivity extends Activity implements AMapNaviListener, AM
346 350 
    @Override
347 351 
    public void onNaviViewShowMode(int i) {
348 352 
    }
353
354 
    @Override
355 
    public void onPointerCaptureChanged(boolean hasCapture) {
356
357 
    }
349 358 
}

+ 15 - 10
app/src/main/java/com/electric/chargingpile/activity/SwitchCityActivity.java
查看文件 

@ -1310,27 +1310,32 @@ public class SwitchCityActivity extends Activity implements OnScrollListener, AM
1310 1310 
    private void setUpMap() {
1311 1311 
//        //声明mLocationOption对象
1312 1312 
//        AMapLocationClientOption mLocationOption = null;
1313 
        mlocationClient = new AMapLocationClient(this);
1314 
//初始化定位参数
1315 
        mLocationOption = new AMapLocationClientOption();
1313 
        try {
1314 
            mlocationClient = new AMapLocationClient(this);
1315 
            //初始化定位参数
1316 
            mLocationOption = new AMapLocationClientOption();
1316 1317 
//设置定位监听
1317 
        mlocationClient.setLocationListener(this);
1318 
            mlocationClient.setLocationListener(this);
1318 1319 
//设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
1319 
        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
1320 
        mLocationOption.setOnceLocation(true);
1321 
        //设置是否强制刷新WIFI，默认为强制刷新
1322 
        mLocationOption.setWifiActiveScan(false);
1320 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
1321 
            mLocationOption.setOnceLocation(true);
1322 
            //设置是否强制刷新WIFI，默认为强制刷新
1323 
            mLocationOption.setWifiActiveScan(false);
1323 1324 
//设置定位间隔,单位毫秒,默认为2000ms
1324 1325 
//        mLocationOption.setInterval(2000);
1325 1326 
//设置定位参数
1326 
        mlocationClient.setLocationOption(mLocationOption);
1327 
            mlocationClient.setLocationOption(mLocationOption);
1327 1328 
// 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
1328 1329 
// 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
1329 1330 
// 在定位结束后，在合适的生命周期调用onDestroy()方法
1330 1331 
// 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
1331 1332
1332 1333 
//启动定位
1333 
        mlocationClient.startLocation();
1334 
            mlocationClient.startLocation();
1335 
        } catch (Exception e) {
1336 
            e.printStackTrace();
1337 
        }
1338
1334 1339 
    }
1335 1340
1336 1341 
    @Override

+ 16 - 10
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java
查看文件 

@ -34,6 +34,7 @@ import android.widget.ToggleButton;
34 34
35 35 
import androidx.annotation.NonNull;
36 36
37 
import com.amap.api.services.core.AMapException;
37 38 
import com.amap.api.services.weather.LocalDayWeatherForecast;
38 39 
import com.amap.api.services.weather.LocalWeatherForecast;
39 40 
import com.amap.api.services.weather.LocalWeatherForecastResult;
 
@ -293,16 +294,21 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
293 294 
        loadDialog = new LoadingDialog(this);
294 295 
        loadDialog.setCanceledOnTouchOutside(false);
295 296 
        mquery = new WeatherSearchQuery(MainMapActivity.location_city, WeatherSearchQuery.WEATHER_TYPE_FORECAST);
296 
        mweathersearch = new WeatherSearch(this);
297 
        mweathersearch.setOnWeatherSearchListener(this);
298 
        mweathersearch.setQuery(mquery);
299 
        mweathersearch.searchWeatherAsyn(); //异步搜索
300
301 
        mquery1 = new WeatherSearchQuery(MainMapActivity.location_city, WeatherSearchQuery.WEATHER_TYPE_LIVE);
302 
        mweathersearch1 = new WeatherSearch(this);
303 
        mweathersearch1.setOnWeatherSearchListener(this);
304 
        mweathersearch1.setQuery(mquery1);
305 
        mweathersearch1.searchWeatherAsyn(); //异步搜索
297 
        try {
298 
            mweathersearch = new WeatherSearch(this);
299 
            mweathersearch.setOnWeatherSearchListener(this);
300 
            mweathersearch.setQuery(mquery);
301 
            mweathersearch.searchWeatherAsyn(); //异步搜索
302
303 
            mquery1 = new WeatherSearchQuery(MainMapActivity.location_city, WeatherSearchQuery.WEATHER_TYPE_LIVE);
304 
            mweathersearch1 = new WeatherSearch(this);
305 
            mweathersearch1.setOnWeatherSearchListener(this);
306 
            mweathersearch1.setQuery(mquery1);
307 
            mweathersearch1.searchWeatherAsyn(); //异步搜索
308 
        } catch (AMapException e) {
309 
            e.printStackTrace();
310 
        }
311
306 312 
        sv = (ObservableScrollView) findViewById(R.id.sv);
307 313 
        sv.setScrollViewListener(this);
308 314 
        iv_qiandao = (ImageView) findViewById(R.id.iv_qiandao);

+ 15 - 10
app/src/main/java/com/electric/chargingpile/adapter/CityListAdapter.java
查看文件 

@ -289,27 +289,32 @@ public class CityListAdapter extends BaseAdapter implements AMapLocationListener
289 289 
    private void setUpMap() {
290 290 
//        //声明mLocationOption对象
291 291 
//        AMapLocationClientOption mLocationOption = null;
292 
        mlocationClient = new AMapLocationClient(mActivity);
293 
//初始化定位参数
294 
        mLocationOption = new AMapLocationClientOption();
292 
        try {
293 
            mlocationClient = new AMapLocationClient(mActivity);
294 
            //初始化定位参数
295 
            mLocationOption = new AMapLocationClientOption();
295 296 
//设置定位监听
296 
        mlocationClient.setLocationListener(this);
297 
            mlocationClient.setLocationListener(this);
297 298 
//设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
298 
        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
299 
        mLocationOption.setOnceLocation(true);
300 
        //设置是否强制刷新WIFI，默认为强制刷新
301 
        mLocationOption.setWifiActiveScan(false);
299 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
300 
            mLocationOption.setOnceLocation(true);
301 
            //设置是否强制刷新WIFI，默认为强制刷新
302 
            mLocationOption.setWifiActiveScan(false);
302 303 
//设置定位间隔,单位毫秒,默认为2000ms
303 304 
//        mLocationOption.setInterval(2000);
304 305 
//设置定位参数
305 
        mlocationClient.setLocationOption(mLocationOption);
306 
            mlocationClient.setLocationOption(mLocationOption);
306 307 
// 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
307 308 
// 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
308 309 
// 在定位结束后，在合适的生命周期调用onDestroy()方法
309 310 
// 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
310 311
311 312 
//启动定位
312 
        mlocationClient.startLocation();
313 
            mlocationClient.startLocation();
314
315 
        } catch (Exception e) {
316 
            e.printStackTrace();
317 
        }
313 318 
    }
314 319
315 320

+ 39 - 35
app/src/main/java/com/electric/chargingpile/adapter/ZhuangStatusadapter.java
查看文件 

@ -242,43 +242,47 @@ public class ZhuangStatusadapter extends BaseAdapter {
242 242 
        final AMapLocationClient mlocationClient;
243 243 
        //声明mLocationOption对象
244 244 
        AMapLocationClientOption mLocationOption = null;
245 
        mlocationClient = new AMapLocationClient(activity);
246 
        //初始化定位参数
247 
        mLocationOption = new AMapLocationClientOption();
248 
        //设置定位监听
249 
        mlocationClient.setLocationListener(new AMapLocationListener() {
250 
            @Override
251 
            public void onLocationChanged(AMapLocation amapLocation) {
252 
                if (amapLocation != null) {
253 
                    if (amapLocation.getErrorCode() == 0) {
254 
                        //定位成功回调信息，设置相关消息
255 
                        amapLocation.getLocationType();//获取当前定位结果来源，如网络定位结果，详见定位类型表
256 
                        amapLocation.getLatitude();//获取纬度
257 
                        amapLocation.getLongitude();//获取经度
258 
                        amapLocation.getAccuracy();//获取精度信息
259 
                        LogUtils.e(amapLocation.getLatitude() + "--" + amapLocation.getLongitude());
260 
                        mlocationClient.stopLocation();
261 
                        sendControlParkingDownLock(amapLocation, zhuangStatus);
262 
                    } else {
263 
                        //显示错误信息ErrCode是错误码，errInfo是错误信息，详见错误码表。
264 
                        Log.e("AmapError", "location Error, ErrCode:"
265 
                                + amapLocation.getErrorCode() + ", errInfo:"
266 
                                + amapLocation.getErrorInfo());
245 
        try {
246 
            mlocationClient = new AMapLocationClient(activity);
247 
            //初始化定位参数
248 
            mLocationOption = new AMapLocationClientOption();
249 
            //设置定位监听
250 
            mlocationClient.setLocationListener(new AMapLocationListener() {
251 
                @Override
252 
                public void onLocationChanged(AMapLocation amapLocation) {
253 
                    if (amapLocation != null) {
254 
                        if (amapLocation.getErrorCode() == 0) {
255 
                            //定位成功回调信息，设置相关消息
256 
                            amapLocation.getLocationType();//获取当前定位结果来源，如网络定位结果，详见定位类型表
257 
                            amapLocation.getLatitude();//获取纬度
258 
                            amapLocation.getLongitude();//获取经度
259 
                            amapLocation.getAccuracy();//获取精度信息
260 
                            LogUtils.e(amapLocation.getLatitude() + "--" + amapLocation.getLongitude());
261 
                            mlocationClient.stopLocation();
262 
                            sendControlParkingDownLock(amapLocation, zhuangStatus);
263 
                        } else {
264 
                            //显示错误信息ErrCode是错误码，errInfo是错误信息，详见错误码表。
265 
                            Log.e("AmapError", "location Error, ErrCode:"
266 
                                    + amapLocation.getErrorCode() + ", errInfo:"
267 
                                    + amapLocation.getErrorInfo());
268 
                        }
267 269 
                    }
268 270 
                }
269 
            }
270 
        });
271 
        //设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
272 
        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
273 
        //设置定位间隔,单位毫秒,默认为2000ms//        mLocationOption.setInterval(2000);
274 
        //设置定位参数
275 
        mlocationClient.setLocationOption(mLocationOption);
276 
        // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
277 
        // 注意设置合适的定位时间的间隔（最小间隔支持为1000ms），并且在合适时间调用stopLocation()方法来取消定位请求
278 
        // 在定位结束后，在合适的生命周期调用onDestroy()方法
279 
        // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
280 
        //启动定位
281 
        mlocationClient.startLocation();
271 
            });
272 
            //设置定位模式为高精度模式，Battery_Saving为低功耗模式，Device_Sensors是仅设备模式
273 
            mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
274 
            //设置定位间隔,单位毫秒,默认为2000ms//        mLocationOption.setInterval(2000);
275 
            //设置定位参数
276 
            mlocationClient.setLocationOption(mLocationOption);
277 
            // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
278 
            // 注意设置合适的定位时间的间隔（最小间隔支持为1000ms），并且在合适时间调用stopLocation()方法来取消定位请求
279 
            // 在定位结束后，在合适的生命周期调用onDestroy()方法
280 
            // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
281 
            //启动定位
282 
            mlocationClient.startLocation();
283 
        } catch (Exception e) {
284 
            e.printStackTrace();
285 
        }
282 286 
    }
283 287
284 288 
    private void sendControlParkingDownLock(AMapLocation amapLocation, ZhuangStatus zhuangStatus) {

+ 6 - 0
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
查看文件 

@ -13,6 +13,7 @@ import android.util.Log;
13 13 
import androidx.multidex.MultiDexApplication;
14 14
15 15 
import com.alibaba.fastjson.JSONException;
16 
import com.amap.api.location.AMapLocationClient;
16 17 
import com.amap.api.maps.model.LatLng;
17 18 
import com.blankj.utilcode.util.LogUtils;
18 19 
import com.blankj.utilcode.util.Utils;

@ -199,6 +200,9 @@ public class MainApplication extends MultiDexApplication {
199 200 
        userCarIntentMode = ProfileManager.getInstance().getCarIntentModel(getApplicationContext());
200 201 
        loginRemind();
201 202 
        setFestival();
203 
        if (ProfileManager.getInstance().getPrivacyAgreement(this)) {
204 
            MainApplication.initSDK();
205 
        }
202 206 
    }
203 207
204 208 
    public void initJPush() {

@ -392,6 +396,8 @@ public class MainApplication extends MultiDexApplication {
392 396 
    }
393 397
394 398 
    public static void initSDK() {
399 
        AMapLocationClient.updatePrivacyShow(context,true,true);
400 
        AMapLocationClient.updatePrivacyAgree(context,true);
395 401 
        MobSDK.init(MainApplication.context);
396 402 
        MobSDK.submitPolicyGrantResult(true,null);
397 403 
        CrashReport.initCrashReport(MainApplication.context, "900010422", BuildConfig.DEBUG);

+ 7 - 9
app/src/main/java/com/electric/chargingpile/util/TTSController.java
查看文件 

@ -10,7 +10,7 @@ import com.amap.api.navi.model.AMapLaneInfo;
10 10 
import com.amap.api.navi.model.AMapModelCross;
11 11 
import com.amap.api.navi.model.AMapNaviCameraInfo;
12 12 
import com.amap.api.navi.model.AMapNaviCross;
13 
import com.amap.api.navi.model.AMapNaviInfo;
13
14 14 
import com.amap.api.navi.model.AMapNaviLocation;
15 15 
import com.amap.api.navi.model.AMapNaviRouteNotifyData;
16 16 
import com.amap.api.navi.model.AMapNaviTrafficFacilityInfo;
 
@ -18,7 +18,7 @@ import com.amap.api.navi.model.AMapServiceAreaInfo;
18 18 
import com.amap.api.navi.model.AimLessModeCongestionInfo;
19 19 
import com.amap.api.navi.model.AimLessModeStat;
20 20 
import com.amap.api.navi.model.NaviInfo;
21 
import com.autonavi.tbt.TrafficFacilityInfo;
21
22 22 
import com.blankj.utilcode.util.LogUtils;
23 23 
import com.electric.chargingpile.R;
24 24 
import com.iflytek.cloud.speech.SpeechConstant;
 
@ -279,11 +279,7 @@ public class TTSController implements SynthesizerListener, AMapNaviListener, AMa
279 279
280 280 
    }
281 281
282 
    @Override
283 
    public void onNaviInfoUpdated(AMapNaviInfo arg0) {
284 
        // TODO Auto-generated method stub
285 282
286 
    }
287 283
288 284 
    @Override
289 285 
    public void updateCameraInfo(AMapNaviCameraInfo[] aMapNaviCameraInfos) {
 
@ -307,10 +303,7 @@ public class TTSController implements SynthesizerListener, AMapNaviListener, AMa
307 303
308 304 
    }
309 305
310 
    @Override
311 
    public void OnUpdateTrafficFacility(TrafficFacilityInfo trafficFacilityInfo) {
312 306
313 
    }
314 307
315 308 
    @Override
316 309 
    public void OnUpdateTrafficFacility(AMapNaviTrafficFacilityInfo aMapNaviTrafficFacilityInfo) {
 
@ -401,6 +394,11 @@ public class TTSController implements SynthesizerListener, AMapNaviListener, AMa
401 394 
    }
402 395
403 396 
    @Override
397 
    public void onGpsSignalWeak(boolean b) {
398
399 
    }
400
401 
    @Override
404 402 
    public void onNaviSetting() {
405 403 
    }
406 404

二进制
app/src/main/jniLibs/arm64-v8a/libAMapSDK_MAP_v6_9_2.so
查看文件


二进制
app/src/main/jniLibs/arm64-v8a/libAMapSDK_NAVI_v6_9_0.so
查看文件


二进制
app/src/main/jniLibs/arm64-v8a/libAMapSDK_NAVI_v8_1_0.so
查看文件


二进制
app/src/main/jniLibs/arm64-v8a/libneonui_shared.so
查看文件


二进制
app/src/main/jniLibs/arm64-v8a/libneonuijni_public.so
查看文件


二进制
app/src/main/jniLibs/armeabi-v7a/libAMapSDK_MAP_v6_9_2.so
查看文件


二进制
app/src/main/jniLibs/armeabi-v7a/libAMapSDK_NAVI_v6_9_0.so
查看文件


二进制
app/src/main/jniLibs/armeabi-v7a/libAMapSDK_NAVI_v8_1_0.so
查看文件


二进制
app/src/main/jniLibs/armeabi-v7a/libneonui_shared.so
查看文件


二进制
app/src/main/jniLibs/armeabi-v7a/libneonuijni_public.so
查看文件


二进制
app/src/main/jniLibs/armeabi/libAMapSDK_MAP_v6_9_2.so
查看文件


二进制
app/src/main/jniLibs/armeabi/libAMapSDK_NAVI_v6_9_0.so
查看文件


二进制
app/src/main/jniLibs/armeabi/libAMapSDK_NAVI_v8_1_0.so
查看文件


二进制
app/src/main/jniLibs/armeabi/libneonui_shared.so
查看文件


二进制
app/src/main/jniLibs/armeabi/libneonuijni_public.so
查看文件


完成接入特瓦特 · 07604be699 - Gogs: Go Git Service
Home Explore Help
Register Sign In
dudu
/
cdzApp
Watch 2
Star 1
Fork 0
Code Issues 0 Pull Requests 0 Commits 512 Releases 18 Wiki
Browse Source

完成接入特瓦特

hy 2 years ago
parent
cbf660eac9
commit
07604be699
16 changed files with 423 additions and 56 deletions
Split View Show Diff Stats
  1. 2 1
      app/src/main/AndroidManifest.xml
  2. 233 5
      app/src/main/java/com/electric/chargingpile/activity/ChargingPileActivity.java
  3. 47 5
      app/src/main/java/com/electric/chargingpile/activity/ChargingStatusActivity.java
  4. 11 5
      app/src/main/java/com/electric/chargingpile/activity/ConfirmOrderActivity.java
  5. 3 3
      app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
  6. 18 7
      app/src/main/java/com/electric/chargingpile/activity/OderDetailsActivity.java
  7. 3 1
      app/src/main/java/com/electric/chargingpile/application/MainApplication.java
  8. 1 0
      app/src/main/java/com/electric/chargingpile/constant/ChargingConstants.java
  9. 9 0
      app/src/main/java/com/electric/chargingpile/data/ChargingBean.java
  10. 1 2
      app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java
  11. 1 0
      app/src/main/java/com/electric/chargingpile/view/UpdateDialog.java
  12. 1 1
      app/src/main/res/layout/activity_charging_pile.xml
  13. 34 24
      app/src/main/res/layout/activity_charging_status.xml
  14. 28 0
      app/src/main/res/layout/activity_oder_details.xml
  15. 29 0
      app/src/main/res/layout/activity_submit_orders.xml
  16. 2 2
      app/src/main/res/layout/layout_update_dialog.xml

+ 2 - 1
app/src/main/AndroidManifest.xml
View File 

@ -3,7 +3,7 @@
3 3 
    xmlns:tools="http://schemas.android.com/tools"
4 4 
    package="com.electric.chargingpile"
5 5 
    android:versionCode="103"
6 
    android:versionName="3.5.17">
6 
    android:versionName="3.5.18">
7 7
8 8 
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9 9 
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
 
@ -74,6 +74,7 @@
74 74 
    <!--适配Android R包可见性 结束-->
75 75
76 76 
    <application
77 
        android:extractNativeLibs="true"
77 78 
        android:name=".application.MainApplication"
78 79 
        android:allowBackup="true"
79 80 
        android:icon="@drawable/icon626"

+ 233 - 5
app/src/main/java/com/electric/chargingpile/activity/ChargingPileActivity.java
View File 

@ -1,11 +1,14 @@
1 1 
package com.electric.chargingpile.activity;
2 2
3 
import android.Manifest;
3 4 
import android.annotation.SuppressLint;
4 5 
import android.content.Context;
5 6 
import android.content.Intent;
7 
import android.net.Uri;
6 8 
import android.os.Bundle;
7 9 
import android.text.Editable;
8 10 
import android.text.TextWatcher;
11 
import android.view.View;
9 12 
import android.widget.EditText;
10 13 
import android.widget.LinearLayout;
11 14 
import android.widget.TextView;
 
@ -16,18 +19,37 @@ import androidx.appcompat.app.AppCompatActivity;
16 19 
import androidx.recyclerview.widget.GridLayoutManager;
17 20 
import androidx.recyclerview.widget.RecyclerView;
18 21
22 
import com.blankj.utilcode.util.EmptyUtils;
23 
import com.blankj.utilcode.util.LogUtils;
19 24 
import com.electric.chargingpile.R;
20 25 
import com.electric.chargingpile.adapter.LicensePlateHistoryAdapter;
26 
import com.electric.chargingpile.application.MainApplication;
27 
import com.electric.chargingpile.constant.UrlConstants;
21 28 
import com.electric.chargingpile.manager.ProfileManager;
22 29 
import com.electric.chargingpile.util.BarColorUtil;
30 
import com.electric.chargingpile.util.JsonUtils;
31 
import com.electric.chargingpile.util.LoadingDialog;
32 
import com.electric.chargingpile.util.ToastUtil;
33 
import com.electric.chargingpile.view.AlertDialogTwo;
23 34 
import com.electric.chargingpile.view.ConfirmChargingDialog;
24 35 
import com.google.zxing.client.android.constant.ChargingConstants;
25 36 
import com.king.keyboard.KingKeyboard;
37 
import com.tencent.bugly.crashreport.CrashReport;
38 
import com.zhy.http.okhttp.OkHttpUtils;
39 
import com.zhy.http.okhttp.callback.StringCallback;
40
41 
import java.net.URLEncoder;
42 
import java.util.List;
43
44 
import okhttp3.Call;
45 
import pub.devrel.easypermissions.AfterPermissionGranted;
46 
import pub.devrel.easypermissions.AppSettingsDialog;
47 
import pub.devrel.easypermissions.EasyPermissions;
26 48
27 49 
/**
28 50 
 *  特瓦特充电 详情页
29 51 
 * */
30 
public class ChargingPileActivity extends AppCompatActivity {
52 
public class ChargingPileActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
31 53
32 54 
    private KingKeyboard kingKeyboard;
33 55 
    private int beforeCount = 0;
 
@ -40,7 +62,12 @@ public class ChargingPileActivity extends AppCompatActivity {
40 62 
    private LinearLayout mKeyboardParent;
41 63 
    private String pileId;
42 64 
    private TextView tvCoding;
65 
    private AlertDialogTwo alertDialog;
66 
    private LoadingDialog loadingDialog;
43 67
68 
    private static final int RC_TELL_PERM = 124;
69 
    private static final int startInterface = 2;
70 
    private static final String numType = "2";
44 71
45 72 
    @Override
46 73 
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
 
@ -60,8 +87,11 @@ public class ChargingPileActivity extends AppCompatActivity {
60 87 
        rootView = findViewById(R.id.rootView);
61 88 
        rvHistory = findViewById(R.id.rvHistory);
62 89 
        tvCoding = findViewById(R.id.tvCoding);
63
90 
        alertDialog = new AlertDialogTwo(this);
91 
        loadingDialog = new LoadingDialog(this);
92 
        loadingDialog.setCanceledOnTouchOutside(false);
64 93 
        tvCoding.setText("充电桩编码："+pileId);
94
65 95 
    }
66 96
67 97 
    private void initOnClick() {
 
@ -75,8 +105,9 @@ public class ChargingPileActivity extends AppCompatActivity {
75 105 
        mAdapter.setList();
76 106
77 107 
        mDialog.setOnClickListener(v->{
78 
            //todo 进入充电流程
79 
            ProfileManager.getInstance().setLicensePlateHistory(mDialog.getLicensePlate());
108 
            String licensePlate = mDialog.getLicensePlate();
109 
            startCharging(licensePlate);
110 
            ProfileManager.getInstance().setLicensePlateHistory(licensePlate);
80 111 
            mAdapter.setList();
81 112 
        });
82 113 
@ -86,6 +117,10 @@ public class ChargingPileActivity extends AppCompatActivity {
86 117 
                Toast.makeText(this, "请输入车牌号", Toast.LENGTH_SHORT).show();
87 118 
                return;
88 119 
            }
120 
            if (str.length() < 7){
121 
                Toast.makeText(this, "请输入正确车牌号", Toast.LENGTH_SHORT).show();
122 
                return;
123 
            }
89 124
90 125 
            mDialog.setLicensePlate(str);
91 126 
            mDialog.show(getSupportFragmentManager());
 
@ -93,14 +128,17 @@ public class ChargingPileActivity extends AppCompatActivity {
93 128 
        });
94 129
95 130 
        rootView.setOnClickListener(v->{
96 
            kingKeyboard.hide();
131 
            if (kingKeyboard.isShow())
132 
                kingKeyboard.hide();
97 133 
        });
98 134 
    }
99 135
100 136 
    private void registerKingKeyboard(){
101 137 
        kingKeyboard = new KingKeyboard(this,mKeyboardParent);
102 138 
        //然后将EditText注册到KingKeyboard即可
139 
        kingKeyboard.setBringToFront(true);
103 140 
        kingKeyboard.register(editText, KingKeyboard.KeyboardType.LICENSE_PLATE_PROVINCE);
141
104 142 
        editText.addTextChangedListener(new TextWatcher() {
105 143 
            @Override
106 144 
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@ -141,6 +179,196 @@ public class ChargingPileActivity extends AppCompatActivity {
141 179 
        super.onDestroy();
142 180 
        kingKeyboard.onDestroy();
143 181 
    }
182 
    private void startCharging(String result) {
183 
        LogUtils.e(result);
184 
        loadingDialog.show();
185 
        OkHttpUtils.get().url(UrlConstants.START_CHARGING_URL)
186 
                .addParams(com.electric.chargingpile.constant.ChargingConstants.FLAG, numType)
187 
                .addParams(com.electric.chargingpile.constant.ChargingConstants.URL, URLEncoder.encode(pileId))
188 
                .addParams(com.electric.chargingpile.constant.ChargingConstants.USERID, MainApplication.userId)
189 
                .addParams(com.electric.chargingpile.constant.ChargingConstants.PWD, MainApplication.userPassword)
190 
                .addParams(com.electric.chargingpile.constant.ChargingConstants.PLATE_NUM, result)
191 
                .addParams("type", "1")
192 
                .build().connTimeOut(30000).readTimeOut(30000).execute(new StringCallback() {
193 
            @Override
194 
            public void onError(Call call, Exception e) {
195 
                ToastUtil.showToast(getApplicationContext(), "网络异常，请检查您的网络连接", Toast.LENGTH_SHORT);
196 
                CrashReport.postCatchedException(e);
197 
            }
198
199 
            @Override
200 
            public void onResponse(String response) {
201 
                LogUtils.e(response);
202 
                if (EmptyUtils.isNotEmpty(response)) {
203 
                    dismissDialog();
204 
                    handlingOperations(response, startInterface);
205 
                }
206
207 
            }
208 
        });
209 
    }
210
211 
    private void handlingOperations(String response, int interfaceType) {
212 
        String rtnCode = com.google.zxing.client.android.JsonUtils.getKeyResult(response, "rtnCode");
213 
        String rtnMsg = com.google.zxing.client.android.JsonUtils.getKeyResult(response, "rtnMsg");
214 
        switch (rtnCode) {
215 
            case "01":
216 
                if (interfaceType == startInterface) {
217 
                    String data = JsonUtils.getKeyResult(response, "data");
218 
                    String orderid = JsonUtils.getKeyResult(data, "orderId");
219 
                    Intent intent = new Intent(getApplicationContext(), TLDLoadingActivity.class);
220 
                    intent.putExtra(com.electric.chargingpile.constant.ChargingConstants.ORDERID, orderid);
221 
                    startActivity(intent);
222 
                    finish();
223 
                }
224 
                break;
225 
            case "304":
226 
                alertDialog.builder()
227 
                        .setMsg(rtnMsg)
228 
                        .setPositiveButton("去充值", new View.OnClickListener() {
229 
                            @Override
230 
                            public void onClick(View v) {
231 
                                Intent intent = new Intent(getApplicationContext(), AccountRechargeActivity.class);
232 
                                startActivity(intent);
233 
                            }
234 
                        })
235 
//                        .setNegativeButton("开通免密支付", new View.OnClickListener() {
236 
//                    @Override
237 
//                    public void onClick(View v) {
238 
//                        Intent intent = new Intent(getApplicationContext(),NonSecretSeettingActivity.class);
239 
//                        Uri uri = Uri.parse("chongdianzhuang://");
240 
//                        intent.setData(uri);
241 
//                        startActivity(intent);
242 
//                    }
243 
//                })
244 
                        .show();
245 
                break;
246 
            case "305":
247 
                alertDialog.builder()
248 
                        .setMsg(rtnMsg)
249 
                        .setPositiveButton("联系客服", new View.OnClickListener() {
250 
                            @Override
251 
                            public void onClick(View v) {
252 
                                tellTask();
253 
                            }
254 
                        }).setNegativeButton("取消", new View.OnClickListener() {
255 
                    @Override
256 
                    public void onClick(View v) {
257 
                    }
258 
                }).show();
259 
                break;
260 
            case "309":
261 
                alertDialog.builder()
262 
                        .setMsg(rtnMsg)
263 
                        .setPositiveButton("联系客服", new View.OnClickListener() {
264 
                            @Override
265 
                            public void onClick(View v) {
266 
                                tellTask();
267 
                            }
268 
                        }).setNegativeButton("取消", new View.OnClickListener() {
269 
                    @Override
270 
                    public void onClick(View v) {
271 
                    }
272 
                }).show();
273 
                break;
274 
            case "306":
275 
                //跳转到充电详情界面
276 
                String data306 = JsonUtils.getKeyResult(response, "data");
277 
                String orderid = JsonUtils.getKeyResult(data306, "orderId");
278 
                Intent intent306 = new Intent(getApplicationContext(), ChargingStatusActivity.class);
279 
                intent306.putExtra(com.electric.chargingpile.constant.ChargingConstants.ORDERID, orderid);
280 
                startActivity(intent306);
281 
                finish();
282 
                break;
283 
            case "307":
284 
                alertDialog.builder()
285 
                        .setMsg(rtnMsg)
286 
                        .setPositiveButton("去充值", new View.OnClickListener() {
287 
                            @Override
288 
                            public void onClick(View v) {
289 
                                Intent intent = new Intent(getApplicationContext(), AccountRechargeActivity.class);
290 
                                startActivity(intent);
291 
                            }
292 
                        }).show();
293 
                break;
294 
            case "311":
295 
                alertDialog.builder()
296 
                        .setMsg(rtnMsg)
297 
                        .setPositiveButton("开通免密支付", new View.OnClickListener() {
298 
                            @Override
299 
                            public void onClick(View v) {
300 
                                Intent intent = new Intent(getApplicationContext(), NonSecretSeettingActivity.class);
301 
                                Uri uri = Uri.parse("chongdianzhuang://");
302 
                                intent.setData(uri);
303 
                                startActivity(intent);
304 
                            }
305 
                        }).show();
306 
                break;
307 
            case "1800":
308 
                String data1800 = JsonUtils.getKeyResult(response, "data");
309 
                String pileId = JsonUtils.getKeyResult(data1800, "pileId");
310 
                Intent intent1800 = new Intent(getApplicationContext(), SelectPileActivity.class);
311 
                intent1800.putExtra(com.electric.chargingpile.constant.ChargingConstants.ORDERID, pileId);
312 
                startActivity(intent1800);
313 
                break;
314
315 
            case "1000":
316 
                String data1000 = JsonUtils.getKeyResult(response, "data");
317 
                String pileIds = JsonUtils.getKeyResult(data1000, "pileId");
318 
                ChargingPileActivity.actionStart(this,pileIds);
319 
                break;
320 
            default:
321 
                ToastUtil.showToast(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT);
322 
                break;
323 
        }
324 
    }
325
326 
    @AfterPermissionGranted(RC_TELL_PERM)
327 
    public void tellTask() {
328 
        if (hasTellPermission()) {
329 
            // Have permission, do the thing!
330 
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
331 
            String telNum = "4008810405";
332 
            Intent intent = new Intent();
333 
            intent.setAction("android.intent.action.CALL");
334 
            intent.addCategory("android.intent.category.DEFAULT");
335 
            intent.setData(Uri.parse("tel:" + telNum));
336 
            ChargingPileActivity.this.startActivity(intent);
337
338 
        } else {
339 
            LogUtils.e("@@@@@@@");
340 
            // Ask for one permission
341 
            EasyPermissions.requestPermissions(
342 
                    this,
343 
                    "该功能需要开启拨号权限，是否前往开启？",
344 
                    RC_TELL_PERM,
345 
                    Manifest.permission.CALL_PHONE);
346 
        }
347 
    }
348
349 
    private boolean hasTellPermission() {
350 
        return EasyPermissions.hasPermissions(this, Manifest.permission.CALL_PHONE);
351 
    }
352
353 
    @Override
354 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
355
356 
    }
357
358 
    @Override
359 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
360 
        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
361 
            new AppSettingsDialog.Builder(ChargingPileActivity.this).build().show();
362 
        }
363 
    }
364
365 
    private void dismissDialog() {
366 
        if (this != null && !isFinishing()) {
367 
            if (loadingDialog.isShowing()) {
368 
                loadingDialog.dismiss();
369 
            }
370 
        }
371 
    }
144 372
145 373
146 374 
    public static void actionStart(Context context,String pileId){

+ 47 - 5
app/src/main/java/com/electric/chargingpile/activity/ChargingStatusActivity.java
View File 

@ -51,6 +51,7 @@ import com.tencent.bugly.crashreport.CrashReport;
51 51 
import com.umeng.analytics.MobclickAgent;
52 52 
import com.zhy.http.okhttp.OkHttpUtils;
53 53 
import com.zhy.http.okhttp.callback.StringCallback;
54 
import com.zhy.http.okhttp.request.RequestCall;
54 55
55 56 
import java.net.URLEncoder;
56 57 
import java.text.SimpleDateFormat;
 
@ -70,7 +71,7 @@ import okhttp3.Call;
70 71 
public class ChargingStatusActivity extends Activity implements View.OnClickListener {
71 72 
    private static final String TAG = "ChargingStatusActivity";
72 73 
    private ImageView iv_charging, iv_back, iv_activity;
73 
    private TextView tv_charging, tv_stop, tv_activity;
74 
    private TextView tv_charging, tv_stop;
74 75 
    private TextView tv_chongdianliang, tv_zhuang_num, tv_jindu, tv_dianya, tv_dianliu, tv_time, tv_cost, tv_help;
75 76 
    String result, stubGroupId;
76 77 
    CircleProgressBar bar;
 
@ -116,6 +117,7 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
116 117 
    private LinearLayout layoutCarCertificate;
117 118 
    private ImageView imgA,imgV,imgProgrees;
118 119 
    private TextView certifiedCarOwner;
120 
    private TextView tv_overage;
119 121
120 122
121 123 
    @Override
 
@ -138,6 +140,7 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
138 140 
        // start timer task
139 141 
        setTimerTask();
140 142 
        msgStatus();
143 
        getUserIntegral();
141 144 
    }
142 145
143 146 
@ -158,8 +161,6 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
158 161 
                    String icon = JsonUtils.getKeyResult(response, "icon");
159 162 
                    String url = JsonUtils.getKeyResult(response, "url");
160 163 
                    if (status.equals("1")) {
161 
//                        tv_activity.setVisibility(View.VISIBLE);
162 
//                        tv_activity.setText(message);
163 164 
                        Picasso.with(MainApplication.context)
164 165 
                                .load(icon)
165 166 
                                .into(iv_activity);
 
@ -205,8 +206,6 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
205 206 
        iv_activity = (ImageView) findViewById(R.id.iv_activity);
206 207 
        iv_back.setOnClickListener(this);
207 208 
        iv_activity.setOnClickListener(this);
208 
        tv_activity = (TextView) findViewById(R.id.tv_activity);
209 
        tv_activity.setOnClickListener(this);
210 209
211 210 
        tv_help = findViewById(R.id.tv_help);
212 211 
        tv_help.setOnClickListener(this);
 
@ -226,6 +225,7 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
226 225 
        tv_dianya = (TextView) findViewById(R.id.tv_dianya);
227 226 
        tv_dianliu = (TextView) findViewById(R.id.tv_dianliu);
228 227 
        tv_time = (TextView) findViewById(R.id.tv_time);
228 
        tv_overage = (TextView) findViewById(R.id.tv_overage);
229 229 
        layoutCarCertificate = findViewById(R.id.layoutCarCertificate);
230 230
231 231 
        imgA = findViewById(R.id.imgA);
 
@ -649,6 +649,48 @@ public class ChargingStatusActivity extends Activity implements View.OnClickList
649 649 
        }
650 650 
    }
651 651
652 
    private void getUserIntegral() {
653 
        String replace = null;
654 
        try {
655 
            long appTime1 = System.currentTimeMillis() / 1000;
656 
            long updatetime = appTime1 - MainMapActivity.cha - 3;
657 
            String token = String.valueOf(updatetime);
658 
            String encode_token = DES3.encode(token);
659 
            replace = URLEncoder.encode(encode_token);
660 
        } catch (Exception e) {
661 
            e.printStackTrace();
662 
        }
663 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/member/get-score?id=" + MainApplication.userId +
664 
                "&phone=" + MainApplication.userPhone + "&password=" + URLEncoder.encode(MainApplication.userPassword) + "&token=" + replace;
665 
        RequestCall call = OkHttpUtils.get().url(url).build();
666 
        call.execute(new StringCallback() {
667 
            @Override
668 
            public void onError(Call call, Exception e) {
669
670 
            }
671
672 
            @Override
673 
            public void onResponse(String response) {
674 
//                Log.e(TAG, "onResponse:getUserIntegral= "+response );
675 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
676 
                if (null != rtnCode && rtnCode.equals("01")) {
677 
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
678 
                    String money = JsonUtils.getKeyResult(rtnMsg, "money");
679 
                    if (null != money && !money.equals("")) {
680 
                        tv_overage.setText(money);
681 
                    }
682 
                } else {
683 
                    ProfileManager.getInstance().setUsername(getApplicationContext(), "");
684 
                    MainApplication.userPhone = "";
685 
                    Toast.makeText(getApplicationContext(), "登录已失效，请重新登录", Toast.LENGTH_SHORT).show();
686 
                    startActivity(new Intent(getApplicationContext(), LoginActivity.class));
687 
                }
688 
            }
689 
        });
690
691 
    }
692
693
652 694 
    private void chargingChangeStatus(String third_id) {
653 695 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/kazuma/offline";
654 696 
        OkHttpUtils.get().url(url)

+ 11 - 5
app/src/main/java/com/electric/chargingpile/activity/ConfirmOrderActivity.java
View File 

@ -59,6 +59,8 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
59 59 
    private LoadingDialog mDialog;
60 60 
    private int try_count=0;
61 61 
    private int delayedSettlementCount=0;
62 
    private RelativeLayout rl_number_plate;
63 
    private TextView tv_num_plate;
62 64
63 65 
    @Override
64 66 
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
 
@ -172,6 +174,8 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
172 174 
        rl_end_info=findViewById(R.id.rl_end_info);
173 175
174 176 
        tv_gocomment = findViewById(R.id.tv_gocomment);
177 
        rl_number_plate = findViewById(R.id.rl_number_plate);
178 
        tv_num_plate = findViewById(R.id.tv_num_plate);
175 179
176 180 
        iv_back.setOnClickListener(this);
177 181 
        layoutRed.setOnClickListener(this);
 
@ -193,12 +197,14 @@ public class ConfirmOrderActivity extends AppCompatActivity implements View.OnCl
193 197 
            tv_charging_time.setText(mChargingBean.getTimeCharge());
194 198 
            tv_charging_liang.setText(mChargingBean.getPower()+"度");
195 199
196 
           /* if (TextUtils.isEmpty(mChargingBean.getEndInfo())) {
197 
                rl_end_info.setVisibility(View.GONE);
200 
            String plate_number = mChargingBean.getPlate_number();
201
202 
            if (plate_number == null || plate_number.equals("")){
203 
                rl_number_plate.setVisibility(View.GONE);
198 204 
            }else{
199 
                tv_tishi.setText(mChargingBean.getEndInfo());
200 
                rl_end_info.setVisibility(View.VISIBLE);
201 
            }*/
205 
                rl_number_plate.setVisibility(View.VISIBLE);
206 
                tv_num_plate.setText(plate_number);
207 
            }
202 208 
        }
203 209 
    }
204 210

+ 3 - 3
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
View File 

@ -498,7 +498,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
498 498 
                                if (key.length - 1 > 2) {
499 499 
                                    permissionTask();
500 500 
                                } else {
501 
                                    dialogup();
501 
//                                    dialogup();
502 
                                    permissionTask();
502 503 
                                }
503 504 
                            }
504 505 
@ -3430,6 +3431,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
3430 3431 
    private void dialogup_other() {
3431 3432 
        int code = Integer.parseInt(now_versionCode);
3432 3433 
        if (code - getVersionCode(getApplication()) > 0) {
3434 
//           if(true){
3433 3435 
            alterDialog = new AlertDialogUpdate(MainMapActivity.this);
3434 3436
3435 3437 
            alterDialog.builder()
 
@ -3457,8 +3459,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
3457 3459 
        }
3458 3460 
    }
3459 3461 
    private void downLoadFile() {
3460 
        String url = "http://cdz.evcharge.cc/app/app.apk";
3461
3462 3462 
        showProgressWindow();
3463 3463 
        ToastUtil.showToast(getApplicationContext(), "正在下载中", Toast.LENGTH_SHORT);
3464 3464 
        OkHttpUtils.get().url("http://cdz.evcharge.cc/app/app.apk").build()

+ 18 - 7
app/src/main/java/com/electric/chargingpile/activity/OderDetailsActivity.java
View File 

@ -67,6 +67,9 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
67 67 
    private LinearLayout red_paper_bag_bottom;
68 68 
    private RelativeLayout rl_end_info;
69 69 
    private String name;
70 
    private TextView tv_num_plate;
71 
    private RelativeLayout rl_number_plate;
72 
    private String plate_number;
70 73
71 74 
    @Override
72 75 
    protected void onCreate(Bundle savedInstanceState) {
 
@ -89,6 +92,10 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
89 92 
        tv_pinglun = (TextView) findViewById(R.id.tv_pinglun);
90 93 
        tv_gocomment = (TextView) findViewById(R.id.tv_gocomment);
91 94 
        red_paper_bag_bottom = findViewById(R.id.red_paper_bag_bottom);
95
96 
        rl_number_plate = findViewById(R.id.rl_number_plate);
97 
        tv_num_plate = findViewById(R.id.tv_num_plate);
98
92 99 
        iv = (ImageView) findViewById(R.id.iv);
93 100
94 101 
        tv_gocomment.setOnClickListener(this);
 
@ -120,21 +127,23 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
120 127
121 128 
        tv_tishi = (TextView) findViewById(R.id.tv_tishi);
122 129 
        rl_end_info = (RelativeLayout) findViewById(R.id.rl_end_info);
123 
//        if (ChargingStatusActivity.no == 0){
124 
//            tv_tishi.setVisibility(View.GONE);
125 
//        }else{
130
126 131 
        if (end_info.equals("")) {
127 132 
            rl_end_info.setVisibility(View.GONE);
128 133 
        } else {
129 134 
            rl_end_info.setVisibility(View.VISIBLE);
130 135 
            tv_tishi.setText(end_info);
131 136 
        }
132 
//            tv_tishi.setVisibility(View.VISIBLE);
133 
//            tv_tishi.setText(end_info);
134 
//        }
137
138 
        if (plate_number == null || plate_number.equals("")){
139 
            rl_number_plate.setVisibility(View.GONE);
140 
        }else{
141 
            rl_number_plate.setVisibility(View.VISIBLE);
142 
            tv_num_plate.setText(plate_number);
143 
        }
144
135 145
136 146 
        if (EmptyUtils.isNotEmpty(activeUrl)) {
137 
//            ToastUtil.showToast(getApplicationContext(),activeUrl,Toast.LENGTH_LONG);
138 147 
            new Handler().postDelayed(new Runnable() {
139 148 
                @Override
140 149 
                public void run() {
 
@ -165,6 +174,8 @@ public class OderDetailsActivity extends Activity implements View.OnClickListene
165 174 
        zhan_idc = chargingBean.getZhanID();
166 175 
        order_id = chargingBean.getOrderId();
167 176 
        out_order_id = chargingBean.getOutOrderId();
177 
        plate_number = chargingBean.getPlate_number();
178
168 179 
//        settlement = getIntent().getStringExtra("settlement");
169 180 
        name = chargingBean.getZhanname();
170 181 
        serviceCharge = chargingBean.getServiceMoney();

+ 3 - 1
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
View File 

@ -52,7 +52,6 @@ import org.jetbrains.annotations.NotNull;
52 52
53 53 
import java.io.BufferedReader;
54 54 
import java.io.BufferedWriter;
55 
import java.io.File;
56 55 
import java.io.IOException;
57 56 
import java.io.InputStreamReader;
58 57 
import java.io.OutputStreamWriter;

@ -187,6 +186,9 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
187 186 
        initImageLoader(getApplicationContext());
188 187
189 188 
        try {
189 
            if (BuildConfig.DEBUG){
190 
                OkHttpUtils.getInstance().debug("hyc",true);
191 
            }
190 192 
            OkHttpUtils.getInstance().setCertificates(getAssets().open("ca.crt"));
191 193 
            OkHttpUtils.getInstance().setCertificates();
192 194 
        } catch (IOException e) {

+ 1 - 0
app/src/main/java/com/electric/chargingpile/constant/ChargingConstants.java
View File 

@ -6,5 +6,6 @@ public interface ChargingConstants {
6 6 
    String URL = "url";
7 7 
    String FLAG = "flag";
8 8 
    String ORDERID = "orderid";
9 
    String PLATE_NUM = "plate_num";
9 10 
    String TYPE = "type";
10 11 
}

+ 9 - 0
app/src/main/java/com/electric/chargingpile/data/ChargingBean.java
View File 

@ -44,6 +44,15 @@ public class ChargingBean implements Serializable {
44 44 
    private String serviceMoney;
45 45 
    private String totalMoney;
46 46 
    private String redMoney;
47 
    private String plate_number;
48
49 
    public String getPlate_number() {
50 
        return plate_number;
51 
    }
52
53 
    public void setPlate_number(String plate_number) {
54 
        this.plate_number = plate_number;
55 
    }
47 56
48 57 
    public String getOrderId() {
49 58 
        return orderId;

+ 1 - 2
app/src/main/java/com/electric/chargingpile/manager/ProfileManager.java
View File 

@ -742,11 +742,10 @@ public class ProfileManager {
742 742
743 743 
    public void setLicensePlateHistory(String str) {
744 744 
        ArrayList<String> list = getLicensePlateHistory();
745 
        list.remove(str); //除重
745 746 
        if (list.size() >= 6){
746 747 
            list.remove(list.size() -1 );
747 748 
        }
748
749 
        list.remove(str);
750 749 
        list.add(0,str);
751 750 
        PreferenceManager.getInstance(MainApplication.context).putString(KEY_LICENSE_PLATE_HISTORY, new Gson().toJson(list));
752 751 
    }

+ 1 - 0
app/src/main/java/com/electric/chargingpile/view/UpdateDialog.java
View File 

@ -2,6 +2,7 @@ package com.electric.chargingpile.view;
2 2
3 3 
import android.app.Dialog;
4 4 
import android.content.Context;
5 
import android.util.Log;
5 6 
import android.view.Display;
6 7 
import android.view.LayoutInflater;
7 8 
import android.view.View;

+ 1 - 1
app/src/main/res/layout/activity_charging_pile.xml
View File 

@ -159,7 +159,7 @@
159 159 
    </androidx.constraintlayout.widget.ConstraintLayout>
160 160
161 161 
    <View
162 
        android:layout_width="1dp"
162 
        android:layout_width="match_parent"
163 163 
        android:layout_height="0dp"
164 164 
        android:layout_weight="1" />
165 165

+ 34 - 24
app/src/main/res/layout/activity_charging_status.xml
View File 

@ -231,16 +231,6 @@
231 231 
                    app:wlv_waveColor="#3fffffff"
232 232 
                    app:wlv_wave_background_Color="#00ffffff" />
233 233
234
235 
                <!--<com.loonggg.circleprogressbarlibrary.view.CircleProgressBar-->
236 
                <!--android:id="@+id/pb"-->
237 
                <!--android:layout_width="143dp"-->
238 
                <!--android:layout_height="143dp"-->
239 
                <!--android:visibility="gone"-->
240 
                <!--android:layout_centerInParent="true"-->
241 
                <!--loonggg:bgProgressBarColor="#efefef"-->
242 
                <!--loonggg:circleStrokeWidth="5dp" />-->
243
244 234 
                <LinearLayout
245 235 
                    android:layout_width="wrap_content"
246 236 
                    android:layout_height="wrap_content"
 
@ -347,10 +337,43 @@
347 337
348 338 
                </RelativeLayout>
349 339
340 
                <View
341 
                    android:layout_width="0.5dp"
342 
                    android:layout_height="match_parent"
343 
                    android:background="@color/ui_6d" />
344
345 
                <RelativeLayout
346 
                    android:layout_width="0dp"
347 
                    android:layout_height="match_parent"
348 
                    android:layout_weight="1">
349
350 
                    <TextView
351 
                        android:layout_width="wrap_content"
352 
                        android:layout_height="wrap_content"
353 
                        android:layout_alignParentTop="true"
354 
                        android:layout_centerHorizontal="true"
355 
                        android:text="账户余额"
356 
                        android:textColor="@color/ui_68"
357 
                        android:textSize="12sp" />
358
359 
                    <TextView
360 
                        android:id="@+id/tv_overage"
361 
                        android:layout_width="wrap_content"
362 
                        android:layout_height="wrap_content"
363 
                        android:layout_alignParentBottom="true"
364 
                        android:layout_centerHorizontal="true"
365 
                        android:layout_centerVertical="true"
366 
                        android:text="--"
367 
                        android:textColor="@color/ui_62"
368 
                        android:textSize="21sp" />
369
370 
                </RelativeLayout>
371
350 372 
            </LinearLayout>
351 373
352 374
353 375 
            <RelativeLayout
376 
                android:paddingBottom="30dp"
354 377 
                android:layout_width="match_parent"
355 378 
                android:layout_height="match_parent">
356 379 
                <LinearLayout
 
@ -385,6 +408,7 @@
385 408
386 409 
                </LinearLayout>
387 410 
                <ImageView
411 
                    tools:src="@drawable/ic_charging_pile"
388 412 
                    tools:visibility="visible"
389 413 
                    android:id="@+id/iv_activity"
390 414 
                    android:layout_width="wrap_content"
 
@ -396,20 +420,6 @@
396 420 
                    android:visibility="gone" />
397 421
398 422 
                <TextView
399 
                    tools:visibility="visible"
400 
                    android:id="@+id/tv_activity"
401 
                    android:layout_width="wrap_content"
402 
                    android:layout_height="wrap_content"
403 
                    android:layout_below="@+id/tv_stop"
404 
                    android:layout_centerHorizontal="true"
405 
                    android:paddingTop="20dp"
406 
                    android:paddingBottom="15dp"
407 
                    android:text=""
408 
                    android:textColor="#ffa900"
409 
                    android:textSize="14sp"
410 
                    android:visibility="visible" />
411
412 
                <TextView
413 423 
                    android:layout_centerHorizontal="true"
414 424 
                    android:textStyle="bold"
415 425 
                    android:id="@+id/tv_stop"

+ 28 - 0
app/src/main/res/layout/activity_oder_details.xml
View File 

@ -273,6 +273,34 @@
273 273 
                android:textSize="14sp" />
274 274
275 275 
        </RelativeLayout>
276 
        <RelativeLayout
277 
            tools:visibility="visible"
278 
            android:visibility="gone"
279 
            android:id="@+id/rl_number_plate"
280 
            android:layout_width="match_parent"
281 
            android:layout_height="wrap_content"
282 
            android:layout_marginTop="13dp">
283
284 
            <TextView
285 
                android:layout_width="wrap_content"
286 
                android:layout_height="wrap_content"
287 
                android:layout_alignParentLeft="true"
288 
                android:layout_marginLeft="15dp"
289 
                android:text="充电车辆"
290 
                android:textColor="@color/ui_68"
291 
                android:textSize="14sp" />
292
293 
            <TextView
294 
                android:id="@+id/tv_num_plate"
295 
                android:layout_width="wrap_content"
296 
                android:layout_height="wrap_content"
297 
                android:layout_alignParentRight="true"
298 
                android:layout_marginRight="15dp"
299 
                tools:text="--"
300 
                android:textColor="@color/ui_68"
301 
                android:textSize="14sp" />
302
303 
        </RelativeLayout>
276 304
277 305
278 306 
    </LinearLayout>

+ 29 - 0
app/src/main/res/layout/activity_submit_orders.xml
View File 

@ -282,6 +282,35 @@
282 282 
                android:textSize="14sp" />
283 283
284 284 
        </RelativeLayout>
285
286 
        <RelativeLayout
287 
            tools:visibility="visible"
288 
            android:visibility="gone"
289 
            android:id="@+id/rl_number_plate"
290 
            android:layout_width="match_parent"
291 
            android:layout_height="wrap_content"
292 
            android:layout_marginTop="13dp">
293
294 
            <TextView
295 
                android:layout_width="wrap_content"
296 
                android:layout_height="wrap_content"
297 
                android:layout_alignParentLeft="true"
298 
                android:layout_marginLeft="15dp"
299 
                android:text="充电车辆"
300 
                android:textColor="@color/ui_68"
301 
                android:textSize="14sp" />
302
303 
            <TextView
304 
                android:id="@+id/tv_num_plate"
305 
                android:layout_width="wrap_content"
306 
                android:layout_height="wrap_content"
307 
                android:layout_alignParentRight="true"
308 
                android:layout_marginRight="15dp"
309 
                tools:text="--"
310 
                android:textColor="@color/ui_68"
311 
                android:textSize="14sp" />
312
313 
        </RelativeLayout>
285 314 
    </LinearLayout>
286 315
287 316 
    <TextView

+ 2 - 2
app/src/main/res/layout/layout_update_dialog.xml
View File 

@ -21,9 +21,9 @@
21 21 
    <com.qmuiteam.qmui.widget.QMUIProgressBar
22 22 
        android:id="@+id/qMUIProgressBar"
23 23 
        android:layout_width="match_parent"
24 
        android:layout_height="16dp"
24 
        android:layout_height="12dp"
25 25 
        android:textColor="@color/lvse"
26 
        android:textSize="16sp"
26 
        android:textSize="12sp"
27 27 
        android:layout_marginBottom="20dp"
28 28 
        android:layout_marginLeft="16dp"
29 29 
        android:layout_marginRight="16dp"