gaojian/xz_cultural
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

市一级页面修改

Browse Source
This commit is contained in:
itgaojian 2023-02-23 10:42:03 +08:00
parent aa5177ec9d
commit aaac1c8e18
6 changed files with 36 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cm_utils/src/main/java/com/sucstepsoft/cm_utils/utils/UserLgUtils.java
View File

@ -203,22 +203,6 @@ public class UserLgUtils {
return SPUtils.getInstance(SP_USER_INFO).getString("appName"); 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() { public static String getShopCar() {
return SPUtils.getInstance(SP_USER_INFO).getString("shopCar"); return SPUtils.getInstance(SP_USER_INFO).getString("shopCar");
} }

10
modulecultural/src/main/java/com/tengshisoft/modulecultural/fragments/CulturalMainFragment.java
View File

@ -56,11 +56,11 @@ public class CulturalMainFragment extends BaseFragment {
private LegacyMainAdapter mMainAdapter; private LegacyMainAdapter mMainAdapter;
private List<String> mFuncStr = new ArrayList<>(); private List<String> mFuncStr = new ArrayList<>();
// private String[] mTitls = new String[]{"非物质文化遗产数据库", "文化直播", "文化分享"}; 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 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 String[] mTitls = new String[]{"非物质文化遗产数据库", "文化分享"};
private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon}; // private int[] mIcons = new int[]{R.drawable.ic_cultural_icon, R.drawable.ic_cultural_icon};
private List<FuncBean> mFuncBeans = new ArrayList<>(); private List<FuncBean> mFuncBeans = new ArrayList<>();
private RecyclerViewSkeletonScreen mSkeleton; private RecyclerViewSkeletonScreen mSkeleton;

6
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/ChooseCityActivity.java
View File

@ -232,8 +232,8 @@ public class ChooseCityActivity extends BaseActivity {
} }
mArea4Adapter.notifyDataSetChanged(); mArea4Adapter.notifyDataSetChanged();
} }
mCurrentCityCode = PathConfig.CITY_DEFAULT_CODE; mCurrentCityCode =UserLgUtils.getCurrentCityCode();
mCurrentCityId = UserLgUtils.getCityCode(); mCurrentCityId = UserLgUtils.getCurrentCityCode();
mCurrentCityName = PathConfig.CITY_DEFAULT_NAME; mCurrentCityName = PathConfig.CITY_DEFAULT_NAME;
UserLgUtils.setCityLevel(2); UserLgUtils.setCityLevel(2);
} else { } else {
@ -243,7 +243,7 @@ public class ChooseCityActivity extends BaseActivity {
mCurrentCityName = PathConfig.CITY_DEFAULT_NAME; mCurrentCityName = PathConfig.CITY_DEFAULT_NAME;
} }
mCurrentCityCode = UserLgUtils.getCurrentCityCode(); mCurrentCityCode = UserLgUtils.getCurrentCityCode();
mCurrentCityId = UserLgUtils.getCityCode(); mCurrentCityId = UserLgUtils.getCurrentCityCode();
} }
mTvCurrentArea.setText(mCurrentCityName); mTvCurrentArea.setText(mCurrentCityName);
} }

34
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java
View File

@ -92,12 +92,12 @@ public class MainActivity extends BaseActivity {
mFragments.add(culturalFragment); mFragments.add(culturalFragment);
mFragments.add(shopFragment); mFragments.add(shopFragment);
mFragments.add(mineMainFragment); mFragments.add(mineMainFragment);
String locationCity = UserLgUtils.getCurrentCity(); // String locationCity = UserLgUtils.getCurrentCity();
if (TextUtils.isEmpty(locationCity)) { // if (TextUtils.isEmpty(locationCity)) {
UserLgUtils.setCurrentCity(PathConfig.CITY_DEFAULT_NAME); // UserLgUtils.setCurrentCity(PathConfig.CITY_DEFAULT_NAME);
UserLgUtils.setCurrentCityCode(PathConfig.CITY_DEFAULT_CODE); // UserLgUtils.setCurrentCityCode(PathConfig.CITY_DEFAULT_CODE);
UserLgUtils.setCityLevel(PathConfig.CITY_DEFAULT_LEVEL); // UserLgUtils.setCityLevel(PathConfig.CITY_DEFAULT_LEVEL);
} // }
mVpContent.setAdapter(new MyFragmentPageAdapter(this)); mVpContent.setAdapter(new MyFragmentPageAdapter(this));
mVpContent.setUserInputEnabled(false); mVpContent.setUserInputEnabled(false);
@ -119,9 +119,9 @@ public class MainActivity extends BaseActivity {
mIvInto.setVisibility(View.GONE); mIvInto.setVisibility(View.GONE);
mVpContent.setCurrentItem(0, false); mVpContent.setCurrentItem(0, false);
mTvBaseTitle.setText(UserLgUtils.getAppName()); mTvBaseTitle.setText(UserLgUtils.getAppName());
mTvAppBack.setVisibility(View.GONE); mTvAppBack.setVisibility(View.VISIBLE);
// String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity();
// mTvAppBack.setText(city); mTvAppBack.setText(city);
return true; return true;
} else if (itemId == R.id.tab_place) { } else if (itemId == R.id.tab_place) {
//场馆 //场馆
@ -193,11 +193,11 @@ public class MainActivity extends BaseActivity {
mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar1.setVisibility(View.VISIBLE); mRlTitleBar1.setVisibility(View.VISIBLE);
mTvAppBack.setVisibility(View.GONE); mTvAppBack.setVisibility(View.GONE);
// String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity(); String city = TextUtils.isEmpty(UserLgUtils.getCurrentCity()) ? "地区选择" : UserLgUtils.getCurrentCity();
// mTvAppBack.setText(city); mTvAppBack.setText(city);
// mTvAppBack.setOnClickListener(v -> ARouter.getInstance() mTvAppBack.setOnClickListener(v -> ARouter.getInstance()
// .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY) .build(PathConfig.PATH_MODULE_MAIN_CHOOSE_CITY)
// .navigation(mActivity, 1234)); .navigation(mActivity, 1234));
doCheckPermission(); doCheckPermission();
checkAppVersion(); checkAppVersion();
getUserInfo(); getUserInfo();
@ -241,11 +241,11 @@ public class MainActivity extends BaseActivity {
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (requestCode == 1234) { if (requestCode == 1234) {
if (resultCode == 333) { if (resultCode == RESULT_OK) {
String chooseCity = data.getStringExtra("chooseCity"); String chooseCity = data.getStringExtra("chooseCity");
String chooseCityCode = data.getStringExtra("chooseCityCode"); String chooseCityCode = data.getStringExtra("chooseCityCode");
UserLgUtils.setCurrentCity(chooseCity); String cityId = data.getStringExtra("chooseCityId");
UserLgUtils.setCurrentCityCode(chooseCityCode); UserLgUtils.setCurrentCityCode(cityId);
mTvAppBack.setText(chooseCity); mTvAppBack.setText(chooseCity);
refreshData(); refreshData();
} }

18
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
View File

@ -200,7 +200,7 @@ public class HomeFragment extends BaseFragment {
getMainFuncMenu();//获取首页功能按钮 getMainFuncMenu();//获取首页功能按钮
getMainNewsTab();//获取首页动态新闻tab getMainNewsTab();//获取首页动态新闻tab
// getNewsList(null); // getNewsList(null);
//TODO 县城一级无直播 getLiveList(); getLiveList();
getMainCommendList(); getMainCommendList();
getBannerData(); getBannerData();
mBanner.setOnBannerListener((data, position) -> { mBanner.setOnBannerListener((data, position) -> {
@ -778,9 +778,7 @@ public class HomeFragment extends BaseFragment {
*/ */
private void buildMainFuncMenu(List<NewsTabBean> list) { private void buildMainFuncMenu(List<NewsTabBean> list) {
mFuncBeans.clear(); mFuncBeans.clear();
// MainFuncBean movieBean = new MainFuncBean();
// movieBean.setIconRes(R.drawable.ic_live_icon);
// movieBean.setTitle("直播点播");
// MainFuncBean showBean = new MainFuncBean(); // MainFuncBean showBean = new MainFuncBean();
// showBean.setIconRes(R.drawable.ic_show_icon); // showBean.setIconRes(R.drawable.ic_show_icon);
@ -804,9 +802,6 @@ public class HomeFragment extends BaseFragment {
// mFuncBeans.add(tourBean); // mFuncBeans.add(tourBean);
// mFuncBeans.add(bookBean); // mFuncBeans.add(bookBean);
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
// for (int i = 0; i < list.size(); i++) {
// list.get(i).setLocalRes(-1);
// }
mFuncBeans.addAll(list); mFuncBeans.addAll(list);
} }
NewsTabBean activityBean = new NewsTabBean(); NewsTabBean activityBean = new NewsTabBean();
@ -821,11 +816,14 @@ public class HomeFragment extends BaseFragment {
NewsTabBean volunBean = new NewsTabBean(); NewsTabBean volunBean = new NewsTabBean();
volunBean.setLocalRes(R.drawable.ic_volunteer_icon); volunBean.setLocalRes(R.drawable.ic_volunteer_icon);
volunBean.setDirectoriesName("志愿者服务"); volunBean.setDirectoriesName("志愿者服务");
NewsTabBean movieBean = new NewsTabBean();
movieBean.setLocalRes(R.drawable.ic_live_icon);
movieBean.setDirectoriesName("直播点播");
mFuncBeans.add(volunBean); mFuncBeans.add(volunBean);
mFuncBeans.add(activityBean); mFuncBeans.add(activityBean);
mFuncBeans.add(placeBean); mFuncBeans.add(placeBean);
mFuncBeans.add(culturalBean); mFuncBeans.add(culturalBean);
// mFuncBeans.add(movieBean); mFuncBeans.add(movieBean);
MainFuncAdapter funcAdapter = new MainFuncAdapter(getActivity(), mFuncBeans); MainFuncAdapter funcAdapter = new MainFuncAdapter(getActivity(), mFuncBeans);
LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false); LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false);
@ -984,7 +982,6 @@ public class HomeFragment extends BaseFragment {
NewsAdapter adapter = new NewsAdapter(mActivity, tempList); NewsAdapter adapter = new NewsAdapter(mActivity, tempList);
adapter.addOnItemClickByType(this::showNewsDetail); adapter.addOnItemClickByType(this::showNewsDetail);
RelativeLayout rlvLayout = new RelativeLayout(mActivity); RelativeLayout rlvLayout = new RelativeLayout(mActivity);
rlvLayout.setBackgroundColor(Color.parseColor("#000000"));
RelativeLayout.LayoutParams rlvParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT); RelativeLayout.LayoutParams rlvParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
rlvParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE); rlvParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
rlvLayout.setLayoutParams(rlvParams); rlvLayout.setLayoutParams(rlvParams);
@ -1030,6 +1027,7 @@ public class HomeFragment extends BaseFragment {
getMainNewsTab(); getMainNewsTab();
getBannerData(); getBannerData();
getMainCommendList(); getMainCommendList();
getLiveList();
} }
@Override @Override
@ -1049,7 +1047,7 @@ public class HomeFragment extends BaseFragment {
getMainFuncMenu(); getMainFuncMenu();
getMainNewsTab(); getMainNewsTab();
// getNewsList(null); // getNewsList(null);
// getLiveList(); getLiveList();
getMainCommendList(); getMainCommendList();
getBannerData(); getBannerData();
} }

6
modulemain/src/main/res/layout/fragment_home.xml
View File

@ -138,7 +138,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="visible">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -167,12 +167,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/gray_line" android:background="@color/gray_line"
android:visibility="gone" /> android:visibility="visible" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"> android:visibility="visible">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_lives" android:id="@+id/rlv_lives"