Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties

app_core/common/src/main/res/layout/activity_data_inquiry_list.xml

@@ -81,7 +81,9 @@
             android:layout_width="match_parent"
             android:layout_height="120dp"
             android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp" />
+            android:layout_marginTop="10dp"
+            android:scrollbars="none"
+            android:overScrollMode="never" />
     </LinearLayout>
 
     <View
@@ -92,18 +94,18 @@
         android:clickable="true"
         android:visibility="gone" />
 
-    <com.core.widget.expandableLayout.ExpandableLayout
-        android:id="@+id/data_inquiry_list_history_ll"
+    <LinearLayout
+        android:id="@+id/data_inquiry_list_fuzzy_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white"
         android:orientation="vertical"
-        app:el_duration="400"
-        app:el_expanded="false">
+        android:visibility="gone">
 
         <LinearLayout
+            android:id="@+id/data_inquiry_list_history_ll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
             android:orientation="vertical">
 
             <LinearLayout
@@ -138,24 +140,25 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/me_menu_item_normal"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
+                android:scrollbars="none"
+                android:overScrollMode="never"/>
+
         </LinearLayout>
 
-    </com.core.widget.expandableLayout.ExpandableLayout>
+    </LinearLayout>
 
-    <com.core.widget.expandableLayout.ExpandableLayout
-        android:id="@+id/data_inquiry_list_option_ll"
+    <LinearLayout
+        android:id="@+id/data_inquiry_list_exact_ll"
         android:layout_width="match_parent"
-        android:layout_height="260dp"
-        android:background="@color/white"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:el_duration="400"
-        app:el_expanded="false">
+        android:visibility="gone">
 
         <LinearLayout
+            android:id="@+id/data_inquiry_list_option_ll"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="260dp"
+            android:background="@color/white"
             android:orientation="vertical">
 
             <ListView
@@ -163,8 +166,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                android:overScrollMode="never"
-                android:scrollbars="none" />
+                android:scrollbars="none"
+                android:overScrollMode="never"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -212,6 +215,6 @@
                     android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
-    </com.core.widget.expandableLayout.ExpandableLayout>
+    </LinearLayout>
 
 </RelativeLayout>

app_core/common/src/main/res/layout/bsetting_activity.xml

@@ -274,7 +274,8 @@
             <RelativeLayout
                 android:id="@+id/room_type_rl"
                 style="@style/IMTbleLine"
-                android:background="@drawable/selector_me_menu_item_bg">
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"
@@ -301,7 +302,8 @@
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg"
                 android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true">
+                android:layout_centerHorizontal="true"
+                android:visibility="gone">
                 <View
                     android:layout_alignParentBottom="true"
                     android:layout_width="match_parent"

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -38,7 +38,7 @@
     <string name="common_noinput">未填写</string>
     <string name="common_camera">拍照</string>
     <string name="common_photo">从相册选择</string>
-    <string name="common_notlinknet">网络未连接</string>
+    <string name="common_notlinknet">当前网络不可用，请稍后重试!</string>
     <string name="common_notice">温馨提示</string>
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -63,13 +63,10 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                 sc_industrycode = array.getJSONObject(0).getString("sc_industrycode");
 
                 if ("餐饮".equals(sc_industry)) {
-                    rTyperl.setVisibility(View.GONE);
                     tableSetRl.setVisibility(View.VISIBLE);
                 }else {
-                    rTyperl.setVisibility(View.GONE);
-                    tableSetRl.setVisibility(View.GONE);
+                    tableSetRl.setVisibility(View.VISIBLE);
                 }
-
             }
         }));
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -93,6 +93,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
+        progressDialog.show();
         initView();
         judgeWhichType();
         String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
@@ -170,6 +171,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
         Log.i("fanglh",sc_industry+"");
+        progressDialog.dismiss();
     }
 
     private void initView() {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/CheckWagesActivity.java

@@ -181,7 +181,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
 
         mTel.setText(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"user_phone"));
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
-        emcode = MyApplication.getInstance().getLoginUserId();
+        emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
 
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FindWagePWActivity.java

@@ -141,7 +141,7 @@ public class FindWagePWActivity extends BaseActivity implements View.OnClickList
         HttpClient httpClient = new HttpClient.Builder("http://192.168.253.58:8080/ERP/").isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("mobile/salary/changePassword.action")
-                .add("emcode", MyApplication.getInstance().getLoginUserId())
+                .add("emcode", CommonUtil.getEmcode())
                 .add("password",mSetpwEt.getText().toString())
                 .add("phone",mPhoneEt.getText().toString())
                 .add("em_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableSetActivity.java

@@ -83,6 +83,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
 //            model.setAs_id("0");
             model.setAs_companyid(as_companyid);
             model.setAs_booknumber("");
+            model.setAs_maxperson("");
             tableList.add(model);
             myAdapter.notifyDataSetChanged();
         }else{
@@ -100,6 +101,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             model.setAs_type(JSON.parseObject(updateData).getString("as_type"));
             model.setAs_remark(JSON.parseObject(updateData).getString("as_remark"));
             model.setAs_booknumber(JSON.parseObject(updateData).getString("as_booknumber"));
+            model.setAs_maxperson(JSON.parseObject(updateData).getString("as_maxperson"));
             tableList.add(model);
             myAdapter.notifyDataSetChanged();
         }
@@ -136,6 +138,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 model.setAs_remark("");
                 model.setAs_id("0");
                 model.setAs_companyid(as_companyid);
+                model.setAs_maxperson("");
+                model.setAs_booknumber("");
                 tableList.add(model);
                 myAdapter.notifyDataSetChanged();
         }else if (id == R.id.save_bt){
@@ -226,7 +230,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
         if (!StringUtil.isEmpty(tableList.get(c_size-1).getAs_deskcode()) &&
                 !StringUtil.isEmpty(tableList.get(c_size-1).getAs_remark()) &&
                 !StringUtil.isEmpty(tableList.get(c_size-1).getAs_number()) &&
-                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())){
+                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())&&
+                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_maxperson())){
             canOrNot = true;
         }else {
             ToastMessage("请输全设置信息");
@@ -268,7 +273,11 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 tableView.number_et = (FormEditText) convertView.findViewById(R.id.number_et);
                 tableView.remark_et = (FormEditText) convertView.findViewById(R.id.remark_et);
                 tableView.days_et = (FormEditText) convertView.findViewById(R.id.days_et);
+                tableView.maxperson_et = (FormEditText) convertView.findViewById(R.id.maxperson_et);
                 convertView.setTag(tableView);
+
+                tableView.maxperson_et.setFocusable(false);
+                tableView.maxperson_et.setKeyListener(null);
                 tableView.type_et.setFocusable(false);
                 tableView.type_et.setKeyListener(null);
                 tableView.deskcode_et.setFocusable(false);
@@ -315,6 +324,12 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     doInput(4,position);
                 }
             });
+            tableView.maxperson_et.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    doInput(5,position);
+                }
+            });
 
             //showdata
             tableView.type_et.setText(modeList.get(position).getAs_type()+"");
@@ -322,11 +337,12 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             tableView.number_et.setText(modeList.get(position).getAs_number()+"");
             tableView.remark_et.setText(modeList.get(position).getAs_remark()+"");
             tableView.days_et.setText(modeList.get(position).getAs_booknumber());
+            tableView.maxperson_et.setText(modeList.get(position).getAs_maxperson()+"");
             return convertView;
         }
 
         class TableView{
-            FormEditText type_et,deskcode_et,number_et,remark_et,days_et;
+            FormEditText type_et,deskcode_et,number_et,remark_et,days_et,maxperson_et;
         }
     }
     private PopupWindow popupWindow = null;
@@ -359,9 +375,15 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
         }else if (type == 4){
             editname_et.setVisibility(View.GONE);
             editname_et2.setVisibility(View.VISIBLE);
-            title_tv.setText("请可被预约量/天");
+            title_tv.setText("请输入可被预约量/天");
             editname_et2.setHint(getString(R.string.common_input));
             editname_et2.setText(tableList.get(position).getAs_booknumber()+"");
+        }else if (type == 5){
+            editname_et.setVisibility(View.GONE);
+            editname_et2.setVisibility(View.VISIBLE);
+            title_tv.setText("请输入最多可坐人数");
+            editname_et2.setHint(getString(R.string.common_input));
+            editname_et2.setText(tableList.get(position).getAs_maxperson()+"");
         }
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
@@ -403,12 +425,20 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     }
                 }else if (type == 4){
                     if (StringUtil.isEmpty(editname_et2.getText().toString())){
-                        ToastMessage("请可被预约量/天");
+                        ToastMessage("请输入可被预约量/天");
                         return;
                     }else {
                         tableList.get(position).setAs_booknumber(editname_et2.getText().toString());
                         myAdapter.notifyDataSetChanged();
                     }
+                }else if (type == 5){
+                    if (StringUtil.isEmpty(editname_et2.getText().toString())){
+                        ToastMessage("请输入最多可坐人数");
+                        return;
+                    }else {
+                        tableList.get(position).setAs_maxperson(editname_et2.getText().toString());
+                        myAdapter.notifyDataSetChanged();
+                    }
                 }
                 popupWindow.dismiss();
             }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -23,6 +23,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
@@ -85,8 +86,9 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     private String phone;
     private TextView wageDateTv;
     private LinearLayout noWageLl;
-    private Boolean haveData = false;
+    private Boolean haveData = true;
     private TextView announcement_tv;
+    private int needSignature;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -106,7 +108,16 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
                 JSONObject dataObject = salaryObject.getJSONObject("data");
                 String gonggao = dataObject.getString("sl_text");
                 if (!StringUtil.isEmpty(gonggao))  announcement_tv.setText(gonggao);
-                    
+
+                needSignature = dataObject.getInteger("sl_signature");
+                if (needSignature == 0) mBtnSignature.setText("确认签收");
+                int sl_result = dataObject.getInteger("sl_result");
+                if (sl_result == 1 || sl_result == -1)
+                    mBtnSignature.setVisibility(View.GONE);
+                else if (sl_result == 0 && haveData)
+                    mBtnSignature.setVisibility(View.VISIBLE);
+
+
                 sl_id = dataObject.getString("sl_id");
                 if (!ListUtils.isEmpty(configsArray) && dataObject != null){
                     for (int i = 0; i < configsArray.size(); i++) {
@@ -138,12 +149,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
-        if (!haveData)
-            mBtnSignature.setVisibility(View.VISIBLE);
-        else
-            mBtnSignature.setVisibility(View.GONE);
 }
 
     private void showEnty() {
@@ -152,7 +157,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void initView() {
-                emcode = MyApplication.getInstance().getLoginUserId();
+                emcode = CommonUtil.getEmcode();
 //        emcode = "U0747";
         master = CommonUtil.getSharedPreferences(ct, "erp_master");
         getSupportActionBar().setTitle("工资查询");
@@ -200,8 +205,10 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.btn_signature){
-            if (haveData)
+            if (haveData && needSignature == 1)
                 showSiganWindow();
+            else if (haveData && needSignature == 0)
+                doNewSubmit(null,null);
             else
                 ToastMessage("暂无工资条数据");
         }else if (v.getId() == R.id.clear_im){
@@ -320,7 +327,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     private void doNewSubmit(Bitmap pathBm, String plainpath) {
         String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
-        byte[] ppp = getBitmapByte(pathBm);
         RequestParams params = new RequestParams();
         params.addBodyParameter("emcode", emcode);
         params.addBodyParameter("sl_id",sl_id);

app_modular/appme/src/main/java/com/uas/appme/settings/model/TableMode.java

@@ -13,6 +13,15 @@ public class TableMode {
     private String as_booknumber;
     private String as_remark;
     private String as_companyid;
+    private String as_maxperson;
+
+    public String getAs_maxperson() {
+        return as_maxperson;
+    }
+
+    public void setAs_maxperson(String as_maxperson) {
+        this.as_maxperson = as_maxperson;
+    }
 
     public String getAs_booknumber() {
         return as_booknumber;

app_modular/appme/src/main/res/layout/table_item.xml

@@ -128,6 +128,39 @@
         android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="@color/item_line" />
+
+    <RelativeLayout
+        style="@style/IMTbleLine2"
+        android:layout_height="50dp"
+        android:background="@color/white">
+        <TextView
+            style="@style/form_relative_left_text"
+            android:text="最多可坐人数"
+            android:layout_marginLeft="0dp"
+            android:textColor="@color/text_main"
+            android:textSize="15sp"/>
+
+        <com.andreabaccega.widget.FormEditText
+            android:id="@+id/maxperson_et"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/dark_dark_grey"
+            android:padding="10dp"
+            android:background="@null"
+            android:hint="@string/common_input"
+            android:textSize="15sp"
+            android:inputType="number"
+            android:gravity="center_vertical|right"
+            android:maxLength="4"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/item_line" />
+
     <RelativeLayout
         style="@style/IMTbleLine2"
         android:minHeight="50dp"

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -8,9 +8,12 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -29,7 +32,6 @@ import com.core.utils.CommonUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
-import com.core.widget.expandableLayout.ExpandableLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appworks.R;
@@ -55,15 +57,13 @@ import java.util.Map;
  */
 
 public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> implements WorkPlatView, View.OnClickListener, View.OnFocusChangeListener {
-    public static final String DEVICE_QUERY_HISTORY_ID = "device_query_history_id";
-    public static final String DEVICE_QUERY_HISTORY_NAME = "device_query_history_name";
     private final int OBTAIN_DEVICE_LIST = 0x11;
 
     private PullToRefreshListView mDataListView;
     private ImageView mTotalImage, mBackImageView, mFilterImageView, mVoiceImageView;
     private View mGrayBackGround;
     private ClearEditText mSearchEditText;
-    private ExpandableLayout mHistoryLayout, mOptionLayout;
+    private LinearLayout mHistoryWholeLl, mOptionWholeLl, mHistoryLayout, mOptionLayout;
     private TextView mClearHistoryTextView, mOptionCancelTextView, mOptionResetTextView, mOptionConfirmTextView;
     private MyListView mHistoryListView;
     private ListView mOptionListView;
@@ -72,14 +72,16 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     private List<HistoricalRecordBean> mHistoricalRecordBeans;
     private HistoricalRecordAdapter mHistoricalRecordAdapter;
     private EmptyLayout mEmptyLayout;
-    private String fuzzyHint = "", mCondition = "1 = 1";
-    private int mPageIndex = 1, mPagesize = 25;
+    private Animation mInAnimation, mOutAnimation;
+
+    private String fuzzyHint = "", mCondition = "1 = 1", mBaseCondition = "";
+    private int mPageIndex = 1, mPageSize = 25;
     private List<DataInquiryFlexBean> mDeviceQueryFlexBeans;
     private DataInquiryFlexAdapter mDeviceQueryFlexAdapter;
     private List<DataInquiryFlexBean.RowBean.RowChildBean> mAllRowChildBeans;
     private String mFuzzyField = "";
     private int mOldPosition = -1;
-    private String mCaller, mClass;
+    private String mCaller = "Device", mClass;
 
     @Override
     protected int getLayout() {
@@ -100,7 +102,9 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         mDataListView = $(R.id.data_inquiry_list_ptlv);
         mTotalImage = $(R.id.data_inquiry_list_total_spread_iv);
         mGrayBackGround = $(R.id.data_inquiry_list_gray_bg);
+        mHistoryWholeLl = $(R.id.data_inquiry_list_fuzzy_ll);
         mHistoryLayout = $(R.id.data_inquiry_list_history_ll);
+        mOptionWholeLl = $(R.id.data_inquiry_list_exact_ll);
         mOptionLayout = $(R.id.data_inquiry_list_option_ll);
         mClearHistoryTextView = $(R.id.data_inquiry_history_clear_tv);
         mHistoryListView = $(R.id.data_inquiry_list_history_data_lv);
@@ -109,6 +113,9 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         mOptionResetTextView = $(R.id.data_inquiry_list_option_reset_tv);
         mOptionConfirmTextView = $(R.id.data_inquiry_list_option_confirm_tv);
 
+        mInAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_search_popin);
+        mOutAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_search_popout);
+
         mTotalImage.setVisibility(View.GONE);
 
         mEmptyLayout = new EmptyLayout(this, mDataListView.getRefreshableView());
@@ -130,6 +137,11 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
             mCaller = intent.getStringExtra(Constants.FLAG.DEVICE_CALLER);
             mClass = intent.getStringExtra(Constants.FLAG.DEVICE_CLASS);
         }
+
+        if (!TextUtils.isEmpty(mClass)) {
+            mBaseCondition = "(dc_class = \'" + mClass + "\')";
+            mCondition = mBaseCondition;
+        }
     }
 
     @Override
@@ -149,6 +161,28 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         mGrayBackGround.setOnClickListener(this);
         mSearchEditText.setOnClickListener(this);
 
+        mOutAnimation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mSearchEditText.clearFocus();
+                mGrayBackGround.setVisibility(View.GONE);
+                mOptionWholeLl.setVisibility(View.GONE);
+                mHistoryWholeLl.setVisibility(View.GONE);
+                mHistoryListView.setEnabled(false);
+                CommonUtil.closeKeybord(mSearchEditText, DeviceQueryActivity.this);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+
         mDataListView.setMode(PullToRefreshBase.Mode.BOTH);
         mDataListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -238,11 +272,13 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         initFuzzyHint();
 
         try {
-            List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(DEVICE_QUERY_HISTORY_ID);
+            List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mCaller);
             if (historicalRecordBeansById.size() > 0) {
                 for (int i = 0; i < historicalRecordBeansById.size(); i++) {
                     if (i < 6) {
                         mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                    } else {
+                        HistoricalRecordDao.getInstance().deleteFromHistoricalRecordByField(mCaller, historicalRecordBeansById.get(i).getSearchField());
                     }
                 }
                 mHistoricalRecordAdapter.notifyDataSetChanged();
@@ -261,10 +297,10 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
 
     private void obtainDeviceList() {
         Map<String, Object> params = new HashMap<>();
-        params.put("caller", "Device");
+        params.put("caller", mCaller);
         params.put("condition", mCondition);
         params.put("page", mPageIndex);
-        params.put("pageSize", mPagesize);
+        params.put("pageSize", mPageSize);
 
         LinkedHashMap<String, Object> header = new LinkedHashMap<>();
         header.put("Cookie", CommonUtil.getErpCookie(mContext));
@@ -294,66 +330,76 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     }
 
     private void initConditions() {
+        if ("Device".equals(mCaller)) {
+            SchemeConditionBean schemeConditionBean
+                    = initCondition("设备类型", "de_type", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+            schemeConditionBean = initCondition("设备种类", "de_kind", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+            schemeConditionBean = initCondition("所属部门", "de_currentcentercode", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+            schemeConditionBean = initCondition("所属线别", "de_currentlinecode", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+            schemeConditionBean = initCondition("使用人员", "de_currentuser", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+            schemeConditionBean = initCondition("设备管理员", "de_manageman", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+            schemeConditionBean = new SchemeConditionBean();
+            schemeConditionBean.setCaption("状态");
+            schemeConditionBean.setField("de_runstatus");
+            schemeConditionBean.setType("CBG");
+
+            List<SchemeConditionBean.Property> properties = new ArrayList<>();
+            SchemeConditionBean.Property property = new SchemeConditionBean.Property();
+            property.setDisplay("闲置中");
+            property.setValue("UNUSED");
+            properties.add(property);
+
+            property = new SchemeConditionBean.Property();
+            property.setDisplay("正常使用");
+            property.setValue("USING");
+            properties.add(property);
+
+            property = new SchemeConditionBean.Property();
+            property.setDisplay("故障中");
+            property.setValue("BREAKIND");
+            properties.add(property);
+
+            property = new SchemeConditionBean.Property();
+            property.setDisplay("已报废");
+            property.setValue("SCRAPPED");
+            properties.add(property);
+
+            property = new SchemeConditionBean.Property();
+            property.setDisplay("已盘亏");
+            property.setValue("LOSSED");
+            properties.add(property);
+
+            schemeConditionBean.setProperties(properties);
+            mConditionBeans.add(schemeConditionBean);
+        } else {
+            SchemeConditionBean schemeConditionBean
+                    = initCondition("申请单号", "dc_code", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
 
-        SchemeConditionBean schemeConditionBean
-                = initCondition("设备类型", "de_type", "S");
-        mConditionBeans.add(schemeConditionBean);
-        mfuzzyConditionBeans.add(schemeConditionBean);
-
-        schemeConditionBean = initCondition("设备种类", "de_kind", "S");
-        mConditionBeans.add(schemeConditionBean);
-        mfuzzyConditionBeans.add(schemeConditionBean);
-
-        schemeConditionBean = initCondition("所属部门", "de_currentcentercode", "S");
-        mConditionBeans.add(schemeConditionBean);
-        mfuzzyConditionBeans.add(schemeConditionBean);
-
-        schemeConditionBean = initCondition("所属线别", "de_currentlinecode", "S");
-        mConditionBeans.add(schemeConditionBean);
-        mfuzzyConditionBeans.add(schemeConditionBean);
-
-        schemeConditionBean = initCondition("使用人员", "de_currentuser", "S");
-        mConditionBeans.add(schemeConditionBean);
-        mfuzzyConditionBeans.add(schemeConditionBean);
-
-        schemeConditionBean = initCondition("设备管理员", "de_manageman", "S");
-        mConditionBeans.add(schemeConditionBean);
-        mfuzzyConditionBeans.add(schemeConditionBean);
-
-        schemeConditionBean = new SchemeConditionBean();
-        schemeConditionBean.setCaption("状态");
-        schemeConditionBean.setField("de_runstatus");
-        schemeConditionBean.setType("CBG");
-
-        List<SchemeConditionBean.Property> properties = new ArrayList<>();
-        SchemeConditionBean.Property property = new SchemeConditionBean.Property();
-        property.setDisplay("闲置中");
-        property.setValue("UNUSED");
-        properties.add(property);
-
-        property = new SchemeConditionBean.Property();
-        property.setDisplay("正常使用");
-        property.setValue("USING");
-        properties.add(property);
-
-        property = new SchemeConditionBean.Property();
-        property.setDisplay("故障中");
-        property.setValue("BREAKIND");
-        properties.add(property);
-
-        property = new SchemeConditionBean.Property();
-        property.setDisplay("已报废");
-        property.setValue("SCRAPPED");
-        properties.add(property);
-
-        property = new SchemeConditionBean.Property();
-        property.setDisplay("已盘亏");
-        property.setValue("LOSSED");
-        properties.add(property);
-
-        schemeConditionBean.setProperties(properties);
-        mConditionBeans.add(schemeConditionBean);
+            schemeConditionBean = initCondition("设备编号", "dc_devcode", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
 
+        }
         try {
             mResetConditionBeans = CommonUtil.deepCopy(mConditionBeans);
         } catch (IOException e) {
@@ -400,17 +446,24 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                         mCondition = mCondition.substring(0, mCondition.length() - 4);
                         mCondition = "(" + mCondition + ")";
                     }
-
+                    if (!TextUtils.isEmpty(mClass)) {
+                        mCondition = mBaseCondition + (TextUtils.isEmpty(mCondition) ? "" : " and " + mCondition);
+                    }
                     Log.d("fuzzyCondition", mCondition);
                 }
 
             } else {
-                mCondition = "1 = 1";
+                if (!TextUtils.isEmpty(mClass)) {
+                    mCondition = mBaseCondition;
+                } else {
+                    mCondition = "1 = 1";
+                }
             }
             mPageIndex = 1;
             mFuzzyField = fuzzyField;
             mSearchEditText.clearFocus();
-            mHistoryLayout.collapse(false);
+            mHistoryWholeLl.setVisibility(View.GONE);
+            mGrayBackGround.setVisibility(View.GONE);
             mHistoryListView.setEnabled(false);
             obtainDeviceList();
         }
@@ -489,14 +542,14 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                      */
                     if (!TextUtils.isEmpty(mFuzzyField)) {
                         HistoricalRecordBean historicalRecordBean = new HistoricalRecordBean();
-                        historicalRecordBean.setSchemeId(DEVICE_QUERY_HISTORY_ID);
-                        historicalRecordBean.setSchemeName(DEVICE_QUERY_HISTORY_NAME);
+                        historicalRecordBean.setSchemeId(mCaller);
+                        historicalRecordBean.setSchemeName(mCaller);
                         historicalRecordBean.setSearchField(mFuzzyField);
                         HistoricalRecordDao.getInstance().saveToHistoricalRecord(historicalRecordBean);
 
                         mHistoricalRecordBeans.clear();
                         List<HistoricalRecordBean> historicalRecordBeansById
-                                = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(DEVICE_QUERY_HISTORY_ID);
+                                = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mCaller);
                         if (historicalRecordBeansById.size() > 0) {
                             for (int i = 0; i < historicalRecordBeansById.size(); i++) {
                                 if (i < 6) {
@@ -586,20 +639,21 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     public void onClick(View view) {
         int i = view.getId();
         if (i == R.id.data_inquiry_filter_iv) {
-            if (mHistoryLayout.isExpanded()) {
-                mHistoryLayout.collapse(false);
+            if (mHistoryWholeLl.getVisibility() == View.VISIBLE) {
+                mHistoryWholeLl.setVisibility(View.GONE);
                 mHistoryListView.setEnabled(false);
             }
             mSearchEditText.clearFocus();
             mFuzzyField = "";
             if (mConditionBeans.size() > 0) {
-                if (mOptionLayout.isExpanded()) {
+                if (mOptionWholeLl.getVisibility() == View.VISIBLE) {
+                    mOptionLayout.startAnimation(mOutAnimation);
                     mGrayBackGround.setVisibility(View.GONE);
-                    mOptionLayout.collapse();
                 } else {
                     mDeviceQueryConditionAdapter.resetTouchPosition();
+                    mOptionLayout.startAnimation(mInAnimation);
+                    mOptionWholeLl.setVisibility(View.VISIBLE);
                     mGrayBackGround.setVisibility(View.VISIBLE);
-                    mOptionLayout.expand();
                 }
             }
         } else if (i == R.id.back) {
@@ -612,14 +666,14 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                 }
             });
         } else if (i == R.id.data_inquiry_history_clear_tv) {
-            HistoricalRecordDao.getInstance().deleteFromHistoricalRecordById(DEVICE_QUERY_HISTORY_ID);
+            HistoricalRecordDao.getInstance().deleteFromHistoricalRecordById(mCaller);
             mHistoricalRecordBeans.clear();
             mHistoricalRecordAdapter.notifyDataSetChanged();
-            mHistoryLayout.collapse(false);
+            mHistoryWholeLl.setVisibility(View.GONE);
             mGrayBackGround.setVisibility(View.GONE);
         } else if (i == R.id.data_inquiry_list_option_cancel_tv) {
             mGrayBackGround.setVisibility(View.GONE);
-            mOptionLayout.collapse();
+            mOptionWholeLl.setVisibility(View.GONE);
             CommonUtil.closeKeybord(mSearchEditText, DeviceQueryActivity.this);
         } else if (i == R.id.data_inquiry_list_option_reset_tv) {
             mConditionBeans.clear();
@@ -644,21 +698,29 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         } else if (i == R.id.data_inquiry_list_gray_bg) {
             CommonUtil.closeKeybord(mSearchEditText, DeviceQueryActivity.this);
             mGrayBackGround.setVisibility(View.GONE);
-            if (mOptionLayout.isExpanded()) {
-                mOptionLayout.collapse();
+            if (mHistoryWholeLl.getVisibility() == View.VISIBLE) {
+                mHistoryLayout.startAnimation(mOutAnimation);
             }
-            if (mHistoryLayout.isExpanded()) {
-                mHistoryLayout.collapse();
+            if (mOptionWholeLl.getVisibility() == View.VISIBLE) {
+                mOptionLayout.startAnimation(mOutAnimation);
             }
         } else if (i == R.id.data_inquiry_filter_et) {
+            if (mOptionWholeLl.getVisibility() == View.VISIBLE) {
+                mOptionWholeLl.setVisibility(View.GONE);
+            }
             if (mHistoricalRecordAdapter.getObjects().size() > 0) {
-                if (!mHistoryLayout.isExpanded()) {
+                if (mGrayBackGround.getVisibility() == View.GONE) {
                     mGrayBackGround.setVisibility(View.VISIBLE);
-                    mHistoryLayout.expand();
+                }
+                if (mHistoryWholeLl.getVisibility() == View.GONE) {
+                    mHistoryWholeLl.setVisibility(View.VISIBLE);
+                    mHistoryLayout.startAnimation(mInAnimation);
                     mHistoryListView.setEnabled(true);
                 }
             } else {
-                mGrayBackGround.setVisibility(View.GONE);
+                if (mGrayBackGround.getVisibility() == View.VISIBLE) {
+                    mGrayBackGround.setVisibility(View.GONE);
+                }
             }
         }
     }
@@ -752,25 +814,29 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
 
         if (mCondition.length() >= 5) {
             mCondition = mCondition.substring(0, mCondition.length() - 5);
+            mCondition = "(" + mCondition + ")";
+        }
+        if (!TextUtils.isEmpty(mClass)) {
+            mCondition = mBaseCondition + (TextUtils.isEmpty(mCondition) ? "" : " and " + mCondition);
         }
-
         Log.d("exactCondition", mCondition);
         mPageIndex = 1;
-        mOptionLayout.collapse(false);
-        progressDialog.show();
+        mOptionWholeLl.setVisibility(View.GONE);
+        mGrayBackGround.setVisibility(View.GONE);
         obtainDeviceList();
     }
 
     @Override
     public void onFocusChange(View view, boolean hasFocus) {
         if (hasFocus) {
-            if (mOptionLayout.isExpanded()) {
-                mOptionLayout.collapse(false);
+            if (mOptionWholeLl.getVisibility() == View.VISIBLE) {
+                mOptionWholeLl.setVisibility(View.GONE);
             }
             if (mHistoricalRecordAdapter.getObjects().size() > 0) {
-                if (!mHistoryLayout.isExpanded()) {
-                    mGrayBackGround.setVisibility(View.VISIBLE);
-                    mHistoryLayout.expand();
+                mGrayBackGround.setVisibility(View.VISIBLE);
+                if (mHistoryWholeLl.getVisibility() == View.GONE) {
+                    mHistoryWholeLl.setVisibility(View.VISIBLE);
+                    mHistoryLayout.startAnimation(mInAnimation);
                     mHistoryListView.setEnabled(true);
                 }
             } else {
@@ -779,10 +845,12 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
 
         } else {
             CommonUtil.closeKeybord(mSearchEditText, DeviceQueryActivity.this);
-            if (mHistoryLayout.isExpanded()) {
-                mHistoryLayout.collapse(false);
+            if (mHistoryWholeLl.getVisibility() == View.VISIBLE) {
+                mHistoryWholeLl.setVisibility(View.GONE);
+                mGrayBackGround.setVisibility(View.GONE);
                 mHistoryListView.setEnabled(false);
             }
+
         }
     }
 }

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -10,6 +10,8 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
 import android.widget.ImageView;
@@ -23,13 +25,11 @@ import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.dao.historical.HistoricalRecordBean;
 import com.core.dao.historical.HistoricalRecordDao;
-import com.uas.appworks.datainquiry.bean.SchemeConditionBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
-import com.core.widget.expandableLayout.ExpandableLayout;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -46,6 +46,7 @@ import com.uas.appworks.datainquiry.adapter.HistoricalRecordAdapter;
 import com.uas.appworks.datainquiry.bean.DataInquiryFlexBean;
 import com.uas.appworks.datainquiry.bean.DataInquiryTotalBean;
 import com.uas.appworks.datainquiry.bean.GridMenuDataInquiryBean;
+import com.uas.appworks.datainquiry.bean.SchemeConditionBean;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -78,18 +79,15 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     private String mCaller, mSchemeName, mSchemeId, mCondition;
 
     private PullToRefreshListView mDataListView;
-    private ExpandableLayout mFuzzyHistoryLl, mExactOptionLl;
+    private LinearLayout mFuzzyWholeLl, mFuzzyHistoryLl, mExactWholeLl, mExactOptionLl, mTotalLl;
     private TextView mHistoryClearTv;
     private MyListView mHistoryDataLv;
-    private ListView mTotalLv;
-    private LinearLayout mTotalLl;
-    private ListView mExactOptionLv;
-    private TextView mExactOptionCancelTv;
-    private TextView mExactOptionResetTv;
-    private TextView mExactOptionConfirmTv;
+    private ListView mTotalLv, mExactOptionLv;
+    private TextView mExactOptionResetTv, mExactOptionCancelTv, mExactOptionConfirmTv;
     private View mGrayBackGround;
     private RelativeLayout mTotalHideRl;
-    private int mPageIndex = 1, mPagesize = 10;
+    private Animation mInAnimation, mOutAnimation;
+    private int mPageIndex = 1, mPageSize = 10;
     private List<HistoricalRecordBean> mHistoricalRecordBeans;
     private HistoricalRecordAdapter mHistoricalRecordAdapter;
     private String mSearchField = "";
@@ -129,10 +127,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     mTotalSpreadImageView.setVisibility(View.GONE);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
+//                    mDataListView.setVisibility(View.VISIBLE);
                     mTotalSpreadImageView.setVisibility(View.GONE);
-                    if (mDataListView.isRefreshing()) {
+                    if (mDataListView.isRefreshing())
                         mDataListView.onRefreshComplete();
-                    }
                     progressDialog.dismiss();
                     ToastMessage(msg.getData().getString("result"));
                     if (mPageIndex > 1) {
@@ -165,6 +163,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 for (int i = 0; i < historicalRecordBeansById.size(); i++) {
                     if (i < 6) {
                         mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                    } else {
+                        HistoricalRecordDao.getInstance().deleteFromHistoricalRecordByField(mSchemeId, historicalRecordBeansById.get(i).getSearchField());
                     }
                 }
                 mHistoricalRecordAdapter.notifyDataSetChanged();
@@ -184,21 +184,23 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     }
 
     private void initViews() {
-        View actionView = LayoutInflater.from(ct).inflate(R.layout.action_data_inquiry_list, null);
-        mBackImageView = (ImageView) actionView.findViewById(R.id.back);
-        mFilterImageView = (ImageView) actionView.findViewById(R.id.data_inquiry_filter_iv);
-        mVoiceImageView = (ImageView) actionView.findViewById(R.id.data_inquiry_voice_iv);
-        mSearchEditText = (ClearEditText) actionView.findViewById(R.id.data_inquiry_filter_et);
-        ActionBar actionBar = this.getSupportActionBar();
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        actionBar.setCustomView(actionView);
+        View view = LayoutInflater.from(ct).inflate(R.layout.action_data_inquiry_list, null);
+        mBackImageView = (ImageView) view.findViewById(R.id.back);
+        mFilterImageView = (ImageView) view.findViewById(R.id.data_inquiry_filter_iv);
+        mVoiceImageView = (ImageView) view.findViewById(R.id.data_inquiry_voice_iv);
+        mSearchEditText = (ClearEditText) view.findViewById(R.id.data_inquiry_filter_et);
+        ActionBar bar = this.getSupportActionBar();
+        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        bar.setCustomView(view);
 
         mDataListView = (PullToRefreshListView) findViewById(R.id.data_inquiry_list_ptlv);
         mDataListView.setMode(PullToRefreshBase.Mode.BOTH);
-        mFuzzyHistoryLl = (ExpandableLayout) findViewById(R.id.data_inquiry_list_history_ll);
+        mFuzzyWholeLl = (LinearLayout) findViewById(R.id.data_inquiry_list_fuzzy_ll);
+        mFuzzyHistoryLl = (LinearLayout) findViewById(R.id.data_inquiry_list_history_ll);
         mHistoryClearTv = (TextView) findViewById(R.id.data_inquiry_history_clear_tv);
         mHistoryDataLv = (MyListView) findViewById(R.id.data_inquiry_list_history_data_lv);
-        mExactOptionLl = (ExpandableLayout) findViewById(R.id.data_inquiry_list_option_ll);
+        mExactWholeLl = (LinearLayout) findViewById(R.id.data_inquiry_list_exact_ll);
+        mExactOptionLl = (LinearLayout) findViewById(R.id.data_inquiry_list_option_ll);
         mExactOptionLv = (ListView) findViewById(R.id.data_inquiry_list_option_lv);
         mExactOptionCancelTv = (TextView) findViewById(R.id.data_inquiry_list_option_cancel_tv);
         mExactOptionResetTv = (TextView) findViewById(R.id.data_inquiry_list_option_reset_tv);
@@ -221,6 +223,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mDataInquiryFlexBeans = new ArrayList<>();
         mAllRowChildBeans = new ArrayList<>();
         mDataInquiryTotalBeans = new ArrayList<>();
+        mInAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_search_popin);
+        mOutAnimation = AnimationUtils.loadAnimation(this, R.anim.anim_search_popout);
 
         mEmptyLayout = new EmptyLayout(this, mDataListView.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
@@ -255,8 +259,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mExactOptionCancelTv.setOnClickListener(this);
         mExactOptionResetTv.setOnClickListener(this);
         mExactOptionConfirmTv.setOnClickListener(this);
-
         mSearchEditText.setOnEditorActionListener(this);
+        mSearchEditText.setOnClickListener(this);
 
         mDataListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -298,7 +302,15 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-                if (!CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
+                if (CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
+                    if (isConditionSuccess) {
+                        mPageIndex++;
+                        getSchemeData();
+                    } else {
+                        mPageIndex = 1;
+                        getQueryCriteria();
+                    }
+                } else {
                     mDataListView.postDelayed(new Runnable() {
                         @Override
                         public void run() {
@@ -307,15 +319,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     }, 500);
                     mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
                     mEmptyLayout.showError();
-                } else {
-                    if (isConditionSuccess) {
-                        mPageIndex++;
-                        getSchemeData();
-                    } else {
-                        mPageIndex = 1;
-                        getQueryCriteria();
-                    }
-
                 }
             }
         });
@@ -324,13 +327,14 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 if (hasFocus) {
-                    if (mExactOptionLl.isExpanded()) {
-                        mExactOptionLl.collapse(false);
+                    if (mExactWholeLl.getVisibility() == View.VISIBLE) {
+                        mExactWholeLl.setVisibility(View.GONE);
                     }
                     if (mHistoricalRecordAdapter.getObjects().size() > 0) {
-                        if (!mFuzzyHistoryLl.isExpanded()) {
-                            mGrayBackGround.setVisibility(View.VISIBLE);
-                            mFuzzyHistoryLl.expand();
+                        mGrayBackGround.setVisibility(View.VISIBLE);
+                        if (mFuzzyWholeLl.getVisibility() == View.GONE) {
+                            mFuzzyWholeLl.setVisibility(View.VISIBLE);
+                            mFuzzyHistoryLl.startAnimation(mInAnimation);
                             mHistoryDataLv.setEnabled(true);
                         }
                     } else {
@@ -339,11 +343,49 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                 } else {
                     CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
-                    if (mFuzzyHistoryLl.isExpanded()) {
-                        mFuzzyHistoryLl.collapse(false);
+                    if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                        mFuzzyWholeLl.setVisibility(View.GONE);
+                        mGrayBackGround.setVisibility(View.GONE);
                         mHistoryDataLv.setEnabled(false);
                     }
+
+                }
+            }
+        });
+
+        mGrayBackGround.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
+                if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                    mFuzzyHistoryLl.startAnimation(mOutAnimation);
+                }
+                if (mExactWholeLl.getVisibility() == View.VISIBLE) {
+                    mExactOptionLl.startAnimation(mOutAnimation);
                 }
+                mGrayBackGround.setVisibility(View.GONE);
+            }
+        });
+
+        mOutAnimation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mSearchEditText.clearFocus();
+                mGrayBackGround.setVisibility(View.GONE);
+                mExactWholeLl.setVisibility(View.GONE);
+                mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
+                CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
             }
         });
 
@@ -385,20 +427,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 mTotalSpreadImageView.setVisibility(View.VISIBLE);
             }
         });
-
-        mGrayBackGround.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
-                mGrayBackGround.setVisibility(View.GONE);
-                if (mExactOptionLl.isExpanded()) {
-                    mExactOptionLl.collapse();
-                }
-                if (mFuzzyHistoryLl.isExpanded()) {
-                    mFuzzyHistoryLl.collapse();
-                }
-            }
-        });
     }
 
 
@@ -415,7 +443,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 JSONArray listArray = resultObject.optJSONArray("listdata");
                 JSONObject totalObject = resultObject.optJSONObject("summaryField");
 
-                if ((listArray == null || listArray.length() < mPagesize) && mPageIndex > 1) {
+                if ((listArray == null || listArray.length() < mPageSize) && mPageIndex > 1) {
                     ToastMessage("已加载全部数据");
                 }
                 if (totalObject != null) {
@@ -451,11 +479,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                 mDataInquiryTotalAdapter.notifyDataSetChanged();
 
-                if (mAllSchemeConditions == null || mAllSchemeConditions.size() == 0) {
-                    mDataInquiryFlexAdapter.notifyDataSetChanged();
-                    mEmptyLayout.showEmpty();
-                    return;
-                }
+//                mDataListView.setVisibility(View.VISIBLE);
                 if (listArray != null && listArray.length() > 0) {
                     if (!TextUtils.isEmpty(mSearchField)) {
                         HistoricalRecordBean historicalRecordBean = new HistoricalRecordBean();
@@ -737,20 +761,21 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     public void onClick(View v) {
         int i = v.getId();
         if (i == R.id.data_inquiry_filter_iv) {
-            if (mFuzzyHistoryLl.isExpanded()) {
-                mFuzzyHistoryLl.collapse(false);
+            if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                mFuzzyWholeLl.setVisibility(View.GONE);
                 mHistoryDataLv.setEnabled(false);
             }
             mSearchEditText.clearFocus();
             mSearchField = "";
             if (mAppSchemeConditions.size() > 0) {
-                if (mExactOptionLl.isExpanded()) {
+                if (mExactWholeLl.getVisibility() == View.VISIBLE) {
+                    mExactOptionLl.startAnimation(mOutAnimation);
                     mGrayBackGround.setVisibility(View.GONE);
-                    mExactOptionLl.collapse();
                 } else {
                     mDataInquirySchemeConditionAdapter.resetTouchPosition();
+                    mExactOptionLl.startAnimation(mInAnimation);
+                    mExactWholeLl.setVisibility(View.VISIBLE);
                     mGrayBackGround.setVisibility(View.VISIBLE);
-                    mExactOptionLl.expand();
                 }
             }
 
@@ -764,11 +789,12 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             HistoricalRecordDao.getInstance().deleteFromHistoricalRecordById(mSchemeId);
             mHistoricalRecordBeans.clear();
             mHistoricalRecordAdapter.notifyDataSetChanged();
-            mFuzzyHistoryLl.collapse(false);
+            mFuzzyWholeLl.setVisibility(View.GONE);
             mGrayBackGround.setVisibility(View.GONE);
+
         } else if (i == R.id.data_inquiry_list_option_cancel_tv) {
+            mExactWholeLl.setVisibility(View.GONE);
             mGrayBackGround.setVisibility(View.GONE);
-            mExactOptionLl.collapse();
             CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
 
         } else if (i == R.id.data_inquiry_list_option_reset_tv) {
@@ -786,21 +812,29 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             }
 
         } else if (i == R.id.data_inquiry_list_option_confirm_tv) {
-            mGrayBackGround.setVisibility(View.GONE);
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.networks_out));
             } else {
                 exactQuery();
             }
+
         } else if (i == R.id.data_inquiry_filter_et) {
+            if (mExactWholeLl.getVisibility() == View.VISIBLE) {
+                mExactWholeLl.setVisibility(View.GONE);
+            }
             if (mHistoricalRecordAdapter.getObjects().size() > 0) {
-                if (!mFuzzyHistoryLl.isExpanded()) {
+                if (mGrayBackGround.getVisibility() == View.GONE) {
                     mGrayBackGround.setVisibility(View.VISIBLE);
-                    mFuzzyHistoryLl.expand();
+                }
+                if (mFuzzyWholeLl.getVisibility() == View.GONE) {
+                    mFuzzyWholeLl.setVisibility(View.VISIBLE);
+                    mFuzzyHistoryLl.startAnimation(mInAnimation);
                     mHistoryDataLv.setEnabled(true);
                 }
             } else {
-                mGrayBackGround.setVisibility(View.GONE);
+                if (mGrayBackGround.getVisibility() == View.VISIBLE) {
+                    mGrayBackGround.setVisibility(View.GONE);
+                }
             }
         }
     }
@@ -899,7 +933,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         Log.d("exactCondition", mCondition);
 
         mPageIndex = 1;
-        mExactOptionLl.collapse(false);
+        mExactWholeLl.setVisibility(View.GONE);
+        mGrayBackGround.setVisibility(View.GONE);
         progressDialog.show();
         getSchemeData();
     }
@@ -972,7 +1007,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             mPageIndex = 1;
             mSearchField = searchField;
             mSearchEditText.clearFocus();
-            mFuzzyHistoryLl.collapse(false);
+            mFuzzyWholeLl.setVisibility(View.GONE);
+            mGrayBackGround.setVisibility(View.GONE);
             mHistoryDataLv.setEnabled(false);
             progressDialog.show();
             getSchemeData();
@@ -998,7 +1034,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         params.put("caller", mCaller);
         params.put("id", mSchemeId);
         params.put("pageIndex", mPageIndex);
-        params.put("pageSize", mPagesize);
+        params.put("pageSize", mPageSize);
         params.put("condition", mCondition);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));