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 ccf7c20..3b8fd72 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/searchCommon";//公共搜索 //======================Map================================================== public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图 public static final String PATH_MODULE_MAP_SHOW_ICON = "/modulemap/activity/showicon";//文化地图 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..cbb80bf --- /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 e2c14bc..eec82a0 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 @@ -83,13 +83,14 @@ public abstract class BaseActivity extends AppCompatActivity { protected LinearLayout mLlImg;//右边头像加图标 protected ProgressBar mPbLoading; protected ImageView mIvEmptyData; - protected RelativeLayout mRlTitleBar; + protected TextView mTvErrorHint; protected ImageView mIvUserIcon; protected RelativeLayout mRlBack; protected RelativeLayout mRlNotify; protected ImageView mIvNotify; protected TextView mTvNotify; + protected RelativeLayout mRlTitleBar; protected RelativeLayout mRlTitleBar1; private RelativeLayout mRlTrTitleBar; protected Button mBtnTrBack; @@ -98,12 +99,12 @@ public abstract class BaseActivity extends AppCompatActivity { protected TypeFaceTextView mTvAppBack; 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 LinearLayout mLlBaseTitle; + protected LinearLayout mLlSearchBar; + protected Button mBtnSearchBack; + protected EditText mEtSearchBar; + protected ImageView mIvSearchClear; + protected ImageView mIvSearchBtn; // protected BoomMenuButton mBbMenu; @Override @@ -288,6 +289,7 @@ public abstract class BaseActivity extends AppCompatActivity { 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); //搜索清除 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..5b40632 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;//加载失败 @@ -86,6 +94,39 @@ public abstract class BaseFragment extends Fragment { mActivity = getActivity(); } + public void setKeywords(String keywords) { + + } + + 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() { + + } + }); + } + /** * 选择加载状态 * diff --git a/cm_utils/src/main/res/layout/base_activity.xml b/cm_utils/src/main/res/layout/base_activity.xml index 63e8918..121685d 100755 --- a/cm_utils/src/main/res/layout/base_activity.xml +++ b/cm_utils/src/main/res/layout/base_activity.xml @@ -16,8 +16,8 @@ android:id="@+id/ll_base_search_bar" android:layout_width="match_parent" android:layout_height="50dp" - android:visibility="gone" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:visibility="gone">