diff --git a/cm_utils/src/main/assets/fonts/STSONG.TTF b/cm_utils/src/main/assets/fonts/STSONG.TTF deleted file mode 100644 index 3870605..0000000 Binary files a/cm_utils/src/main/assets/fonts/STSONG.TTF and /dev/null differ diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java index 71fd3c0..8fc1479 100644 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/views/TypeFaceTextView.java @@ -8,6 +8,7 @@ import android.util.TypedValue; import android.widget.TextView; import com.sucstepsoft.cm_utils.R; +import com.sucstepsoft.cm_utils.utils.LogUtils; import androidx.annotation.Nullable; @@ -32,12 +33,22 @@ public class TypeFaceTextView extends androidx.appcompat.widget.AppCompatTextVie public TypeFaceTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.TypeFaceTextView, defStyleAttr, 0); - int type = a.getInteger(R.styleable.TypeFaceTextView_text_type_cus, 1); + int type = a.getInteger(R.styleable.TypeFaceTextView_text_type_cus, 0); if (type == 1) { mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF"); } else { - mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/STSONG.TTF"); + mTypeface = Typeface.DEFAULT; } setTypeface(mTypeface); } + + public void setTypeFaceType(int type) { + if (type == 1) { + mTypeface = Typeface.createFromAsset(getContext().getAssets(), "fonts/zhangti.TTF"); + } else { + mTypeface = Typeface.DEFAULT; + } + setTypeface(mTypeface); + postInvalidate(); + } } 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 0de62b7..9883d07 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 @@ -11,21 +11,22 @@ + android:src="@drawable/ic_tab_icon_left" + android:visibility="invisible" /> + android:src="@drawable/ic_tab_icon_right" + android:visibility="invisible" /> \ No newline at end of file diff --git a/moduleactivity/src/main/res/layout/activity_detail.xml b/moduleactivity/src/main/res/layout/activity_detail.xml index 7b61d43..fe680bc 100644 --- a/moduleactivity/src/main/res/layout/activity_detail.xml +++ b/moduleactivity/src/main/res/layout/activity_detail.xml @@ -26,6 +26,7 @@ android:id="@+id/tv_title" android:layout_width="match_parent" android:layout_height="wrap_content" + app:text_type_cus="1" android:padding="10dp" android:textColor="#242424" android:textSize="18sp" @@ -124,6 +125,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="3dp" android:layout_weight="1" + app:text_type_cus="1" android:text="活动详情" android:textColor="#242424" android:textSize="16sp" /> @@ -178,6 +180,7 @@ android:layout_marginLeft="3dp" android:layout_weight="1" android:text="活动单位" + app:text_type_cus="1" android:textColor="#242424" android:textSize="16sp" /> @@ -239,6 +242,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="3dp" android:layout_weight="1" + app:text_type_cus="1" android:text="活动须知" android:textColor="#242424" android:textSize="16sp" /> diff --git a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerMineTeamActivity.java b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerMineTeamActivity.java index f6336a3..e819519 100644 --- a/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerMineTeamActivity.java +++ b/modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerMineTeamActivity.java @@ -155,13 +155,14 @@ public class VolunteerMineTeamActivity extends BaseActivity { // mAdapter.addTeamMemberListener(rowsBean -> showMembers(rowsBean)); getMineTeamList(mCurrentPage); } else { + refreshView(STATE_LOAD_EMPTY); ToastUtils.showShort("你暂时还不是一名志愿者"); } } @Override public void onError(Throwable e) { - + refreshView(STATE_LOAD_ERROR); } @Override diff --git a/modulecultural/src/main/res/layout/activity_cultural_live_look_back.xml b/modulecultural/src/main/res/layout/activity_cultural_live_look_back.xml index 27d7aac..63bf5a8 100644 --- a/modulecultural/src/main/res/layout/activity_cultural_live_look_back.xml +++ b/modulecultural/src/main/res/layout/activity_cultural_live_look_back.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="220dp" android:scaleType="fitXY" - tools:src="@drawable/bg_splash" /> + tools:src="@drawable/ic_img_default" /> + android:textSize="16sp" + app:text_type_cus="1" /> diff --git a/modulecultural/src/main/res/layout/activity_legacy_detail.xml b/modulecultural/src/main/res/layout/activity_legacy_detail.xml index c9be27e..c057552 100644 --- a/modulecultural/src/main/res/layout/activity_legacy_detail.xml +++ b/modulecultural/src/main/res/layout/activity_legacy_detail.xml @@ -33,6 +33,7 @@ android:id="@+id/tv_title" android:layout_width="match_parent" android:layout_height="wrap_content" + app:text_type_cus="1" android:padding="10dp" android:textColor="@color/black" android:textSize="18sp" /> @@ -289,6 +290,7 @@ android:layout_marginLeft="3dp" android:layout_weight="1" android:text="相关描述" + app:text_type_cus="1" android:textColor="#242424" android:textSize="16sp" /> @@ -318,6 +320,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="3dp" + app:text_type_cus="1" android:layout_weight="1" android:text="相关继承人" android:textColor="#242424" diff --git a/modulecultural/src/main/res/layout/activity_share_live_detail.xml b/modulecultural/src/main/res/layout/activity_share_live_detail.xml index 1ed6853..03e9316 100644 --- a/modulecultural/src/main/res/layout/activity_share_live_detail.xml +++ b/modulecultural/src/main/res/layout/activity_share_live_detail.xml @@ -41,6 +41,7 @@ android:layout_margin="15dp" android:textColor="@color/black" android:textSize="16sp" + app:text_type_cus="1" tools:text="直播名称" /> + android:textSize="16sp" + app:text_type_cus="1" /> diff --git a/modulecultural/src/main/res/layout/activity_volunteer_detail.xml b/modulecultural/src/main/res/layout/activity_volunteer_detail.xml index c3cb298..256d14b 100644 --- a/modulecultural/src/main/res/layout/activity_volunteer_detail.xml +++ b/modulecultural/src/main/res/layout/activity_volunteer_detail.xml @@ -36,6 +36,7 @@ android:padding="10dp" android:textColor="#242424" android:textSize="18sp" + app:text_type_cus="1" tools:text="活动标题活动标题活动标题活动标题活动标题" /> + android:textSize="16sp" + app:text_type_cus="1" /> + android:textSize="16sp" + app:text_type_cus="1" /> \ No newline at end of file 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 2b9dd45..4e397bc 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 @@ -98,7 +98,9 @@ public class MainActivity extends BaseActivity { mVpContent.setAdapter(new MyFragmentPageAdapter(this)); mVpContent.setUserInputEnabled(false); - mBnv.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); + //TODO 系统字体 +// mBnv.setTypeface(Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF")); + mBnv.setTypeface(Typeface.DEFAULT); mBnv.setOnNavigationItemSelectedListener(item -> { int itemId = item.getItemId(); if (itemId == R.id.tab_home) { diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainFuncAdapter.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainFuncAdapter.java index 63fe0dd..2d1a3f2 100644 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainFuncAdapter.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/adapter/MainFuncAdapter.java @@ -46,7 +46,7 @@ public class MainFuncAdapter extends BaseRecyclerAdapter + android:textSize="14sp" + app:text_type_cus="1" /> + android:textSize="14sp" + app:text_type_cus="1" /> + android:textSize="14sp" + app:text_type_cus="1" /> + android:textSize="16sp" + app:text_type_cus="1" /> + android:textSize="18sp" + app:text_type_cus="1" /> + tools:background="@drawable/ic_img_default" /> \ No newline at end of file diff --git a/moduleplace/src/main/java/com/tengshisoft/moduleplace/fragment/PlaceMainfragment.java b/moduleplace/src/main/java/com/tengshisoft/moduleplace/fragment/PlaceMainfragment.java index f8e03dc..a469baf 100644 --- a/moduleplace/src/main/java/com/tengshisoft/moduleplace/fragment/PlaceMainfragment.java +++ b/moduleplace/src/main/java/com/tengshisoft/moduleplace/fragment/PlaceMainfragment.java @@ -1,6 +1,7 @@ package com.tengshisoft.moduleplace.fragment; import android.graphics.Color; +import android.graphics.Typeface; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -128,6 +129,10 @@ 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); diff --git a/moduleplace/src/main/res/layout/activity_place_detail.xml b/moduleplace/src/main/res/layout/activity_place_detail.xml index 49481a3..be6d7a2 100644 --- a/moduleplace/src/main/res/layout/activity_place_detail.xml +++ b/moduleplace/src/main/res/layout/activity_place_detail.xml @@ -51,6 +51,7 @@ android:singleLine="true" android:textColor="@color/black" android:textSize="14sp" + app:text_type_cus="1" tools:text="场馆名称场馆名称场馆名称场馆名称场馆名称场馆名称场馆名称场馆名称场馆名称" /> + android:textSize="16sp" + app:text_type_cus="1" /> + + android:textSize="16sp" + app:text_type_cus="1" /> + android:textSize="16sp" + app:text_type_cus="1" /> \ No newline at end of file