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 0000000..7cc009b Binary files /dev/null and b/cm_utils/src/main/res/drawable-xhdpi/ic_back_black_ar.png differ diff --git a/cm_utils/src/main/res/layout/base_activity.xml b/cm_utils/src/main/res/layout/base_activity.xml index c9223d4..63e8918 100755 --- a/cm_utils/src/main/res/layout/base_activity.xml +++ b/cm_utils/src/main/res/layout/base_activity.xml @@ -9,13 +9,74 @@ + android:layout_height="wrap_content" + android:orientation="vertical"> + + + +