|
@@ -24,6 +24,7 @@ import com.common.library.cache.Cache;
|
|
|
import com.ynstkz.shitu.android.R;
|
|
|
import com.ynstkz.shitu.android.base.TitleBarActivity;
|
|
|
import com.ynstkz.shitu.android.bean.LocationDataBean;
|
|
|
+import com.ynstkz.shitu.android.common.Constants;
|
|
|
import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
|
|
|
import com.ynstkz.shitu.android.event.LocationChangedEvent;
|
|
|
import com.ynstkz.shitu.android.event.LogoutEvent;
|
|
@@ -207,12 +208,19 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
|
|
|
if (amapLocation.getErrorCode() == 0) {
|
|
|
if(!isLocationSuccess){
|
|
|
LocationDataBean locationDataBean = new LocationDataBean();
|
|
|
- locationDataBean.setCity(amapLocation.getDistrict());
|
|
|
- locationDataBean.setLatitude(amapLocation.getLatitude());
|
|
|
- locationDataBean.setLongitude(amapLocation.getLongitude());
|
|
|
+ if(amapLocation.getProvince().indexOf("云南") > 0) {
|
|
|
+ locationDataBean.setCity(amapLocation.getDistrict());
|
|
|
+ locationDataBean.setLatitude(amapLocation.getLatitude());
|
|
|
+ locationDataBean.setLongitude(amapLocation.getLongitude());
|
|
|
+ } else {
|
|
|
+ locationDataBean.setCity(Constants.KM_CITY);
|
|
|
+ locationDataBean.setLatitude(Constants.KM_LATITUDE);
|
|
|
+ locationDataBean.setLongitude(Constants.KM_LONGITUDE);
|
|
|
+ }
|
|
|
EventBus.getDefault().post(new LocationChangedEvent(locationDataBean));
|
|
|
}
|
|
|
SharedPreferencesUtils.setLocation(amapLocation.getDistrict());
|
|
|
+ isLocationSuccess = true;
|
|
|
} else {
|
|
|
//显示错误信息ErrCode是错误码,errInfo是错误信息,详见错误码表。
|
|
|
EventBus.getDefault().post(new LocationChangedEvent(null));
|
|
@@ -233,10 +241,10 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
|
|
|
EventBus.getDefault().post(new LocationChangedEvent(locationDataBean));
|
|
|
isLocationSuccess = true;
|
|
|
}
|
|
|
- }
|
|
|
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
|
- == PackageManager.PERMISSION_GRANTED) {
|
|
|
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
|
|
|
+ == PackageManager.PERMISSION_GRANTED) {
|
|
|
mlocationClient.startLocation();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|