CodeCow/GoGoGo
1
0
Fork 0
mirror of https://github.com/ZCShou/GoGoGo.git synced 2026-06-05 21:00:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
ZCShou 2020-09-07 10:11:30 +08:00
parent a4fd80edd1
commit 1311229039
3 changed files with 61 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release.apk
View File

Binary file not shown.

24
app/src/main/java/com/zcshou/gogogo/MainActivity.java
View File

@ -193,8 +193,8 @@ public class MainActivity extends AppCompatActivity
e.printStackTrace();
}
Log.d("PROGRESS", "onCreate");
log.debug("PROGRESS: onCreate");
Log.d("MainActivity", "onCreate");
log.debug("MainActivity: onCreate");
//sqlite相关
try {
@ -577,7 +577,6 @@ public class MainActivity extends AppCompatActivity
*/
public void onMapClick(LatLng point) {
curMapLatLng = point;
// DisplayToast("BD09\n[纬度:" + point.latitude + "]\n[经度:" + point.longitude + "]");
//百度坐标系转wgs坐标系
transformCoordinate(String.valueOf(point.longitude), String.valueOf(point.latitude));
markSelectedPosition();
@ -587,7 +586,6 @@ public class MainActivity extends AppCompatActivity
*/
public boolean onMapPoiClick(MapPoi poi) {
curMapLatLng = poi.getPosition();
// DisplayToast("BD09\n[维度:" + poi.getPosition().latitude + "]\n[经度:" + poi.getPosition().longitude + "]");
//百度坐标系转wgs坐标系
transformCoordinate(String.valueOf(poi.getPosition().longitude), String.valueOf(poi.getPosition().latitude));
markSelectedPosition();
@ -601,7 +599,6 @@ public class MainActivity extends AppCompatActivity
*/
public void onMapLongClick(LatLng point) {
curMapLatLng = point;
// DisplayToast("BD09\n[维度:" + point.latitude + "]\n[经度:" + point.longitude + "]");
//百度坐标系转wgs坐标系
transformCoordinate(String.valueOf(point.longitude), String.valueOf(point.latitude));
markSelectedPosition();
@ -614,7 +611,6 @@ public class MainActivity extends AppCompatActivity
*/
public void onMapDoubleClick(LatLng point) {
curMapLatLng = point;
// DisplayToast("BD09\n[维度:" + point.latitude + "]\n[经度:" + point.longitude + "]");
//百度坐标系转wgs坐标系
transformCoordinate(String.valueOf(point.longitude), String.valueOf(point.latitude));
markSelectedPosition();
@ -688,7 +684,7 @@ public class MainActivity extends AppCompatActivity
//标定选择的位置
private void markSelectedPosition() {
Log.d("DEBUG", "markSelectedPosition");
log.debug("DEBUG: markSelectedPosition");
log.debug("markSelectedPosition");
if (curMapLatLng != null) {
MarkerOptions ooA = new MarkerOptions().position(curMapLatLng).icon(bdA);
@ -1442,16 +1438,16 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onPause() {
Log.d("PROGRESS", "onPause");
log.debug("PROGRESS: onPause");
Log.d("MainActivity", "onPause");
log.debug("MainActivity: onPause");
mMapView.onPause();
super.onPause();
}
@Override
protected void onResume() {
Log.d("PROGRESS", "onPause");
log.debug("PROGRESS: onPause");
Log.d("MainActivity", "onPause");
log.debug("MainActivity: onPause");
mMapView.onResume();
super.onResume();
//为系统的方向传感器注册监听器
@ -1460,8 +1456,8 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onStop() {
Log.d("PROGRESS", "onStop");
log.debug("PROGRESS: onStop");
Log.d("MainActivity", "onStop");
log.debug("MainActivity: onStop");
//取消注册传感器监听
mSensorManager.unregisterListener(this);
super.onStop();
@ -1469,7 +1465,7 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onDestroy() {
Log.d("PROGRESS", "onDestroy");
Log.d("MainActivity", "onDestroy");
if (isMockServStart) {
Intent mockLocServiceIntent = new Intent(MainActivity.this, GoGoGoService.class);

108
app/src/main/java/com/zcshou/service/GoGoGoService.java
View File

@ -51,7 +51,6 @@ public class GoGoGoService extends Service {
double mSpeed;
// log debug
private final String TAG = "GoGoGoService";
private static final Logger log = Logger.getLogger(GoGoGoService.class);
@Nullable
@ -65,8 +64,8 @@ public class GoGoGoService extends Service {
public void onCreate() {
LogUtil.configLog();
Log.d(TAG, "onCreate");
log.debug(TAG + ": onCreate");
Log.d("GoGoGoService", "onCreate");
log.debug("onCreate");
super.onCreate();
@ -108,8 +107,8 @@ public class GoGoGoService extends Service {
}
} catch (InterruptedException e) {
e.printStackTrace();
Log.d(TAG, "handleMessage error");
log.debug(TAG + ": handleMessage error");
Log.d("GoGoGoService", "handleMessage error");
log.debug("handleMessage error");
Thread.currentThread().interrupt();
}
}
@ -123,8 +122,8 @@ public class GoGoGoService extends Service {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.d(TAG, "onStartCommand");
log.debug(TAG + ": onStartCommand");
Log.d("GoGoGoService", "onStartCommand");
log.debug("onStartCommand");
String channelId = "channel_01";
String name = "channel_name";
@ -133,7 +132,7 @@ public class GoGoGoService extends Service {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel mChannel = new NotificationChannel(channelId, name, NotificationManager.IMPORTANCE_LOW);
Log.i(TAG, mChannel.toString());
Log.i("GoGoGoService", mChannel.toString());
if (notificationManager != null) {
notificationManager.createNotificationChannel(mChannel);
@ -159,8 +158,8 @@ public class GoGoGoService extends Service {
// get location info from mainActivity
curLatLng = intent.getStringExtra("CurLatLng");
Log.d(TAG, "LatLng from Main is " + curLatLng);
log.debug(TAG + ": LatLng from Main is " + curLatLng);
Log.d("GoGoGoService", "LatLng from Main is " + curLatLng);
log.debug("LatLng from Main is " + curLatLng);
//start to refresh location
isStop = false;
@ -209,8 +208,8 @@ public class GoGoGoService extends Service {
@Override
public void onDestroy() {
Log.d(TAG, "onDestroy");
log.debug(TAG + ": onDestroy");
Log.d("GoGoGoService", "onDestroy");
log.debug("onDestroy");
isStop = true;
@ -256,9 +255,6 @@ public class GoGoGoService extends Service {
//添加网络定位
private void setNetworkLocation() {
Log.d(TAG, "setNetworkLocation: " + curLatLng);
log.debug(TAG + ": setNetworkLocation: " + curLatLng);
String[] latLngStr = curLatLng.split("&");
LatLng latLng = new LatLng(Double.parseDouble(latLngStr[1]), Double.parseDouble(latLngStr[0]));
@ -267,16 +263,14 @@ public class GoGoGoService extends Service {
try {
locationManager.setTestProviderLocation(providerStr, generateLocation(latLng));
} catch (Exception e) {
Log.d(TAG, "setNetworkLocation error");
log.debug(TAG + ": setNetworkLocation error");
Log.d("GoGoGoService", "setNetworkLocation error");
log.debug("setNetworkLocation error");
e.printStackTrace();
}
}
//set gps location
private void setGPSLocation() {
Log.d(TAG, "setGPSLocation: " + curLatLng);
log.debug(TAG + ": setGPSLocation: " + curLatLng);
String[] latLngStr = curLatLng.split("&");
LatLng latLng = new LatLng(Double.parseDouble(latLngStr[1]), Double.parseDouble(latLngStr[0]));
String providerStr = LocationManager.GPS_PROVIDER;
@ -284,8 +278,8 @@ public class GoGoGoService extends Service {
try {
locationManager.setTestProviderLocation(providerStr, generateLocation(latLng));
} catch (Exception e) {
Log.d(TAG, "setGPSLocation error");
log.debug(TAG + ": setGPSLocation error");
Log.d("GoGoGoService", "setGPSLocation error");
log.debug("setGPSLocation error");
e.printStackTrace();
}
}
@ -294,17 +288,17 @@ public class GoGoGoService extends Service {
private void rmNetworkTestProvider() {
try {
if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
Log.d(TAG, "now remove NetworkProvider");
log.debug(TAG + ": now remove NetworkProvider");
Log.d("GoGoGoService", "now remove NetworkProvider");
log.debug("now remove NetworkProvider");
locationManager.removeTestProvider(LocationManager.NETWORK_PROVIDER);
} else {
Log.d(TAG, "NetworkProvider is not enabled");
log.debug(TAG + ": NetworkProvider is not enabled");
Log.d("GoGoGoService", "NetworkProvider is not enabled");
log.debug("NetworkProvider is not enabled");
}
} catch (Exception e) {
e.printStackTrace();
Log.d(TAG, "rmNetworkProvider error");
log.debug(TAG + ": rmNetworkProvider error");
Log.d("GoGoGoService", "rmNetworkProvider error");
log.debug("rmNetworkProvider error");
}
}
@ -314,12 +308,12 @@ public class GoGoGoService extends Service {
locationManager.addTestProvider(LocationManager.NETWORK_PROVIDER, true, false,
false, false, false, false,
false, Criteria.POWER_HIGH, Criteria.ACCURACY_FINE);
Log.d(TAG, "addTestProvider[NETWORK_PROVIDER] success");
log.debug(TAG + ": addTestProvider[NETWORK_PROVIDER] success");
Log.d("GoGoGoService", "addTestProvider[NETWORK_PROVIDER] success");
log.debug("addTestProvider[NETWORK_PROVIDER] success");
} catch (SecurityException e) {
e.printStackTrace();
Log.d(TAG, "addTestProvider[NETWORK_PROVIDER] error");
log.debug(TAG + ": addTestProvider[NETWORK_PROVIDER] error");
Log.d("GoGoGoService", "addTestProvider[NETWORK_PROVIDER] error");
log.debug("addTestProvider[NETWORK_PROVIDER] error");
}
if (!locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
@ -327,8 +321,8 @@ public class GoGoGoService extends Service {
locationManager.setTestProviderEnabled(LocationManager.NETWORK_PROVIDER, true);
} catch (Exception e) {
e.printStackTrace();
Log.d(TAG, "setTestProviderEnabled[NETWORK_PROVIDER] error");
log.debug(TAG + ": setTestProviderEnabled[NETWORK_PROVIDER] error");
Log.d("GoGoGoService", "setTestProviderEnabled[NETWORK_PROVIDER] error");
log.debug("setTestProviderEnabled[NETWORK_PROVIDER] error");
}
}
@ -342,42 +336,42 @@ public class GoGoGoService extends Service {
private void rmGPSTestProvider() {
try {
if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
Log.d(TAG, "now remove GPSProvider");
log.debug(TAG + ": now remove GPSProvider");
Log.d("GoGoGoService", "now remove GPSProvider");
log.debug("now remove GPSProvider");
locationManager.removeTestProvider(LocationManager.GPS_PROVIDER);
} else {
Log.d(TAG, "GPSProvider is not enabled");
log.debug(TAG + ": GPSProvider is not enabled");
Log.d("GoGoGoService", "GPSProvider is not enabled");
log.debug("GPSProvider is not enabled");
}
} catch (Exception e) {
e.printStackTrace();
Log.d(TAG, "rmGPSProvider error");
log.debug(TAG + ": rmGPSProvider error");
Log.d("GoGoGoService", "rmGPSProvider error");
log.debug("rmGPSProvider error");
}
}
private void setGPSTestProvider() {
if (!locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER)) {
locationManager.setTestProviderEnabled(LocationManager.PASSIVE_PROVIDER, false);
Log.d(TAG, "Disable passive provider");
log.debug(TAG + ": Disable passive provider");
Log.d("GoGoGoService", "Disable passive provider");
log.debug("Disable passive provider");
}
if (!locationManager.isProviderEnabled("fused") && Build.VERSION.SDK_INT >= 29) {
locationManager.setTestProviderEnabled("fused", false);
Log.d(TAG, "Disable fused provider");
log.debug(TAG + ": Disable fused provider");
Log.d("GoGoGoService", "Disable fused provider");
log.debug("Disable fused provider");
}
try {
locationManager.addTestProvider(LocationManager.GPS_PROVIDER, false, true, true,
false, true, true, true, Criteria.POWER_HIGH, Criteria.ACCURACY_HIGH);
Log.d(TAG, "addTestProvider[GPS_PROVIDER] success");
log.debug(TAG + ": addTestProvider[GPS_PROVIDER] success");
Log.d("GoGoGoService", "addTestProvider[GPS_PROVIDER] success");
log.debug("addTestProvider[GPS_PROVIDER] success");
} catch (Exception e) {
e.printStackTrace();
Log.d(TAG, "addTestProvider[GPS_PROVIDER] error");
log.debug(TAG + ": addTestProvider[GPS_PROVIDER] error");
Log.d("GoGoGoService", "addTestProvider[GPS_PROVIDER] error");
log.debug("addTestProvider[GPS_PROVIDER] error");
}
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
@ -385,8 +379,8 @@ public class GoGoGoService extends Service {
locationManager.setTestProviderEnabled(LocationManager.GPS_PROVIDER, true);
} catch (Exception e) {
e.printStackTrace();
Log.d(TAG, "setTestProviderEnabled[GPS_PROVIDER] error");
log.debug(TAG + ": setTestProviderEnabled[GPS_PROVIDER] error");
Log.d("GoGoGoService", "setTestProviderEnabled[GPS_PROVIDER] error");
log.debug("setTestProviderEnabled[GPS_PROVIDER] error");
}
}
@ -400,24 +394,24 @@ public class GoGoGoService extends Service {
if (!locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER)) {
try {
locationManager.setTestProviderEnabled(LocationManager.PASSIVE_PROVIDER, false);
Log.d(TAG, "Disable passive provider");
log.debug(TAG + ": Disable passive provider");
Log.d("GoGoGoService", "Disable passive provider");
log.debug("Disable passive provider");
} catch(Exception e) {
e.printStackTrace();
Log.d(TAG, "Disable passive provider error");
log.debug(TAG + ": Disable passive provider error");
Log.d("GoGoGoService", "Disable passive provider error");
log.debug("Disable passive provider error");
}
}
if (!locationManager.isProviderEnabled("fused") && Build.VERSION.SDK_INT >= 29) {
try {
locationManager.setTestProviderEnabled("fused", false);
Log.d(TAG, "Disable fused provider");
log.debug(TAG + ": Disable fused provider");
Log.d("GoGoGoService", "Disable fused provider");
log.debug("Disable fused provider");
} catch(Exception e) {
e.printStackTrace();
Log.d(TAG, "Disable fused provider error");
log.debug(TAG + ": Disable fused provider error");
Log.d("GoGoGoService", "Disable fused provider error");
log.debug("Disable fused provider error");
}
}
}