Commit b28eace5 authored by linfeng's avatar linfeng

优化

parent c028738c
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default" flavorDimensions "default"
versionCode 143 versionCode 142
versionName "1.4.3" versionName "1.4.2"
multiDexEnabled true multiDexEnabled true
ndk { ndk {
......
...@@ -907,11 +907,13 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -907,11 +907,13 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
if (!TextUtils.isEmpty(getCityName)) { if (!TextUtils.isEmpty(getCityName)) {
buffer.append("(").append(getCityName).append(")"); buffer.append("(").append(getCityName).append(")");
} }
if (headTvGetShop != null) {
if (buffer.length() > 0) { if (buffer.length() > 0) {
headTvGetShop.setText(buffer.toString()); headTvGetShop.setText(buffer.toString());
} else { } else {
headTvGetShop.setText(""); headTvGetShop.setText("");
} }
}
getLatitude = data.getDoubleExtra("latitude", 0); getLatitude = data.getDoubleExtra("latitude", 0);
getLongitude = data.getDoubleExtra("longitude", 0); getLongitude = data.getDoubleExtra("longitude", 0);
setRequestData(type, requestData, getLatitude, getLongitude); setRequestData(type, requestData, getLatitude, getLongitude);
...@@ -927,20 +929,26 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -927,20 +929,26 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
if (!TextUtils.isEmpty(outCityName)) { if (!TextUtils.isEmpty(outCityName)) {
buffer.append("(").append(outCityName).append(")"); buffer.append("(").append(outCityName).append(")");
} }
if (headTvOutShop != null) {
if (buffer.length() > 0) { if (buffer.length() > 0) {
headTvOutShop.setText(buffer.toString()); headTvOutShop.setText(buffer.toString());
} else { } else {
headTvOutShop.setText(""); headTvOutShop.setText("");
} }
}
outLatitude = data.getDoubleExtra("latitude", 0); outLatitude = data.getDoubleExtra("latitude", 0);
outLongitude = data.getDoubleExtra("longitude", 0); outLongitude = data.getDoubleExtra("longitude", 0);
setRequestData(type, requestData, outLatitude, outLongitude); setRequestData(type, requestData, outLatitude, outLongitude);
} else if (type == 3) { } else if (type == 3) {
if (tvRvCity != null) {
tvRvCity.setText(""); tvRvCity.setText("");
}
vVTourCityId = data.getIntExtra("id", 0); vVTourCityId = data.getIntExtra("id", 0);
setRequestData(type, requestData, 0, 0); setRequestData(type, requestData, 0, 0);
} else if (type == 4) { } else if (type == 4) {
if (travelCityText != null) {
travelCityText.setText(""); travelCityText.setText("");
}
mTravelCityId = data.getIntExtra("id", 0); mTravelCityId = data.getIntExtra("id", 0);
getCityId = outCityId = mTravelCityId; getCityId = outCityId = mTravelCityId;
getCityName = outCityName = requestData; getCityName = outCityName = requestData;
...@@ -991,13 +999,17 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa ...@@ -991,13 +999,17 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
case 3: case 3:
rvTourLatitude = lat; rvTourLatitude = lat;
rvTourLongitude = lon; rvTourLongitude = lon;
if (tvRvCity != null) {
tvRvCity.setText(data); tvRvCity.setText(data);
}
break; break;
case 4: case 4:
travelCityText.setText(data); travelCityText.setText(data);
// headTvGetCity.setText(data); // headTvGetCity.setText(data);
// headTvOutCity.setText(data); // headTvOutCity.setText(data);
if (tvRvCity != null) {
tvRvCity.setText(data); tvRvCity.setText(data);
}
getShopList(false); getShopList(false);
// geoCoder.geocode(new GeoCodeOption() // geoCoder.geocode(new GeoCodeOption()
// .city(data) // .city(data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment