diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java index 080717c..0165735 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java @@ -148,6 +148,22 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("city"); } + public static void setCurrentCity(String city) { + SPUtils.getInstance(SP_USER_INFO).put("currentCity", city); + } + + public static String getCurrentCity() { + return SPUtils.getInstance(SP_USER_INFO).getString("currentCity"); + } + + public static String getCurrentCityCode() { + return SPUtils.getInstance(SP_USER_INFO).getString("currentCityCode"); + } + + public static void setCurrentCityCode(String code) { + SPUtils.getInstance(SP_USER_INFO).put("currentCityCode", code); + } + public static void setLocationAddress(String address) { SPUtils.getInstance(SP_USER_INFO).put("address", address); } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java index 176c07c..c2bf14a 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java @@ -33,6 +33,7 @@ import com.sucstepsoft.cm_utils.core.widget.views.CenterDialogUpdateView; import com.sucstepsoft.cm_utils.utils.FileUtils; import com.sucstepsoft.cm_utils.utils.LogUtils; import com.sucstepsoft.cm_utils.utils.PermissionUtils; +import com.sucstepsoft.cm_utils.utils.SPUtils; import com.sucstepsoft.cm_utils.utils.ToastUtils; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.mudulemain.R; @@ -91,7 +92,6 @@ public class MainActivity extends BaseActivity { Fragment placeFragment = FragmentUtils.getPlaceFragment(); Fragment culturalFragment = FragmentUtils.getCulturalFragment(); Fragment mineMainFragment = FragmentUtils.getMineFragment(); - mFragments.add(homefragment); mFragments.add(activityFragment); mFragments.add(placeFragment); @@ -110,7 +110,8 @@ public class MainActivity extends BaseActivity { mVpContent.setCurrentItem(0, false); mTvBaseTitle.setText("日喀则市数字文化云"); mTvAppBack.setVisibility(View.VISIBLE); - mTvAppBack.setText(TextUtils.isEmpty(UserLgUtils.getLocationCity()) ? "地区选择" : UserLgUtils.getLocationCity()); + String city = TextUtils.isEmpty(UserLgUtils.getLocationCity()) ? "地区选择" : UserLgUtils.getLocationCity(); + mTvAppBack.setText(city); return true; } else if (itemId == R.id.tab_activity) { //活动 @@ -156,7 +157,8 @@ public class MainActivity extends BaseActivity { mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar1.setVisibility(View.VISIBLE); mTvAppBack.setVisibility(View.VISIBLE); - mTvAppBack.setText("地区选择"); + String city = TextUtils.isEmpty(UserLgUtils.getLocationCity()) ? "地区选择" : UserLgUtils.getLocationCity(); + mTvAppBack.setText(city); mTvAppBack.setOnClickListener(v -> ARouter.getInstance() .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY) .navigation(mActivity, 1234)); @@ -383,7 +385,9 @@ public class MainActivity extends BaseActivity { float radius = location.getRadius(); if (latitude != Double.MIN_VALUE && longitude != Double.MIN_VALUE && radius <= 300) { UserLgUtils.setLocationCity(location.getCity()); - mTvAppBack.setText(location.getCity()); + if (TextUtils.isEmpty(UserLgUtils.getCurrentCity())) { + mTvAppBack.setText(location.getCity()); + } UserLgUtils.setLocationAddress(location.getAddrStr()); UserLgUtils.setLocationLat(latitude + ""); UserLgUtils.setLocationLng(longitude + "");