Accept Pull Request #808 : (ashuo:merged -> coding:merge410)

Pull Request: 项目内外筛选 修复bug
Created By: @阿朔
Accepted By: @陈超
URL: https://coding.net/u/coding/p/Coding-Android/git/pull/808

Author: cxc0618

app/src/main/java/net/coding/program/common/DrawerLayoutHelper.java

@@ -85,7 +85,8 @@ public void onDrawerStateChanged(int newState) {
 
 
         reset.setOnClickListener(v -> {
-            if (filterListener != null) {
+            //假如有搜索条件才重置
+            if (filterListener != null && (!TextUtils.isEmpty(filterModel.keyword) || !TextUtils.isEmpty(filterModel.label) || filterModel.status != 0)) {
                 filterListener.callback(new FilterModel());
             }
             dismiss();
@@ -113,9 +114,9 @@ public boolean onTouch(View v, MotionEvent event) {
     private EditText initKeyword(FilterListener filterListener) {
         EditText etSearch = (EditText) drawerLayout.findViewById(R.id.et_search);
 
-        if (mFilterModel != null && !TextUtils.isEmpty(mFilterModel.keyword)) {
-            mFilterModel.keyword = "";
-        }
+//        if (mFilterModel != null && !TextUtils.isEmpty(mFilterModel.keyword)) {
+//            mFilterModel.keyword = "";
+//        }
         etSearch.setText("");
         etSearch.setOnEditorActionListener((v, actionId, event) -> {
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {