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

活动页面,个人中心页面,app图标替换

Browse Source
This commit is contained in:
itgaojian163 2022-10-05 10:32:42 +08:00
parent 9675d06474
commit 33c0a17016
28 changed files with 97 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/misc.xml
View File

@ -9,13 +9,31 @@
<option name="filePathToZoomLevelMap">
<map>
<entry key="../../../../../layout/custom_preview.xml" value="0.1789568345323741" />
<entry key="cm_utils/src/main/res/drawable/anim_pull_refreshing.xml" value="0.2985" />
<entry key="cm_utils/src/main/res/layout/base_activity.xml" value="0.3591485507246377" />
<entry key="cm_utils/src/main/res/layout/fragment_base.xml" value="0.3591485507246377" />
<entry key="cm_utils/src/main/res/layout/widget_custom_refresh_footer.xml" value="0.3591485507246377" />
<entry key="moduleactivity/src/main/res/layout/activity_detail.xml" value="0.3591485507246377" />
<entry key="moduleactivity/src/main/res/layout/fragment_activity_main.xml" value="0.3591485507246377" />
<entry key="moduleactivity/src/main/res/layout/item_activity_list_mine.xml" value="0.3591485507246377" />
<entry key="modulecultural/src/main/res/drawable/shape_topright_topleft.xml" value="0.2985" />
<entry key="modulecultural/src/main/res/layout/activity_cultural_legacy.xml" value="0.3591485507246377" />
<entry key="modulecultural/src/main/res/layout/activity_volunteer_detail.xml" value="0.2504528985507246" />
<entry key="modulecultural/src/main/res/layout/activity_volunteer_log.xml" value="0.3591485507246377" />
<entry key="modulecultural/src/main/res/layout/item_volunteer_activity.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/activity_choose_city.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/activity_login.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/activity_main.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/activity_news_detail.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/activity_splash.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/fragment_home.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/item_main_func_net.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/item_news_main.xml" value="0.2504528985507246" />
<entry key="modulemain/src/main/res/layout/item_news_no_pic.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/menu/bottom.xml" value="0.3651041666666667" />
<entry key="modulemine/src/main/res/layout/fragment_mine_main.xml" value="0.2504528985507246" />
<entry key="moduleplace/src/main/res/layout/activity_distine_booking.xml" value="0.3591485507246377" />
<entry key="moduleplace/src/main/res/layout/fragment_place_main.xml" value="0.3591485507246377" />
</map>
</option>
</component>

1
app/src/main/java/com/tengshisoft/jncultural/BaseMyApplication.java
View File

@ -8,6 +8,7 @@ import com.baidu.mapapi.CoordType;
import com.baidu.mapapi.SDKInitializer;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.scwang.smart.refresh.layout.listener.DefaultRefreshHeaderCreator;
import com.sucstepsoft.cm_utils.core.widget.refresh.BezierCircleHeader;
import androidx.multidex.MultiDex;

BIN
app/src/main/res/drawable-xhdpi/app_logo.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 27 KiB

2
app/src/main/res/values/strings.xml
View File

@ -1,3 +1,3 @@
<resources>
<string name="app_name">乌兰察布数字文化云</string>
<string name="app_name">乌兰察布文旅体云</string>
</resources>

1
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/CustomDialog.java
View File

@ -13,7 +13,6 @@ import android.view.WindowManager;
import android.widget.TextView;
import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.core.widget.refresh.CustomRefreshHeader;
/**
* 作者: adam

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_ask_blue_icon.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_award_blue_icon.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 B

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_people_icon_blue.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 976 B

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_phone_blue_line.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

3
cm_utils/src/main/res/layout/fragment_base.xml
View File

@ -11,9 +11,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.sucstepsoft.cm_utils.core.widget.refresh.CustomRefreshHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/fl_fragment_content"

1
moduleactivity/src/main/java/com/tengshisoft/moduleactivity/adapter/ActivityMineAdapter.java
View File

@ -5,6 +5,7 @@ import android.text.Layout;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;

6
moduleactivity/src/main/res/layout/fragment_activity_main.xml
View File

@ -49,10 +49,10 @@
<ProgressBar
android:id="@+id/pb_loading"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading_pic" />
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_empty"

2
moduleactivity/src/main/res/layout/item_activity_list_mine.xml
View File

@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:scaleType="fitXY"
tools:src="@drawable/ic_img_default" />
tools:src="@drawable/ic_img_default_banner" />
<TextView

11
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerActivityDetailActivity.java
View File

@ -63,10 +63,6 @@ public class VolunteerActivityDetailActivity extends BaseActivity {
Banner mBanner;
@BindView(R2.id.tv_activity_title)
TypeFaceTextView mTvActivityTitle;
@BindView(R2.id.iv_time)
ImageView mIvTime;
@BindView(R2.id.tv_time_title)
TextView mTvTimeTitle;
@BindView(R2.id.tv_time_content)
TextView mTvTimeContent;
@BindView(R2.id.iv_peo_ico)
@ -112,8 +108,9 @@ public class VolunteerActivityDetailActivity extends BaseActivity {
public void initData() {
super.initData();
mBind = ButterKnife.bind(this);
ImmersionBar.with(this).init();
setStatusTr("详情");
// ImmersionBar.with(this).init();
// setStatusTr("详情");
mTvBaseTitle.setText("活动详情");
refreshView(STATE_LOAD_LOADING);
mId = getIntent().getStringExtra("id");
mType = getIntent().getStringExtra("type");
@ -432,7 +429,7 @@ public class VolunteerActivityDetailActivity extends BaseActivity {
mWebView = new WebView(mActivity);
mWebView.getSettings().setJavaScriptEnabled(true);
mWebView.getSettings().setDefaultTextEncodingName("utf-8");
mWebView.getSettings().setBlockNetworkImage(true);
mWebView.getSettings().setBlockNetworkImage(false);
mWebView.loadData(detailBean.getIntroduce(), "text/html", "utf-8");
mLlDetailDesc.addView(mWebView);//简介
}

6
modulecultural/src/main/res/layout/activity_cultural_legacy.xml
View File

@ -51,10 +51,10 @@
<ProgressBar
android:id="@+id/pb_loading"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading_pic" />
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_empty"

88
modulecultural/src/main/res/layout/activity_volunteer_detail.xml
View File

@ -19,7 +19,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="-8dp"
android:layout_marginRight="10dp"
android:background="@drawable/shape_topright_topleft">
<LinearLayout
@ -28,25 +30,41 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_activity_title"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="10dp"
android:textColor="#242424"
android:textSize="18sp"
app:text_type_cus="1"
tools:text="活动标题活动标题活动标题活动标题活动标题" />
android:orientation="vertical"
android:padding="10dp">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_activity_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#242424"
android:textSize="18sp"
app:text_type_cus="1"
tools:text="活动标题活动标题活动标题活动标题活动标题" />
<TextView
android:id="@+id/tv_time_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="#242424"
android:textSize="10sp"
tools:text="2019-07-02至20123412341234" />
</LinearLayout>
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/shape_re_red"
android:layout_marginTop="10dp"
android:background="@drawable/sel_btn_verify"
android:padding="4dp"
android:textColor="#9F1512"
android:textColor="@color/white"
tools:text="报名截止" />
</LinearLayout>
@ -65,48 +83,12 @@
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="#FBFBFB" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="center_vertical">
<ImageView
android:id="@+id/iv_time"
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_icon_clock" />
<TextView
android:id="@+id/tv_time_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_toRightOf="@id/iv_time"
android:text="活动时间:"
android:textColor="#BBBBBB"
android:textSize="10sp" />
<TextView
android:id="@+id/tv_time_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/tv_time_title"
android:textColor="#242424"
android:textSize="10sp"
tools:text="2019-07-02至20123412341234" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
@ -118,7 +100,7 @@
android:id="@+id/iv_peo_ico"
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_icon_people" />
android:src="@drawable/ic_people_icon_blue" />
<TextView
android:id="@+id/tv_peo_tile"
@ -150,7 +132,7 @@
android:id="@+id/iv_type"
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_icon_people" />
android:src="@drawable/ic_people_icon_blue" />
<TextView
android:id="@+id/tv_type_tile"
@ -213,7 +195,7 @@
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_info_icon" />
android:src="@drawable/ic_ask_blue_icon" />
<TextView
android:layout_width="wrap_content"
@ -242,7 +224,7 @@
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_info_icon" />
android:src="@drawable/ic_award_blue_icon" />
<TextView
android:layout_width="wrap_content"
@ -271,7 +253,7 @@
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_icon_people" />
android:src="@drawable/ic_people_icon_blue" />
<TextView
android:layout_width="wrap_content"
@ -300,7 +282,7 @@
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:src="@drawable/ic_icon_phone" />
android:src="@drawable/ic_phone_blue_line"/>
<TextView
android:layout_width="wrap_content"
@ -338,10 +320,6 @@
android:orientation="horizontal"
android:padding="10dp">
<View
android:layout_width="3dp"
android:layout_height="14dp"
android:background="@color/app_title" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="0dp"

7
modulecultural/src/main/res/layout/activity_volunteer_log.xml
View File

@ -31,11 +31,10 @@
<ProgressBar
android:id="@+id/pb_loading"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading_pic" />
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_empty_data"
android:layout_width="100dp"

2
modulecultural/src/main/res/layout/item_volunteer_activity.xml
View File

@ -23,7 +23,7 @@
android:id="@+id/iv_cover"
android:layout_width="match_parent"
android:layout_height="200dp"
android:scaleType="fitCenter"
android:scaleType="fitXY"
tools:src="@drawable/ic_img_load_error" />

3
modulemain/src/main/java/com/tengshisoft/mudulemain/jncultural/activitys/base/ChooseCityActivity.java
View File

@ -2,6 +2,7 @@ package com.tengshisoft.mudulemain.jncultural.activitys.base;
import android.app.ProgressDialog;
import android.content.Intent;
import android.graphics.Color;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@ -32,6 +33,7 @@ import java.util.List;
import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -93,6 +95,7 @@ public class ChooseCityActivity extends BaseActivity {
mTvBaseTitle.setText("地区选择");
mTvPublish.setVisibility(View.VISIBLE);
mTvPublish.setText("确定");
mTvPublish.setTextColor(Color.BLACK);
mTvCurrentArea.setText(mCurrentCityName);
mType = getIntent().getStringExtra("type");
mTvPublish.setOnClickListener(v -> doChooseArea());

BIN
modulemain/src/main/res/drawable-xhdpi/app_logo.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
modulemain/src/main/res/drawable-xhdpi/app_logo_smal.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
modulemain/src/main/res/drawable-xhdpi/bg_login.jpg Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 343 KiB

BIN
modulemain/src/main/res/drawable-xhdpi/ic_login_bg_title.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 677 KiB

After

Width:  |  Height:  |  Size: 312 KiB

18
modulemain/src/main/res/layout/activity_login.xml
View File

@ -21,7 +21,18 @@
android:layout_width="141dp"
android:layout_height="128dp"
android:layout_centerInParent="true"
android:background="@drawable/ic_login_title_icon" />
android:background="@drawable/ic_login_title_icon"
android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:text="乌兰察布市\n文化旅游体育服务云"
android:textColor="@color/white"
android:textSize="25sp"
android:textStyle="bold" />
</RelativeLayout>
<androidx.cardview.widget.CardView
@ -127,7 +138,10 @@
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_marginTop="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/sel_btn_login"
android:clickable="true"
android:focusable="true"

2
modulemain/src/main/res/values/strings.xml
View File

@ -1,6 +1,6 @@
<resources>
<string name="app_name">cultural</string>
<string name="app_title">乌兰察布市数字文化云</string>
<string name="app_title">乌兰察布文旅体云</string>
<string name="demo_name_layers">图层展示</string>
<string name="demo_title_layers">图层展示--LayersDemo</string>
<string name="demo_desc_layers">展示普通图、卫星图、交通流量图及百度城市热力图</string>

3
modulemine/src/main/res/layout/fragment_mine_main.xml
View File

@ -105,7 +105,8 @@
android:paddingLeft="30dp"
android:text="服务专线:0892-8830972"
android:textColor="@color/text_black_122"
android:textSize="15sp" />
android:textSize="15sp"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

6
moduleplace/src/main/res/layout/activity_distine_booking.xml
View File

@ -117,10 +117,10 @@
<ProgressBar
android:id="@+id/pb_content_loading"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading_pic" />
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_content_empty_data"

6
moduleplace/src/main/res/layout/fragment_place_main.xml
View File

@ -99,10 +99,10 @@
<ProgressBar
android:id="@+id/pb_fragment_place_loading"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading_pic" />
android:indeterminateDrawable="@drawable/anim_loading" />
<ImageView
android:id="@+id/iv_fragment_place_empty_data"