From 6250712cb5dfdd02df5410b4201fb2ef7831500a Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 10 Mar 2023 18:05:25 +0800 Subject: [PATCH] =?UTF-8?q?gradle=E6=B7=BB=E5=8A=A0cityName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/retrofit_net/api/BaseApiService.java | 2 +- .../core/widget/base/BaseActivity.java | 16 ++++ .../res/drawable-xhdpi/ic_back_black_ar.png | Bin 0 -> 604 bytes .../src/main/res/layout/base_activity.xml | 71 ++++++++++++++++-- common.gradle | 18 +++++ .../activity/ActivityMainActivity.java | 5 +- 6 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 cm_utils/src/main/res/drawable-xhdpi/ic_back_black_ar.png diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java index d1d7f6a..cb396f0 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java @@ -317,7 +317,7 @@ public interface BaseApiService { /** * 大数据-浏览量 * 详情浏览量 (网页|安卓|小程序)[a-zA-Z0-9-]{36}(新闻|活动|非遗|场馆|直播|志愿) 我后台正则是这样的 - * 搜索词 安卓QUERY要搜索的内容END + * 搜索词 (网页|安卓|小程序)QUERY.*(新闻|活动|非遗|场馆|直播|志愿) * * @return */ diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java index 2b46895..e2c14bc 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java @@ -99,6 +99,11 @@ public abstract class BaseActivity extends AppCompatActivity { protected LinearLayout mLlBaseSearch; protected EditText mEtBaseSearch; private LinearLayout mLlBaseTitle; + private LinearLayout mLlSearchBar; + private Button mBtnSearchBack; + private EditText mEtSearchBar; + private ImageView mIvSearchClear; + private ImageView mIvSearchBtn; // protected BoomMenuButton mBbMenu; @Override @@ -279,6 +284,17 @@ public abstract class BaseActivity extends AppCompatActivity { * 初始化标题布局 */ 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); mRlTrTitleBar = findViewById(R.id.rl_tr_app_title); mBtnTrBack = findViewById(R.id.ib_tr_app_back); diff --git a/cm_utils/src/main/res/drawable-xhdpi/ic_back_black_ar.png b/cm_utils/src/main/res/drawable-xhdpi/ic_back_black_ar.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc009b916b4bbfe6580d96c981692b1cf64652f GIT binary patch literal 604 zcmV-i0;BzjP)Px%7D+@wRA@u(nCog3K@f#cJx^7?jyDn{#!E05G-5=|kBBIE!}}dYykVZFtDmQ2 zU>BC%4%Si`O)$k^nOw648AC_i95F2N01v03I$FR~4ctfQZ}z@HmosHHcyW&bfUvdlnIY zsHzWY%|a0X5!nOqa#^IA-3}qd5-G+r7{EEVYi4hj6%o z@2TqR+Ty$Zy#bi{5)plhIKSh)|2T&D-T)$U0l=4t$Zb{qI+ple0L*-zh`vQcZmR0f zF~w&Ch{y(j9}$sfRP}gl@mT=Oe3poQ*A}U&S#z0GEFz}>jN))DfYSi})ONq?Uj?9R z?3_DiX1{7fR0HUQi^wK`?~@$jxoGFymYJxpQ?dtW`Fl^189TY{M{64B?#TX@TR zAA3ji*(PaC(o-nb$vJn$%swn%GqcMfgcZ0XH9d-Y19W>a^Hm~x8-dsjA-wCMCws{t zfZ1SQ1Mn&WaU+EAB3n`Bg24c@B(4)t?7#nksy@lolvQ2?V3x#908b;k-&NJckNhlw z>xzp3%#t`DqDPTU|NoErx#&qBtIQ!LeXzBV#B`4q*9~6D>qUpSq_EUp4ItI2T6Haf qTF$2SZ3(10RjaNgP|MlWzJCD&wxKb2x&7q;0000 + android:layout_height="wrap_content" + android:orientation="vertical"> + + + +