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

gradle添加cityName

Browse Source
This commit is contained in:
itgaojian 2023-03-10 18:05:25 +08:00
parent d26d2782b4
commit 6250712cb5
6 changed files with 105 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java
View File

@ -317,7 +317,7 @@ public interface BaseApiService {
/** /**
* 大数据-浏览量 * 大数据-浏览量
* 详情浏览量 (网页|安卓|小程序)[a-zA-Z0-9-]{36}(新闻|活动|非遗|场馆|直播|志愿) 我后台正则是这样的 * 详情浏览量 (网页|安卓|小程序)[a-zA-Z0-9-]{36}(新闻|活动|非遗|场馆|直播|志愿) 我后台正则是这样的
* 搜索词 安卓QUERY要搜索的内容END * 搜索词 (网页|安卓|小程序)QUERY.*(新闻|活动|非遗|场馆|直播|志愿)
* *
* @return * @return
*/ */

16
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java
View File

@ -99,6 +99,11 @@ public abstract class BaseActivity extends AppCompatActivity {
protected LinearLayout mLlBaseSearch; protected LinearLayout mLlBaseSearch;
protected EditText mEtBaseSearch; protected EditText mEtBaseSearch;
private LinearLayout mLlBaseTitle; private LinearLayout mLlBaseTitle;
private LinearLayout mLlSearchBar;
private Button mBtnSearchBack;
private EditText mEtSearchBar;
private ImageView mIvSearchClear;
private ImageView mIvSearchBtn;
// protected BoomMenuButton mBbMenu; // protected BoomMenuButton mBbMenu;
@Override @Override
@ -279,6 +284,17 @@ public abstract class BaseActivity extends AppCompatActivity {
* 初始化标题布局 * 初始化标题布局
*/ */
private void baseActivityInitViews() { private void baseActivityInitViews() {
//搜索栏
mLlSearchBar = findViewById(R.id.ll_base_search_bar);
//搜索返回按钮
mBtnSearchBack = findViewById(R.id.btn_search_back);
//搜索输入框
mEtSearchBar = findViewById(R.id.et_search_bar);
//搜索清除
mIvSearchClear = findViewById(R.id.iv_search_clear);
//搜索按钮
mIvSearchBtn = findViewById(R.id.iv_search_btn);
mLlTitleBar = findViewById(R.id.ll_title_bar); mLlTitleBar = findViewById(R.id.ll_title_bar);
mRlTrTitleBar = findViewById(R.id.rl_tr_app_title); mRlTrTitleBar = findViewById(R.id.rl_tr_app_title);
mBtnTrBack = findViewById(R.id.ib_tr_app_back); mBtnTrBack = findViewById(R.id.ib_tr_app_back);

BIN
cm_utils/src/main/res/drawable-xhdpi/ic_back_black_ar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 604 B

71
cm_utils/src/main/res/layout/base_activity.xml
View File

@ -9,13 +9,74 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_title_bar" android:id="@+id/ll_title_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="vertical">
<!--搜索栏-->
<LinearLayout
android:id="@+id/ll_base_search_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
android:visibility="gone"
android:gravity="center_vertical">
<Button
android:id="@+id/btn_search_back"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_centerInParent="true"
android:layout_marginLeft="10dp"
android:background="@drawable/ic_back_black_ar"
android:scaleType="fitXY" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search_icon" />
<EditText
android:id="@+id/et_search_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:background="@null"
android:hint="请输入要查询的内容"
android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/iv_search_clear"
android:layout_width="15dp"
android:layout_height="15dp"
android:visibility="invisible"
android:src="@drawable/ic_clear_edit" />
</LinearLayout>
<ImageView
android:id="@+id/iv_search_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/ic_search_icon" />
</LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_title_bar" android:id="@+id/rl_title_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@color/transparent"> android:background="@color/transparent"
android:visibility="visible"
tools:visibility="visible">
<RelativeLayout <RelativeLayout
@ -212,8 +273,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
tools:background="@color/app_title">
<FrameLayout <FrameLayout
android:id="@+id/fl_app_content" android:id="@+id/fl_app_content"
@ -228,7 +288,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:background="@color/transparent"> android:background="@color/transparent"
android:visibility="gone">
<Button <Button
android:id="@+id/ib_tr_app_back" android:id="@+id/ib_tr_app_back"

18
common.gradle
View File

@ -25,6 +25,7 @@ project.ext {
resValue("string", "APP_CHANNEL", "sangzhuzi") resValue("string", "APP_CHANNEL", "sangzhuzi")
resValue("string", "CITY_CODE", "540202000000") resValue("string", "CITY_CODE", "540202000000")
resValue("string", "CITY_ID", "640676") resValue("string", "CITY_ID", "640676")
resValue("string", "CITY_NAME", "桑珠孜区")
manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi", manifestPlaceholders = [CHANNEL_VALUE: "sangzhuzi",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "640676", CITY_ID : "640676",
@ -38,6 +39,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "nanmulin" resValue "string", "APP_CHANNEL", "nanmulin"
resValue("string", "CITY_CODE", "540221000000") resValue("string", "CITY_CODE", "540221000000")
resValue("string", "CITY_ID", "640865") resValue("string", "CITY_ID", "640865")
resValue("string", "CITY_NAME", "南木林县")
manifestPlaceholders = [CHANNEL_VALUE: "nanmulin", manifestPlaceholders = [CHANNEL_VALUE: "nanmulin",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "640865", CITY_ID : "640865",
@ -51,6 +53,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "jiangzi" resValue "string", "APP_CHANNEL", "jiangzi"
resValue("string", "CITY_CODE", "540222000000") resValue("string", "CITY_CODE", "540222000000")
resValue("string", "CITY_ID", "641029") resValue("string", "CITY_ID", "641029")
resValue("string", "CITY_NAME", "江孜县")
manifestPlaceholders = [CHANNEL_VALUE: "jiangzi", manifestPlaceholders = [CHANNEL_VALUE: "jiangzi",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641029", CITY_ID : "641029",
@ -64,6 +67,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "dingri" resValue "string", "APP_CHANNEL", "dingri"
resValue("string", "CITY_CODE", "540223000000") resValue("string", "CITY_CODE", "540223000000")
resValue("string", "CITY_ID", "641204") resValue("string", "CITY_ID", "641204")
resValue("string", "CITY_NAME", "定日县")
manifestPlaceholders = [CHANNEL_VALUE: "dingri", manifestPlaceholders = [CHANNEL_VALUE: "dingri",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641204", CITY_ID : "641204",
@ -77,6 +81,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "sajia" resValue "string", "APP_CHANNEL", "sajia"
resValue("string", "CITY_CODE", "540224000000") resValue("string", "CITY_CODE", "540224000000")
resValue("string", "CITY_ID", "641393") resValue("string", "CITY_ID", "641393")
resValue("string", "CITY_NAME", "萨迦县")
manifestPlaceholders = [CHANNEL_VALUE: "sajia", manifestPlaceholders = [CHANNEL_VALUE: "sajia",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641393", CITY_ID : "641393",
@ -90,6 +95,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "lazi" resValue "string", "APP_CHANNEL", "lazi"
resValue("string", "CITY_CODE", "540225000000") resValue("string", "CITY_CODE", "540225000000")
resValue("string", "CITY_ID", "641512") resValue("string", "CITY_ID", "641512")
resValue("string", "CITY_NAME", "拉孜县")
manifestPlaceholders = [CHANNEL_VALUE: "lazi", manifestPlaceholders = [CHANNEL_VALUE: "lazi",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641512", CITY_ID : "641512",
@ -103,6 +109,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "angren" resValue "string", "APP_CHANNEL", "angren"
resValue("string", "CITY_CODE", "540226000000") resValue("string", "CITY_CODE", "540226000000")
resValue("string", "CITY_ID", "641622") resValue("string", "CITY_ID", "641622")
resValue("string", "CITY_NAME", "昂仁县")
manifestPlaceholders = [CHANNEL_VALUE: "angren", manifestPlaceholders = [CHANNEL_VALUE: "angren",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641622", CITY_ID : "641622",
@ -116,6 +123,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "xietongmen" resValue "string", "APP_CHANNEL", "xietongmen"
resValue("string", "CITY_CODE", "540227000000") resValue("string", "CITY_CODE", "540227000000")
resValue("string", "CITY_ID", "641825") resValue("string", "CITY_ID", "641825")
resValue("string", "CITY_NAME", "谢通门县")
manifestPlaceholders = [CHANNEL_VALUE: "xietongmen", manifestPlaceholders = [CHANNEL_VALUE: "xietongmen",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641825", CITY_ID : "641825",
@ -129,6 +137,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "bailang" resValue "string", "APP_CHANNEL", "bailang"
resValue("string", "CITY_CODE", "540228000000") resValue("string", "CITY_CODE", "540228000000")
resValue("string", "CITY_ID", "641940") resValue("string", "CITY_ID", "641940")
resValue("string", "CITY_NAME", "白朗县")
manifestPlaceholders = [CHANNEL_VALUE: "bailang", manifestPlaceholders = [CHANNEL_VALUE: "bailang",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "641940", CITY_ID : "641940",
@ -142,6 +151,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "renbu" resValue "string", "APP_CHANNEL", "renbu"
resValue("string", "CITY_CODE", "540229000000") resValue("string", "CITY_CODE", "540229000000")
resValue("string", "CITY_ID", "642063") resValue("string", "CITY_ID", "642063")
resValue("string", "CITY_NAME", "仁布县")
manifestPlaceholders = [CHANNEL_VALUE: "renbu", manifestPlaceholders = [CHANNEL_VALUE: "renbu",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642063", CITY_ID : "642063",
@ -155,6 +165,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "kangma" resValue "string", "APP_CHANNEL", "kangma"
resValue("string", "CITY_CODE", "540230000000") resValue("string", "CITY_CODE", "540230000000")
resValue("string", "CITY_ID", "642146") resValue("string", "CITY_ID", "642146")
resValue("string", "CITY_NAME", "康马县")
manifestPlaceholders = [CHANNEL_VALUE: "kangma", manifestPlaceholders = [CHANNEL_VALUE: "kangma",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642146", CITY_ID : "642146",
@ -168,6 +179,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "dingjie" resValue "string", "APP_CHANNEL", "dingjie"
resValue("string", "CITY_CODE", "540231000000") resValue("string", "CITY_CODE", "540231000000")
resValue("string", "CITY_ID", "642203") resValue("string", "CITY_ID", "642203")
resValue("string", "CITY_NAME", "定结县")
manifestPlaceholders = [CHANNEL_VALUE: "dingjie", manifestPlaceholders = [CHANNEL_VALUE: "dingjie",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642203", CITY_ID : "642203",
@ -181,6 +193,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "zhongba" resValue "string", "APP_CHANNEL", "zhongba"
resValue("string", "CITY_CODE", "540232000000") resValue("string", "CITY_CODE", "540232000000")
resValue("string", "CITY_ID", "642284") resValue("string", "CITY_ID", "642284")
resValue("string", "CITY_NAME", "仲巴县")
manifestPlaceholders = [CHANNEL_VALUE: "zhongba", manifestPlaceholders = [CHANNEL_VALUE: "zhongba",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642284", CITY_ID : "642284",
@ -194,6 +207,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "yadong" resValue "string", "APP_CHANNEL", "yadong"
resValue("string", "CITY_CODE", "540233000000") resValue("string", "CITY_CODE", "540233000000")
resValue("string", "CITY_ID", "642356") resValue("string", "CITY_ID", "642356")
resValue("string", "CITY_NAME", "亚东县")
manifestPlaceholders = [CHANNEL_VALUE: "yadong", manifestPlaceholders = [CHANNEL_VALUE: "yadong",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642356", CITY_ID : "642356",
@ -207,6 +221,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "jilong" resValue "string", "APP_CHANNEL", "jilong"
resValue("string", "CITY_CODE", "540234000000") resValue("string", "CITY_CODE", "540234000000")
resValue("string", "CITY_ID", "642389") resValue("string", "CITY_ID", "642389")
resValue("string", "CITY_NAME", "吉隆县")
manifestPlaceholders = [CHANNEL_VALUE: "jilong", manifestPlaceholders = [CHANNEL_VALUE: "jilong",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642389", CITY_ID : "642389",
@ -220,6 +235,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "nielamu" resValue "string", "APP_CHANNEL", "nielamu"
resValue("string", "CITY_CODE", "540235000000") resValue("string", "CITY_CODE", "540235000000")
resValue("string", "CITY_ID", "642437") resValue("string", "CITY_ID", "642437")
resValue("string", "CITY_NAME", "聂拉木县")
manifestPlaceholders = [CHANNEL_VALUE: "nielamu", manifestPlaceholders = [CHANNEL_VALUE: "nielamu",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642437", CITY_ID : "642437",
@ -233,6 +249,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "saga" resValue "string", "APP_CHANNEL", "saga"
resValue("string", "CITY_CODE", "540236000000") resValue("string", "CITY_CODE", "540236000000")
resValue("string", "CITY_ID", "642489") resValue("string", "CITY_ID", "642489")
resValue("string", "CITY_NAME", "萨嘎县")
manifestPlaceholders = [CHANNEL_VALUE: "saga", manifestPlaceholders = [CHANNEL_VALUE: "saga",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642489", CITY_ID : "642489",
@ -246,6 +263,7 @@ project.ext {
resValue "string", "APP_CHANNEL", "gangba" resValue "string", "APP_CHANNEL", "gangba"
resValue("string", "CITY_CODE", "540237000000") resValue("string", "CITY_CODE", "540237000000")
resValue("string", "CITY_ID", "642536") resValue("string", "CITY_ID", "642536")
resValue("string", "CITY_NAME", "岗巴县")
manifestPlaceholders = [CHANNEL_VALUE: "gangba", manifestPlaceholders = [CHANNEL_VALUE: "gangba",
APP_LOGO : "@drawable/app_logo", APP_LOGO : "@drawable/app_logo",
CITY_ID : "642536", CITY_ID : "642536",

5
moduleactivity/src/main/java/com/tengshisoft/moduleactivity/activity/ActivityMainActivity.java
View File

@ -78,7 +78,10 @@ public class ActivityMainActivity extends BaseActivity {
@Override @Override
public void initData() { public void initData() {
mBind = ButterKnife.bind(this); mBind = ButterKnife.bind(this);
mTvBaseTitle.setText("活动主页"); // mTvBaseTitle.setText("精彩活动");
mRlTitleBar1.setVisibility(View.GONE);
mRlTitleBar.setVisibility(View.GONE);
refreshView(STATE_LOAD_LOADING); refreshView(STATE_LOAD_LOADING);
mTypeface = Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF"); mTypeface = Typeface.createFromAsset(mActivity.getAssets(), "fonts/zhangti.TTF");
mDatas = new ArrayList<>(); mDatas = new ArrayList<>();