From aaac1c8e18d6a39a1a999e695bffc6637353a24c Mon Sep 17 00:00:00 2001 From: itgaojian Date: Thu, 23 Feb 2023 10:42:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E4=B8=80=E7=BA=A7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cm_utils/utils/UserLgUtils.java | 16 --------- .../fragments/CulturalMainFragment.java | 10 +++--- .../activitys/base/ChooseCityActivity.java | 6 ++-- .../cultural/activitys/base/MainActivity.java | 34 +++++++++---------- .../cultural/fragment/HomeFragment.java | 18 +++++----- .../src/main/res/layout/fragment_home.xml | 6 ++-- 6 files changed, 36 insertions(+), 54 deletions(-) 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 32783f2..fc4c7fd 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 @@ -203,22 +203,6 @@ public class UserLgUtils { return SPUtils.getInstance(SP_USER_INFO).getString("appName"); } - public static String getCityCode() { - return SPUtils.getInstance(SP_USER_INFO).getString("cityCode"); - } - - public static void setCityCode(String code) { - SPUtils.getInstance(SP_USER_INFO).put("cityCode", code); - } - - public static String getCityId() { - return SPUtils.getInstance(SP_USER_INFO).getString("cityId"); - } - - public static void setCityId(String code) { - SPUtils.getInstance(SP_USER_INFO).put("cityId", code); - } - public static String getShopCar() { return SPUtils.getInstance(SP_USER_INFO).getString("shopCar"); } diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java index 9c43bf6..d54b9f3 100755 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java @@ -56,11 +56,11 @@ public class CulturalMainFragment extends BaseFragment { private LegacyMainAdapter mMainAdapter; private List mFuncStr = new ArrayList<>(); - // private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化直播", "文化分享"}; - // private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; - - private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化分享"}; - private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; + private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化直播", "文化分享"}; + private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; +// +// private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化分享"}; +// private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; private List mFuncBeans = new ArrayList<>(); private RecyclerViewSkeletonScreen mSkeleton; 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 7dfbb10..8d60285 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,8 +232,8 @@ public class ChooseCityActivity extends BaseActivity { } mArea4Adapter.notifyDataSetChanged(); } - mCurrentCityCode = PathConfig.CITY_DEFAULT_CODE; - mCurrentCityId = UserLgUtils.getCityCode(); + mCurrentCityCode =UserLgUtils.getCurrentCityCode(); + mCurrentCityId = UserLgUtils.getCurrentCityCode(); mCurrentCityName = PathConfig.CITY_DEFAULT_NAME; UserLgUtils.setCityLevel(2); } else { @@ -243,7 +243,7 @@ public class ChooseCityActivity extends BaseActivity { mCurrentCityName = PathConfig.CITY_DEFAULT_NAME; } mCurrentCityCode = UserLgUtils.getCurrentCityCode(); - mCurrentCityId = UserLgUtils.getCityCode(); + 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 8ca5ceb..f39a8c6 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 @@ -92,12 +92,12 @@ 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); - } +// 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); @@ -119,9 +119,9 @@ public class MainActivity extends BaseActivity { mIvInto.setVisibility(View.GONE); mVpContent.setCurrentItem(0, false); mTvBaseTitle.setText(UserLgUtils.getAppName()); - mTvAppBack.setVisibility(View.GONE); -// String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); -// mTvAppBack.setText(city); + mTvAppBack.setVisibility(View.VISIBLE); + String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); + mTvAppBack.setText(city); return true; } else if (itemId == R.id.tab_place) { //场馆 @@ -193,11 +193,11 @@ public class MainActivity extends BaseActivity { mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar1.setVisibility(View.VISIBLE); mTvAppBack.setVisibility(View.GONE); -// String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); -// mTvAppBack.setText(city); -// mTvAppBack.setOnClickListener(v -> ARouter.getInstance() -// .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY) -// .navigation(mActivity, 1234)); + String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); + mTvAppBack.setText(city); + mTvAppBack.setOnClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY) + .navigation(mActivity, 1234)); doCheckPermission(); checkAppVersion(); getUserInfo(); @@ -241,11 +241,11 @@ public class MainActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { if (requestCode == 1234) { - if (resultCode == 333) { + if (resultCode == RESULT_OK) { String chooseCity = data.getStringExtra("chooseCity"); String chooseCityCode = data.getStringExtra("chooseCityCode"); - UserLgUtils.setCurrentCity(chooseCity); - UserLgUtils.setCurrentCityCode(chooseCityCode); + String cityId = data.getStringExtra("chooseCityId"); + UserLgUtils.setCurrentCityCode(cityId); 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 7522738..bb7585f 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 @@ -200,7 +200,7 @@ public class HomeFragment extends BaseFragment { getMainFuncMenu();//获取首页功能按钮 getMainNewsTab();//获取首页动态新闻tab // getNewsList(null); -//TODO 县城一级无直播 getLiveList(); + getLiveList(); getMainCommendList(); getBannerData(); mBanner.setOnBannerListener((data, position) -> { @@ -778,9 +778,7 @@ public class HomeFragment extends BaseFragment { */ private void buildMainFuncMenu(List list) { mFuncBeans.clear(); -// MainFuncBean movieBean = new MainFuncBean(); -// movieBean.setIconRes(R.drawable.ic_live_icon); -// movieBean.setTitle("直播点播"); + // MainFuncBean showBean = new MainFuncBean(); // showBean.setIconRes(R.drawable.ic_show_icon); @@ -804,9 +802,6 @@ public class HomeFragment extends BaseFragment { // mFuncBeans.add(tourBean); // mFuncBeans.add(bookBean); if (list != null && list.size() > 0) { -// for (int i = 0; i < list.size(); i++) { -// list.get(i).setLocalRes(-1); -// } mFuncBeans.addAll(list); } NewsTabBean activityBean = new NewsTabBean(); @@ -821,11 +816,14 @@ public class HomeFragment extends BaseFragment { NewsTabBean volunBean = new NewsTabBean(); volunBean.setLocalRes(R.drawable.ic_volunteer_icon); volunBean.setDirectoriesName("志愿者服务"); + NewsTabBean movieBean = new NewsTabBean(); + movieBean.setLocalRes(R.drawable.ic_live_icon); + movieBean.setDirectoriesName("直播点播"); mFuncBeans.add(volunBean); mFuncBeans.add(activityBean); mFuncBeans.add(placeBean); mFuncBeans.add(culturalBean); -// mFuncBeans.add(movieBean); + mFuncBeans.add(movieBean); MainFuncAdapter funcAdapter = new MainFuncAdapter(getActivity(), mFuncBeans); LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false); @@ -984,7 +982,6 @@ public class HomeFragment extends BaseFragment { NewsAdapter adapter = new NewsAdapter(mActivity, tempList); adapter.addOnItemClickByType(this::showNewsDetail); RelativeLayout rlvLayout = new RelativeLayout(mActivity); - rlvLayout.setBackgroundColor(Color.parseColor("#000000")); RelativeLayout.LayoutParams rlvParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT); rlvParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE); rlvLayout.setLayoutParams(rlvParams); @@ -1030,6 +1027,7 @@ public class HomeFragment extends BaseFragment { getMainNewsTab(); getBannerData(); getMainCommendList(); + getLiveList(); } @Override @@ -1049,7 +1047,7 @@ public class HomeFragment extends BaseFragment { getMainFuncMenu(); getMainNewsTab(); // getNewsList(null); -// getLiveList(); + getLiveList(); getMainCommendList(); getBannerData(); } diff --git a/modulemain/src/main/res/layout/fragment_home.xml b/modulemain/src/main/res/layout/fragment_home.xml index c42af81..b7c0629 100755 --- a/modulemain/src/main/res/layout/fragment_home.xml +++ b/modulemain/src/main/res/layout/fragment_home.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" - android:visibility="gone"> + android:visibility="visible"> + android:visibility="visible" /> + android:visibility="visible">