From fbcd9c7b9f387a5683b0aaa0fea2492251a1c9bf Mon Sep 17 00:00:00 2001 From: itgaojian Date: Thu, 23 Feb 2023 11:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E4=B8=80=E7=BA=A7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tengshisoft/BaseMyApplication.java | 5 ++- .../core/retrofit_net/BaseUrlApi.java | 2 +- .../retrofit_net/conver/AreaInterceptor.java | 2 +- .../cm_utils/utils/UserLgUtils.java | 42 ++++++++++++------- common.gradle | 1 + .../activitys/base/ChooseCityActivity.java | 5 +-- .../cultural/activitys/base/MainActivity.java | 16 ++++--- .../cultural/fragment/HomeFragment.java | 17 ++++---- .../src/main/res/layout/activity_login.xml | 7 +++- .../main/res/drawable/shape_red_ra_deep.xml | 2 +- 10 files changed, 59 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/tengshisoft/BaseMyApplication.java b/app/src/main/java/com/tengshisoft/BaseMyApplication.java index 4b61c7d..949a6b3 100755 --- a/app/src/main/java/com/tengshisoft/BaseMyApplication.java +++ b/app/src/main/java/com/tengshisoft/BaseMyApplication.java @@ -52,8 +52,9 @@ public class BaseMyApplication extends Application { } private void getConfigCityCode() { - UserLgUtils.setCityCode(this.getResources().getString(R.string.CITY_CODE)); - UserLgUtils.setCityId(this.getResources().getString(R.string.CITY_ID)); + UserLgUtils.setCurrentCityCode(this.getResources().getString(R.string.CITY_CODE)); + UserLgUtils.setCurrentCity(this.getResources().getString(R.string.CITY_NAME)); + UserLgUtils.setCurrentCityId(this.getResources().getString(R.string.CITY_ID)); } private void initShare() { diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index 05de12b..674c3ee 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -53,7 +53,7 @@ public class BaseUrlApi { public static final String BASE_ACTIVIY_IP = BASE_SYSTEM_IP;/* 活动URL */ public static final String BASE_PLACE_IP = BASE_SYSTEM_IP;/* 场馆 */ public static final String BASE_VOLUNTEER_IP = BASE_SYSTEM_IP;/* 志愿者 */ - public static final String BASE_LIVE_IP = BASE_SYSTEM_IP + "live/"; + public static final String BASE_LIVE_IP = IP_URL + "live/"; public static final String BASE_LIVE_URL = BASE_SYSTEM_IP;//直播回放视频url public static final String BASE_CULTURAL_SHARE = BASE_SYSTEM_IP;/* 文化分享 */ public static final String BASE_LEGACY_IP = BASE_SYSTEM_IP;//非遗数据库 diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java index 2f6d7ea..77767f3 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/AreaInterceptor.java @@ -24,7 +24,7 @@ public class AreaInterceptor implements Interceptor { public okhttp3.Response intercept(Chain chain) throws IOException { Request originalRequest = chain.request(); Request request; - String areaCode = UserLgUtils.getCityCode(); + String areaCode = UserLgUtils.getCurrentCityCode(); //判断是否需要添加 List baseUrlName = originalRequest.headers("need_area"); if (baseUrlName.size() > 0) { 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 fc4c7fd..0eee162 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 @@ -64,6 +64,33 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("email"); } + //===============地理信息===================== + + 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 setCurrentCityId(String city) { + SPUtils.getInstance(SP_USER_INFO).put("currentCityId", city); + } + + public static String getCurrentCityId() { + return SPUtils.getInstance(SP_USER_INFO).getString("currentCityId"); + } + + //============================== public static void setLoginInfo(String userInfo) { SPUtils.getInstance(SP_USER_INFO).put("userInfos", userInfo); @@ -146,21 +173,6 @@ 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/common.gradle b/common.gradle index fcb0f43..b70f220 100644 --- a/common.gradle +++ b/common.gradle @@ -10,6 +10,7 @@ project.ext { dimension 'market' resValue("string", "CITY_CODE", "540200000000") resValue("string", "CITY_ID", "640675") + resValue("string", "CITY_NAME", "日喀则市") manifestPlaceholders = [CHANNEL_VALUE: "cultural", APP_LOGO : "@drawable/app_logo", CITY_ID : "640675", diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java index 8d60285..c1e919b 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java @@ -232,17 +232,16 @@ public class ChooseCityActivity extends BaseActivity { } mArea4Adapter.notifyDataSetChanged(); } - mCurrentCityCode =UserLgUtils.getCurrentCityCode(); + mCurrentCityCode = UserLgUtils.getCurrentCityId(); mCurrentCityId = UserLgUtils.getCurrentCityCode(); mCurrentCityName = PathConfig.CITY_DEFAULT_NAME; - UserLgUtils.setCityLevel(2); } else { if (!TextUtils.isEmpty(UserLgUtils.getCurrentCity())) { mCurrentCityName = UserLgUtils.getCurrentCity(); } else { mCurrentCityName = PathConfig.CITY_DEFAULT_NAME; } - mCurrentCityCode = UserLgUtils.getCurrentCityCode(); + mCurrentCityCode = UserLgUtils.getCurrentCityId(); mCurrentCityId = UserLgUtils.getCurrentCityCode(); } mTvCurrentArea.setText(mCurrentCityName); 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 f39a8c6..8e153c6 100755 --- 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 @@ -83,7 +83,7 @@ public class MainActivity extends BaseActivity { mRlTitleBar1.setVisibility(View.VISIBLE); mFragments = new ArrayList<>(); Fragment homefragment = FragmentUtils.getHomeFragment(); - Fragment shopFragment = FragmentUtils.getActivityFragment(); + Fragment shopFragment = FragmentUtils.getShopFragment(); Fragment placeFragment = FragmentUtils.getPlaceFragment(); Fragment culturalFragment = FragmentUtils.getCulturalFragment(); Fragment mineMainFragment = FragmentUtils.getMineFragment(); @@ -92,12 +92,6 @@ public class MainActivity extends BaseActivity { mFragments.add(culturalFragment); mFragments.add(shopFragment); mFragments.add(mineMainFragment); -// String locationCity = UserLgUtils.getCurrentCity(); -// if (TextUtils.isEmpty(locationCity)) { -// UserLgUtils.setCurrentCity(PathConfig.CITY_DEFAULT_NAME); -// UserLgUtils.setCurrentCityCode(PathConfig.CITY_DEFAULT_CODE); -// UserLgUtils.setCityLevel(PathConfig.CITY_DEFAULT_LEVEL); -// } mVpContent.setAdapter(new MyFragmentPageAdapter(this)); mVpContent.setUserInputEnabled(false); @@ -192,7 +186,7 @@ public class MainActivity extends BaseActivity { }); mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar1.setVisibility(View.VISIBLE); - mTvAppBack.setVisibility(View.GONE); + mTvAppBack.setVisibility(View.VISIBLE); String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); mTvAppBack.setText(city); mTvAppBack.setOnClickListener(v -> ARouter.getInstance() @@ -241,11 +235,15 @@ public class MainActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { if (requestCode == 1234) { - if (resultCode == RESULT_OK) { + if (resultCode == 333) { String chooseCity = data.getStringExtra("chooseCity"); String chooseCityCode = data.getStringExtra("chooseCityCode"); String cityId = data.getStringExtra("chooseCityId"); + UserLgUtils.setCurrentCityCode(cityId); + UserLgUtils.setCurrentCityId(chooseCityCode); + UserLgUtils.setCurrentCity(chooseCity); + mTvAppBack.setText(chooseCity); refreshData(); } diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java index bb7585f..9327ac3 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java @@ -256,12 +256,14 @@ public class HomeFragment extends BaseFragment { @Override public void onError(Throwable e) { e.printStackTrace(); - //TODO 错误处理 + if (mNewsSkeleton != null) { + mNewsSkeleton.hide(); + } } @Override public void onComplete() { - + mSrlView.finishRefresh(); } }); } @@ -295,7 +297,7 @@ public class HomeFragment extends BaseFragment { @Override public void onComplete() { - + mSrlView.finishRefresh(); } }); } @@ -430,7 +432,7 @@ public class HomeFragment extends BaseFragment { @Override public void onComplete() { - + mSrlView.finishRefresh(); } }); @@ -713,7 +715,7 @@ public class HomeFragment extends BaseFragment { @Override public void onComplete() { - + mSrlView.finishRefresh(); } }); } @@ -1021,7 +1023,6 @@ public class HomeFragment extends BaseFragment { if (mNewsSkeleton != null) { mNewsSkeleton.show(); } -// getNewsList(null); mLlNewsContent.removeAllViews(); getMainFuncMenu(); getMainNewsTab(); @@ -1042,11 +1043,13 @@ public class HomeFragment extends BaseFragment { public void notifyData() { //重新加载数据 mMainCommendBeans.clear(); + if (mNewsSkeleton != null) { + mNewsSkeleton.show(); + } mLlNewsContent.removeAllViews(); buildBannerData(); getMainFuncMenu(); getMainNewsTab(); -// getNewsList(null); getLiveList(); getMainCommendList(); getBannerData(); diff --git a/modulemain/src/main/res/layout/activity_login.xml b/modulemain/src/main/res/layout/activity_login.xml index 1846d53..6a4f809 100755 --- a/modulemain/src/main/res/layout/activity_login.xml +++ b/modulemain/src/main/res/layout/activity_login.xml @@ -175,7 +175,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/ll_content" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginLeft="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="20dp" android:background="@drawable/sel_btn_login" android:clickable="true" android:focusable="true" diff --git a/moduleplace/src/main/res/drawable/shape_red_ra_deep.xml b/moduleplace/src/main/res/drawable/shape_red_ra_deep.xml index 5a05d4f..d2fb45a 100755 --- a/moduleplace/src/main/res/drawable/shape_red_ra_deep.xml +++ b/moduleplace/src/main/res/drawable/shape_red_ra_deep.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file