diff --git a/cm_utils/src/main/res/color/col_btn_blue_white.xml b/cm_utils/src/main/res/color/col_btn_blue_white.xml index 83173b9..63fb93c 100755 --- a/cm_utils/src/main/res/color/col_btn_blue_white.xml +++ b/cm_utils/src/main/res/color/col_btn_blue_white.xml @@ -1,5 +1,5 @@ + - \ No newline at end of file diff --git a/modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png b/cm_utils/src/main/res/drawable-xhdpi/ic_clock_icon.png similarity index 100% rename from modulemain/src/main/res/drawable-xhdpi/ic_clock_icon.png rename to cm_utils/src/main/res/drawable-xhdpi/ic_clock_icon.png diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_clock_yellow_icon.png b/cm_utils/src/main/res/drawable-xhdpi/ic_clock_yellow_icon.png new file mode 100644 index 0000000..430aa1b Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_clock_yellow_icon.png differ diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_eye.png b/cm_utils/src/main/res/drawable-xhdpi/ic_eye.png deleted file mode 100644 index ffbd458..0000000 Binary files a/cm_utils/src/main/res/drawable-xhdpi/ic_eye.png and /dev/null differ diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_eye_gray.png b/cm_utils/src/main/res/drawable-xhdpi/ic_eye_gray.png new file mode 100644 index 0000000..40ecd81 Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_eye_gray.png differ diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_icon.png b/cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_icon.png new file mode 100644 index 0000000..51d2c75 Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_icon.png differ diff --git a/cm_utils/src/main/res/drawable/shape_status_black_round.xml b/cm_utils/src/main/res/drawable/shape_status_black_round.xml new file mode 100644 index 0000000..7e84954 --- /dev/null +++ b/cm_utils/src/main/res/drawable/shape_status_black_round.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/cm_utils/src/main/res/drawable/shape_status_blue_round.xml b/cm_utils/src/main/res/drawable/shape_status_blue_round.xml new file mode 100644 index 0000000..60f2303 --- /dev/null +++ b/cm_utils/src/main/res/drawable/shape_status_blue_round.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/cm_utils/src/main/res/layout/item_tab_custom_view.xml b/cm_utils/src/main/res/layout/item_tab_custom_view.xml index 9883d07..3a59408 100644 --- a/cm_utils/src/main/res/layout/item_tab_custom_view.xml +++ b/cm_utils/src/main/res/layout/item_tab_custom_view.xml @@ -13,14 +13,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_tab_icon_left" - android:visibility="invisible" /> + android:visibility="gone" /> + android:visibility="gone" /> \ No newline at end of file diff --git a/cm_utils/src/main/res/values/colors.xml b/cm_utils/src/main/res/values/colors.xml index afff1cf..7490978 100755 --- a/cm_utils/src/main/res/values/colors.xml +++ b/cm_utils/src/main/res/values/colors.xml @@ -36,7 +36,7 @@ #bb8E8E8E #535353 #7C7C7C - #00A6FE + #125CE1 #3300A6FE #808080 #FF8B00 diff --git a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/adapter/ActivityAdapter.java b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/adapter/ActivityAdapter.java index 28fc0ea..c506098 100644 --- a/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/adapter/ActivityAdapter.java +++ b/moduleactivity/src/main/java/com/tengshisoft/moduleactivity/adapter/ActivityAdapter.java @@ -35,11 +35,11 @@ public class ActivityAdapter extends BaseRecyclerAdapter diff --git a/moduleactivity/src/main/res/layout/item_activity_list.xml b/moduleactivity/src/main/res/layout/item_activity_list.xml index 2f1f9ae..5bbe158 100644 --- a/moduleactivity/src/main/res/layout/item_activity_list.xml +++ b/moduleactivity/src/main/res/layout/item_activity_list.xml @@ -35,9 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginTop="10dp" - android:layout_marginRight="10dp" - android:background="@drawable/shape_status_black" + android:background="@drawable/shape_status_blue_round" android:paddingLeft="10dp" android:paddingTop="4dp" android:paddingRight="10dp" @@ -46,34 +44,6 @@ android:textSize="12sp" tools:text="进行中" /> - - - - - - - @@ -95,25 +65,41 @@ android:textSize="16sp" tools:text="标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题" /> - - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/modulecultural/src/main/res/layout/item_live_layout.xml b/modulecultural/src/main/res/layout/item_live_layout.xml index 1de6fd1..f33ad18 100644 --- a/modulecultural/src/main/res/layout/item_live_layout.xml +++ b/modulecultural/src/main/res/layout/item_live_layout.xml @@ -50,7 +50,7 @@ android:layout_marginRight="10dp" android:layout_toLeftOf="@id/tv_state" android:background="@drawable/shape_rectangle_transparence" - android:drawableLeft="@drawable/ic_eye" + android:drawableLeft="@drawable/ic_eye_gray" android:drawablePadding="5dp" android:paddingLeft="5dp" android:paddingRight="5dp" diff --git a/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceListAdapter.java b/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceListAdapter.java index 940be58..c6ce50a 100644 --- a/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceListAdapter.java +++ b/moduleplace/src/main/java/com/tengshisoft/moduleplace/adapter/PlaceListAdapter.java @@ -49,17 +49,18 @@ public class PlaceListAdapter extends BaseRecyclerAdapter showTypePlaceActivity(dataBean)); + mFuncAdapter.addOnItemClickListener(this::showTypePlaceActivity); mRgTaxis.setOnCheckedChangeListener((group, checkedId) -> { mCurrentPage = 1; if (checkedId == R.id.rb_default) { @@ -129,10 +127,6 @@ public class PlaceMainfragment extends BaseFragment { } getPlaceListByOrder(mCurrentPage, mCurrentType); }); - mRbDefault.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); - mRbDis.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); - mRbMoods.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); - mRbNews.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); mCurrentPage = 1; mSrlPlaceContent.setOnRefreshListener(refreshLayout -> refreshData()); getPlaceListByOrder(mCurrentPage, mCurrentType); @@ -140,10 +134,10 @@ public class PlaceMainfragment extends BaseFragment { refreshStateView(STATE_LOAD); getFuncList(); mRlvSkeleton = Skeleton.bind(mRlvPlaceContent) - .count(5) - .adapter(mAdapter) - .load(R.layout.layout_skeleton_img) - .show(); + .count(5) + .adapter(mAdapter) + .load(R.layout.layout_skeleton_img) + .show(); } /** @@ -153,26 +147,26 @@ public class PlaceMainfragment extends BaseFragment { */ private void showTypePlaceActivity(PlaceFuncBean.DataBean dataBean) { ARouter.getInstance() - .build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACELIST) - .withString("dId", dataBean.getDictionaryId()) - .withString("title", dataBean.getDictionaryName()) - .navigation(); + .build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACELIST) + .withString("dId", dataBean.getDictionaryId()) + .withString("title", dataBean.getDictionaryName()) + .navigation(); } private void showPlaceDetail(PlaceListBean.RowsBean placeListBean) { ARouter.getInstance() - .build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL) - .withString("id", placeListBean.getVenuesInfoId()) - .withString("title", placeListBean.getVenueName()) - .navigation(); + .build(PathConfig.PATH_MODULE_PLACE_ACTIVITY_PLACEDETAIL) + .withString("id", placeListBean.getVenuesInfoId()) + .withString("title", placeListBean.getVenueName()) + .navigation(); } private void showAppraiseDialog() { BottomAppRaiseDialog dialog = new BottomAppRaiseDialog.DialogBuilder(mActivity) - .setActivity(mActivity) - .setIscancelable(true) - .setIscancelable(true) - .build(); + .setActivity(mActivity) + .setIscancelable(true) + .setIscancelable(true) + .build(); dialog.show(); } @@ -181,37 +175,37 @@ public class PlaceMainfragment extends BaseFragment { */ private void getFuncList() { RetrofitManager.getInstance() - .create(ApiPlace.class) - .getPlaceTypeList(PathConfig.PLACE_TYPE_ID) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { - mDisposable = d; - } + .create(ApiPlace.class) + .getPlaceTypeList(PathConfig.PLACE_TYPE_ID) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + mDisposable = d; + } - @Override - public void onNext(PlaceFuncBean placeFuncBean) { - if (placeFuncBean.getData() != null && placeFuncBean.getData().size() > 0) { - mRlvPlaceType.setVisibility(View.VISIBLE); - mFuncDatas = placeFuncBean.getData(); - mFuncAdapter.setData(mFuncDatas); - } else { - mRlvPlaceType.setVisibility(View.GONE); - } - } - - @Override - public void onError(Throwable e) { + @Override + public void onNext(PlaceFuncBean placeFuncBean) { + if (placeFuncBean.getData() != null && placeFuncBean.getData().size() > 0) { + mRlvPlaceType.setVisibility(View.VISIBLE); + mFuncDatas = placeFuncBean.getData(); + mFuncAdapter.setData(mFuncDatas); + } else { mRlvPlaceType.setVisibility(View.GONE); } + } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + mRlvPlaceType.setVisibility(View.GONE); + } - } - }); + @Override + public void onComplete() { + + } + }); } /** @@ -249,67 +243,67 @@ public class PlaceMainfragment extends BaseFragment { */ private void getPlaceListByOrder(int currentPage, String currentType) { RetrofitManager.getInstance() - .create(ApiPlace.class) - .getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), currentType, currentPage + "", "10") - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { - mOrderDis = d; - } + .create(ApiPlace.class) + .getPlaceByOrder(UserLgUtils.getLocationLat(), UserLgUtils.getLocationLng(), currentType, currentPage + "", "10") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + mOrderDis = d; + } - @Override - public void onNext(PlaceListBean placeListBean) { - if (mRlvSkeleton != null) { - mRlvSkeleton.hide(); - } - if (currentPage == 1) { - if (placeListBean != null && placeListBean.getRows().size() > 0) { - if ("apart".equals(mCurrentType)) { - mTotalPage = 10; - mDatas = placeListBean.getRows(); - mAdapter.setData(mDatas); - refreshStateView(STATE_SUCCESS); - } else { - mTotalPage = placeListBean.getTotal(); - mDatas = placeListBean.getRows(); - mAdapter.setData(mDatas); - refreshStateView(STATE_SUCCESS); - } - } else { - refreshStateView(STATE_EMPTY); - } - mSrlPlaceContent.finishRefresh(); - } else { - if (placeListBean != null) { - mDatas.addAll(placeListBean.getRows()); + @Override + public void onNext(PlaceListBean placeListBean) { + if (mRlvSkeleton != null) { + mRlvSkeleton.hide(); + } + if (currentPage == 1) { + if (placeListBean != null && placeListBean.getRows().size() > 0) { + if ("apart".equals(mCurrentType)) { + mTotalPage = 10; + mDatas = placeListBean.getRows(); mAdapter.setData(mDatas); - mSrlPlaceContent.finishLoadMore(); + refreshStateView(STATE_SUCCESS); } else { - mSrlPlaceContent.setNoMoreData(true); + mTotalPage = placeListBean.getTotal(); + mDatas = placeListBean.getRows(); + mAdapter.setData(mDatas); + refreshStateView(STATE_SUCCESS); } + } else { + refreshStateView(STATE_EMPTY); } - } - - @Override - public void onError(Throwable e) { - if (mRlvSkeleton != null) { - mRlvSkeleton.hide(); - } - if (currentPage == 1) { - refreshStateView(STATE_ERROR); - } - ExceptionHandler.handleException(e); mSrlPlaceContent.finishRefresh(); - mSrlPlaceContent.finishLoadMore(); + } else { + if (placeListBean != null) { + mDatas.addAll(placeListBean.getRows()); + mAdapter.setData(mDatas); + mSrlPlaceContent.finishLoadMore(); + } else { + mSrlPlaceContent.setNoMoreData(true); + } } + } - @Override - public void onComplete() { - + @Override + public void onError(Throwable e) { + if (mRlvSkeleton != null) { + mRlvSkeleton.hide(); } - }); + if (currentPage == 1) { + refreshStateView(STATE_ERROR); + } + ExceptionHandler.handleException(e); + mSrlPlaceContent.finishRefresh(); + mSrlPlaceContent.finishLoadMore(); + } + + @Override + public void onComplete() { + + } + }); } @Override diff --git a/moduleplace/src/main/java/com/tengshisoft/moduleplace/holder/PlaceListHolder.java b/moduleplace/src/main/java/com/tengshisoft/moduleplace/holder/PlaceListHolder.java index 4d9bb07..2a7da66 100644 --- a/moduleplace/src/main/java/com/tengshisoft/moduleplace/holder/PlaceListHolder.java +++ b/moduleplace/src/main/java/com/tengshisoft/moduleplace/holder/PlaceListHolder.java @@ -17,15 +17,17 @@ import androidx.recyclerview.widget.RecyclerView; */ public class PlaceListHolder extends RecyclerView.ViewHolder { public TextView mTvTitle; - public TextView mTvSee; public TextView mTvDistance; public TextView mTvTime; public ImageView mIvCover; + public TextView mTvAddress; + public TextView mTvPhone; public PlaceListHolder(@NonNull View itemView) { super(itemView); mTvTitle = itemView.findViewById(R.id.tv_title); - mTvSee = itemView.findViewById(R.id.tv_see); + mTvAddress = itemView.findViewById(R.id.tv_address); + mTvPhone = itemView.findViewById(R.id.tv_phone); mTvDistance = itemView.findViewById(R.id.tv_distance); mTvTime = itemView.findViewById(R.id.tv_time); mIvCover = itemView.findViewById(R.id.iv_cover); diff --git a/moduleplace/src/main/res/layout/fragment_place_main.xml b/moduleplace/src/main/res/layout/fragment_place_main.xml index 6b3de03..5684e97 100644 --- a/moduleplace/src/main/res/layout/fragment_place_main.xml +++ b/moduleplace/src/main/res/layout/fragment_place_main.xml @@ -1,137 +1,133 @@ - + android:layout_height="match_parent"> - + android:scrollbars="none"> - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent" + android:background="@color/gray_bg" + android:orientation="vertical" + tools:ignore="MissingDefaultResource"> - + android:layout_margin="10dp" + android:background="@drawable/shape_rectangle_white" + tools:itemCount="10" + tools:layoutManager="GridLayoutManager" + tools:listitem="@layout/item_place_func" + tools:orientation="horizontal" /> - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/moduleplace/src/main/res/layout/item_place_func.xml b/moduleplace/src/main/res/layout/item_place_func.xml index 4759b0f..f2a919b 100644 --- a/moduleplace/src/main/res/layout/item_place_func.xml +++ b/moduleplace/src/main/res/layout/item_place_func.xml @@ -27,6 +27,6 @@ android:singleLine="true" android:textColor="#242424" android:textSize="10sp" - app:text_type_cus="1" + app:text_type_cus="5" tools:text="基层文化中心" /> \ No newline at end of file diff --git a/moduleplace/src/main/res/layout/item_place_list.xml b/moduleplace/src/main/res/layout/item_place_list.xml index f782b68..6ece8e7 100644 --- a/moduleplace/src/main/res/layout/item_place_list.xml +++ b/moduleplace/src/main/res/layout/item_place_list.xml @@ -15,91 +15,106 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - - - - - - + android:padding="5dp"> - + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp"> + + + + + + + + + + + + + + + - + + + tools:text="联系电话" /> + + diff --git a/readme.md b/readme.md index e76357a..9ca7ed3 100644 --- a/readme.md +++ b/readme.md @@ -21,3 +21,8 @@ > 2 详情页 NewsWebActivity > > 3 隐藏各种中心状态栏(ImmersionBar) + +## 2022-2-9 集宁文化云 +> 1 复制西藏项目修改 +> 2 修改首页修改 +> 3 场馆、活动首页修改 \ No newline at end of file