diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java index 30d1093..dba547c 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java @@ -112,6 +112,7 @@ public class PathConfig { public static final String PATH_MODULE_MAIN_NEWS_WEB = "/modulemain/activity/newsweb";//连接新闻页 public static final String PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE = "/modulemain/activity/newsInterface";//新闻详情页面-接口方式 public static final String PATH_MODULE_MAIN_NEWS_SEARCH = "/modulemain/activity/newsSearch";//新闻收搜 + public static final String PATH_MODULE_MAIN_COMMON_SEARCH = "/modulemain/activity/commonSearch"; //======================Map================================================== public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图 public static final String PATH_MODULE_MAP_SHOW_ICON = "/modulemap/activity/showicon";//文化地图 @@ -276,4 +277,5 @@ public class PathConfig { public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER_DETAIL = "/moduleshop/activity/shopOrderDetail";//我的订单 public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADD_ADDRESS = "/moduleshop/activity/shopAddAddress";//新增收货地 + } diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/listener/SimpleTextWatch.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/listener/SimpleTextWatch.java new file mode 100644 index 0000000..e36b957 --- /dev/null +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/listener/SimpleTextWatch.java @@ -0,0 +1,16 @@ +package com.sucstepsoft.cm_utils.core.listener; + +import android.text.Editable; +import android.text.TextWatcher; + +public abstract class SimpleTextWatch implements TextWatcher { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void afterTextChanged(Editable s) { + + } +} 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..f9b4adb 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 @@ -98,7 +98,13 @@ public abstract class BaseActivity extends AppCompatActivity { protected TypeFaceTextView mTvAppBack; protected LinearLayout mLlBaseSearch; protected EditText mEtBaseSearch; - private LinearLayout mLlBaseTitle; + protected LinearLayout mLlBaseTitle; + protected LinearLayout mLlSearchBar; + protected Button mBtnSearchBack; + protected EditText mEtSearchBar; + protected ImageView mIvSearchClear; + protected ImageView mIvSearchBtn; + // protected BoomMenuButton mBbMenu; @Override @@ -279,6 +285,18 @@ public abstract class BaseActivity extends AppCompatActivity { * 初始化标题布局 */ private void baseActivityInitViews() { + //搜索栏 + mLlSearchBar = findViewById(R.id.ll_base_search_bar); + //搜索返回按钮 + mBtnSearchBack = findViewById(R.id.btn_search_back); + mBtnSearchBack.setOnClickListener(v -> finish()); + //搜索输入框 + 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/java/com/sucstepsoft/cm_utils/core/widget/base/BaseFragment.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseFragment.java index b1024e2..f0cbb86 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseFragment.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseFragment.java @@ -18,8 +18,16 @@ import androidx.fragment.app.Fragment; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.sucstepsoft.cm_utils.R; +import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean; +import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; +import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService; import com.sucstepsoft.cm_utils.utils.UserLgUtils; +import io.reactivex.Observer; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + public abstract class BaseFragment extends Fragment { public static final int STATE_LOAD = 1234;//加载中 public static final int STATE_ERROR = 1235;//加载失败 @@ -138,6 +146,39 @@ public abstract class BaseFragment extends Fragment { } } + public void setKeywords(String key) { + + } + + protected void bigDataRead(String params) { + RetrofitManager.getInstance() + .create(BaseApiService.class) + .bigDataRead(params) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(BaseSuccessBean baseSuccessBean) { + + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onComplete() { + + } + }); + } + public Context getApplicationContext() { return context; } diff --git a/cm_utils/src/main/res/layout/base_activity.xml b/cm_utils/src/main/res/layout/base_activity.xml index c9223d4..b1dae42 100755 --- a/cm_utils/src/main/res/layout/base_activity.xml +++ b/cm_utils/src/main/res/layout/base_activity.xml @@ -9,7 +9,71 @@ + android:layout_height="wrap_content" + android:orientation="vertical"> + + + +