合计备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryListActivity.java

@@ -72,7 +72,7 @@ import java.util.Map;
 public class DataInquiryListActivity extends BaseActivity implements View.OnClickListener, TextView.OnEditorActionListener {
     private final int GET_DATA_RESULT = 0X11;
     private final int GET_QUERY_CRITERIA = 0X22;
-    private ImageView mBackImageView, mFilterImageView, mVoiceImageView, mTotalHideImageView;
+    private ImageView mBackImageView, mFilterImageView, mVoiceImageView, mTotalHideImageView, mTotalSpreadImageView;
     private ClearEditText mSearchEditText;
     private GridMenuDataInquiryBean.QueryScheme mQueryScheme;
     private String mCaller, mSchemeName, mSchemeId, mCondition;
@@ -81,7 +81,8 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     private LinearLayout mFuzzyWholeLl;
     private LinearLayout mFuzzyHistoryLl;
     private TextView mHistoryClearTv;
-    private MyListView mHistoryDataLv, mTotalLv;
+    private MyListView mHistoryDataLv;
+    private ListView mTotalLv;
     private LinearLayout mExactWholeLl, mExactOptionLl, mTotalLl;
     private ListView mExactOptionLv;
     private TextView mExactOptionCancelTv;
@@ -135,6 +136,263 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         }
     };
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_data_inquiry_list);
+
+        initViews();
+        initEvents();
+        initDatas();
+    }
+
+    private void initDatas() {
+        mCondition = "1 = 1";
+
+        mHistoricalRecordAdapter = new HistoricalRecordAdapter(DataInquiryListActivity.this, mHistoricalRecordBeans);
+        mHistoryDataLv.setAdapter(mHistoricalRecordAdapter);
+
+        List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
+        if (historicalRecordBeansById.size() > 0) {
+            for (int i = 0; i < historicalRecordBeansById.size(); i++) {
+                if (i < 6) {
+                    mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                }
+            }
+            mHistoricalRecordAdapter.notifyDataSetChanged();
+        }
+
+        if (!CommonUtil.isNetWorkConnected(this)) {
+            mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
+            mEmptyLayout.showError();
+        } else {
+            if (mQueryScheme != null) {
+                progressDialog.show();
+                String url = Constants.getAppBaseUrl(this) + "mobile/qry/schemeCondition.action";
+                Map<String, Object> params = new HashMap<>();
+                params.put("caller", mQueryScheme.getCaller());
+                params.put("id", mQueryScheme.getSchemeId());
+                LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+                ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_QUERY_CRITERIA, null, null, "post");
+            }
+        }
+
+    }
+
+    private void initViews() {
+        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);
+        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);
+        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);
+        mExactOptionConfirmTv = (TextView) findViewById(R.id.data_inquiry_list_option_confirm_tv);
+        mTotalLl = (LinearLayout) findViewById(R.id.data_inquiry_list_total_ll);
+        mTotalHideImageView = (ImageView) findViewById(R.id.data_inquiry_list_total_hide_iv);
+        mTotalSpreadImageView = (ImageView) findViewById(R.id.data_inquiry_list_total_spread_iv);
+        mTotalLv = (ListView) findViewById(R.id.data_inquiry_list_total_lv);
+        mFuzzyViewBg = findViewById(R.id.data_inquiry_list_fuzzy_bg);
+        mExactViewBg = findViewById(R.id.data_inquiry_list_exact_bg);
+
+//        mFuzzyWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+//        mExactWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+
+        mHistoricalRecordBeans = new ArrayList<>();
+        mAllSchemeConditions = new ArrayList<>();
+        mAppSchemeConditions = new ArrayList<>();
+        mfuzzySchemeConditionBeans = new ArrayList<>();
+        mResetSchemeConditionBeans = new ArrayList<>();
+        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);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setEmptyMessage("没有符合条件的数据");
+
+        mDataInquirySchemeConditionAdapter = new DataInquirySchemeConditionAdapter(this, mAppSchemeConditions);
+        mExactOptionLv.setAdapter(mDataInquirySchemeConditionAdapter);
+
+        mDataInquiryFlexAdapter = new DataInquiryFlexAdapter(this, mDataInquiryFlexBeans);
+        mDataListView.setAdapter(mDataInquiryFlexAdapter);
+
+        mDataInquiryTotalAdapter = new DataInquiryTotalAdapter(this, mDataInquiryTotalBeans);
+        mDataInquiryTotalAdapter.setHandler(mHandler);
+        mTotalLv.setAdapter(mDataInquiryTotalAdapter);
+
+        Intent intent = getIntent();
+        if (intent != null) {
+            mQueryScheme = (GridMenuDataInquiryBean.QueryScheme) intent.getSerializableExtra("scheme");
+            mSchemeId = mQueryScheme.getSchemeId();
+            mSchemeName = mQueryScheme.getScheme();
+            mCaller = mQueryScheme.getCaller();
+        }
+    }
+
+    private void initEvents() {
+        mBackImageView.setOnClickListener(this);
+        mFilterImageView.setOnClickListener(this);
+        mVoiceImageView.setOnClickListener(this);
+        mHistoryClearTv.setOnClickListener(this);
+        mExactOptionCancelTv.setOnClickListener(this);
+        mExactOptionResetTv.setOnClickListener(this);
+        mExactOptionConfirmTv.setOnClickListener(this);
+
+        mSearchEditText.setOnEditorActionListener(this);
+
+        mDataListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                int reallyPosition = (int) parent.getItemIdAtPosition(position);
+                if (CommonUtil.isRepeatClick()) {
+                    if (mOldPosition == reallyPosition) {
+                        mDataInquiryFlexAdapter.getObjects().get(reallyPosition).setIsFlex(!mDataInquiryFlexAdapter.getObjects().get(reallyPosition).isFlex());
+                        mDataInquiryFlexAdapter.notifyDataSetChanged();
+                    } else {
+                        mOldPosition = reallyPosition;
+                    }
+                }
+                mOldPosition = reallyPosition;
+            }
+        });
+
+        mDataListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+                if (CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
+                    mPageIndex = 1;
+                    getSchemeData();
+                } else {
+                    mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
+                    mEmptyLayout.showError();
+                }
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+                if (!CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
+                    mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
+                    mEmptyLayout.showError();
+                } else {
+                    mPageIndex++;
+                    getSchemeData();
+                }
+            }
+        });
+
+        mSearchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    if (mExactWholeLl.getVisibility() == View.VISIBLE)
+                        mExactWholeLl.setVisibility(View.GONE);
+                    if (mHistoricalRecordAdapter.getObjects().size() > 0) {
+                        if (mFuzzyWholeLl.getVisibility() == View.GONE) {
+                            mFuzzyHistoryLl.startAnimation(mInAnimation);
+                            mHistoryDataLv.setEnabled(true);
+                            mFuzzyWholeLl.setVisibility(View.VISIBLE);
+                        }
+                    }
+
+                } else {
+                    CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
+                    if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                        mFuzzyWholeLl.setVisibility(View.GONE);
+                        mHistoryDataLv.setEnabled(false);
+                    }
+
+                }
+            }
+        });
+
+        mFuzzyViewBg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
+                    mFuzzyHistoryLl.startAnimation(mOutAnimation);
+                }
+            }
+        });
+
+        mExactViewBg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mExactWholeLl.getVisibility() == View.VISIBLE)
+                    mExactOptionLl.startAnimation(mOutAnimation);
+            }
+        });
+
+        mOutAnimation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mSearchEditText.clearFocus();
+                mExactWholeLl.setVisibility(View.GONE);
+                mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
+                CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+
+        mHistoryDataLv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                HistoricalRecordBean historicalRecordBean = mHistoricalRecordAdapter.getObjects().get(position);
+                mSearchEditText.setText(historicalRecordBean.getSearchField());
+
+                searchEvent();
+            }
+        });
+
+        mTotalHideImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mTotalLl.getVisibility() == View.VISIBLE) {
+                    mTotalLl.setVisibility(View.GONE);
+                }
+                mTotalSpreadImageView.setVisibility(View.VISIBLE);
+            }
+        });
+
+        mTotalSpreadImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mTotalLl.getVisibility() == View.GONE) {
+                    mTotalLl.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+    }
+
+
     private void analysisData(Message msg) {
         String result = msg.getData().getString("result");
         if (result != null) {
@@ -168,8 +426,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 
                 if (mDataInquiryTotalBeans.size() > 0) {
                     mTotalLl.setVisibility(View.VISIBLE);
+                    mTotalSpreadImageView.setVisibility(View.VISIBLE);
                 } else {
                     mTotalLl.setVisibility(View.GONE);
+                    mTotalSpreadImageView.setVisibility(View.GONE);
                 }
 
                 mDataInquiryTotalAdapter.notifyDataSetChanged();
@@ -311,6 +571,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                             String caption = optStringNotNull(dataObject, "caption");
                             String defaultValue = optStringNotNull(dataObject, "defaultValue");
                             String type = optStringNotNull(dataObject, "type");
+                            String table = optStringNotNull(dataObject, "table");
 
                             if (!dataObject.isNull("properties")) {
                                 JSONArray properties = dataObject.optJSONArray("properties");
@@ -367,6 +628,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                             schemeConditionBean.setCaption(caption);
                             schemeConditionBean.setDefaultValue(defaultValue);
                             schemeConditionBean.setType(type);
+                            schemeConditionBean.setTable(table);
 
                             mAllSchemeConditions.add(schemeConditionBean);
 
@@ -411,250 +673,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         }
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_data_inquiry_list);
-
-        initViews();
-        initEvents();
-        initDatas();
-    }
-
-    private void initDatas() {
-        mCondition = "1 = 1";
-
-        mHistoricalRecordAdapter = new HistoricalRecordAdapter(DataInquiryListActivity.this, mHistoricalRecordBeans);
-        mHistoryDataLv.setAdapter(mHistoricalRecordAdapter);
-
-        List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
-        if (historicalRecordBeansById.size() > 0) {
-            for (int i = 0; i < historicalRecordBeansById.size(); i++) {
-                if (i < 6) {
-                    mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
-                }
-            }
-            mHistoricalRecordAdapter.notifyDataSetChanged();
-        }
-
-        if (!CommonUtil.isNetWorkConnected(this)) {
-            mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
-            mEmptyLayout.showError();
-        } else {
-            if (mQueryScheme != null) {
-                progressDialog.show();
-                String url = Constants.getAppBaseUrl(this) + "mobile/qry/schemeCondition.action";
-                Map<String, Object> params = new HashMap<>();
-                params.put("caller", mQueryScheme.getCaller());
-                params.put("id", mQueryScheme.getSchemeId());
-                LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-                ViewUtil.httpSendRequest(this, url, params, mHandler, headers, GET_QUERY_CRITERIA, null, null, "post");
-            }
-        }
-
-    }
-
-    private void initViews() {
-        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);
-        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);
-        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);
-        mExactOptionConfirmTv = (TextView) findViewById(R.id.data_inquiry_list_option_confirm_tv);
-        mTotalLl = (LinearLayout) findViewById(R.id.data_inquiry_list_total_ll);
-        mTotalHideImageView = (ImageView) findViewById(R.id.data_inquiry_list_total_hide_iv);
-        mTotalLv = (MyListView) findViewById(R.id.data_inquiry_list_total_lv);
-        mFuzzyViewBg = findViewById(R.id.data_inquiry_list_fuzzy_bg);
-        mExactViewBg = findViewById(R.id.data_inquiry_list_exact_bg);
-
-//        mFuzzyWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-//        mExactWholeLl.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-
-        mHistoricalRecordBeans = new ArrayList<>();
-        mAllSchemeConditions = new ArrayList<>();
-        mAppSchemeConditions = new ArrayList<>();
-        mfuzzySchemeConditionBeans = new ArrayList<>();
-        mResetSchemeConditionBeans = new ArrayList<>();
-        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);
-        mEmptyLayout.setShowEmptyButton(false);
-        mEmptyLayout.setShowErrorButton(false);
-        mEmptyLayout.setEmptyMessage("没有符合条件的数据");
-
-        mDataInquirySchemeConditionAdapter = new DataInquirySchemeConditionAdapter(this, mAppSchemeConditions);
-        mExactOptionLv.setAdapter(mDataInquirySchemeConditionAdapter);
-
-        mDataInquiryFlexAdapter = new DataInquiryFlexAdapter(this, mDataInquiryFlexBeans);
-        mDataListView.setAdapter(mDataInquiryFlexAdapter);
-
-        mDataInquiryTotalAdapter = new DataInquiryTotalAdapter(this, mDataInquiryTotalBeans);
-        mDataInquiryTotalAdapter.setHandler(mHandler);
-        mTotalLv.setAdapter(mDataInquiryTotalAdapter);
-
-        Intent intent = getIntent();
-        if (intent != null) {
-            mQueryScheme = (GridMenuDataInquiryBean.QueryScheme) intent.getSerializableExtra("scheme");
-            mSchemeId = mQueryScheme.getSchemeId();
-            mSchemeName = mQueryScheme.getScheme();
-            mCaller = mQueryScheme.getCaller();
-        }
-    }
-
-    private void initEvents() {
-        mBackImageView.setOnClickListener(this);
-        mFilterImageView.setOnClickListener(this);
-        mVoiceImageView.setOnClickListener(this);
-        mHistoryClearTv.setOnClickListener(this);
-        mExactOptionCancelTv.setOnClickListener(this);
-        mExactOptionResetTv.setOnClickListener(this);
-        mExactOptionConfirmTv.setOnClickListener(this);
-
-        mSearchEditText.setOnEditorActionListener(this);
-
-        mDataListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                int reallyPosition = (int) parent.getItemIdAtPosition(position);
-                if (CommonUtil.isRepeatClick()) {
-                    if (mOldPosition == reallyPosition) {
-                        mDataInquiryFlexAdapter.getObjects().get(reallyPosition).setIsFlex(!mDataInquiryFlexAdapter.getObjects().get(reallyPosition).isFlex());
-                        mDataInquiryFlexAdapter.notifyDataSetChanged();
-                    } else {
-                        mOldPosition = reallyPosition;
-                    }
-                }
-                mOldPosition = reallyPosition;
-            }
-        });
-
-        mDataListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
-            @Override
-            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                if (CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
-                    mPageIndex = 1;
-                    getSchemeData();
-                } else {
-                    mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
-                    mEmptyLayout.showError();
-                }
-            }
-
-            @Override
-            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-                if (!CommonUtil.isNetWorkConnected(DataInquiryListActivity.this)) {
-                    mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
-                    mEmptyLayout.showError();
-                } else {
-                    mPageIndex++;
-                    getSchemeData();
-                }
-            }
-        });
-
-        mSearchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    if (mExactWholeLl.getVisibility() == View.VISIBLE)
-                        mExactWholeLl.setVisibility(View.GONE);
-                    if (mHistoricalRecordAdapter.getObjects().size() > 0) {
-                        if (mFuzzyWholeLl.getVisibility() == View.GONE) {
-                            mFuzzyHistoryLl.startAnimation(mInAnimation);
-                            mHistoryDataLv.setEnabled(true);
-                            mFuzzyWholeLl.setVisibility(View.VISIBLE);
-                        }
-                    }
-
-                } else {
-                    CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
-                    if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
-                        mFuzzyWholeLl.setVisibility(View.GONE);
-                        mHistoryDataLv.setEnabled(false);
-                    }
-
-                }
-            }
-        });
-
-        mFuzzyViewBg.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
-                    mFuzzyHistoryLl.startAnimation(mOutAnimation);
-                }
-            }
-        });
-
-        mExactViewBg.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mExactWholeLl.getVisibility() == View.VISIBLE)
-                    mExactOptionLl.startAnimation(mOutAnimation);
-            }
-        });
-
-        mOutAnimation.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                mSearchEditText.clearFocus();
-                mExactWholeLl.setVisibility(View.GONE);
-                mFuzzyWholeLl.setVisibility(View.GONE);
-                mHistoryDataLv.setEnabled(false);
-                CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {
-
-            }
-        });
-
-        mHistoryDataLv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                HistoricalRecordBean historicalRecordBean = mHistoricalRecordAdapter.getObjects().get(position);
-                mSearchEditText.setText(historicalRecordBean.getSearchField());
-
-                searchEvent();
-            }
-        });
-
-        mTotalHideImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mTotalLl.getVisibility() == View.VISIBLE) {
-                    mTotalLl.setVisibility(View.GONE);
-                }
-            }
-        });
-    }
 
     @Override
     public void onClick(View v) {
@@ -723,23 +741,35 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             if ("N".equals(schemeConditionBean.getType()) && schemeConditionBean.getProperties().size() == 2) {
                 if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())
                         && !TextUtils.isEmpty(schemeConditionBean.getProperties().get(1).getDisplay())) {
-                    mCondition = mCondition + "(" + schemeConditionBean.getField()
+                    mCondition = mCondition + "("
+                            + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                            + schemeConditionBean.getField()
                             + " >= " + schemeConditionBean.getProperties().get(0).getDisplay()
-                            + " and " + schemeConditionBean.getField()
+                            + " and "
+                            + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                            + schemeConditionBean.getField()
                             + " <= " + schemeConditionBean.getProperties().get(1).getDisplay() + ") and ";
 
                 } else if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
-                    mCondition = mCondition + "(" + schemeConditionBean.getField()
+                    mCondition = mCondition + "("
+                            + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                            + schemeConditionBean.getField()
                             + " >= " + schemeConditionBean.getProperties().get(0).getDisplay() + ") and ";
                 } else if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(1).getDisplay())) {
-                    mCondition = mCondition + "(" + schemeConditionBean.getField()
+                    mCondition = mCondition + "("
+                            + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                            + schemeConditionBean.getField()
                             + " <= " + schemeConditionBean.getProperties().get(1).getDisplay() + ") and ";
                 }
 
             } else if (("D".equals(schemeConditionBean.getType()) || "CD".equals(schemeConditionBean.getType())) && schemeConditionBean.getProperties().size() == 2) {
-                mCondition = mCondition + "(" + schemeConditionBean.getField()
+                mCondition = mCondition + "("
+                        + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                        + schemeConditionBean.getField()
                         + " >= to_date(\'" + schemeConditionBean.getProperties().get(0).getDisplay()
-                        + "\',\'yyyy-MM-dd\') and " + schemeConditionBean.getField()
+                        + "\',\'yyyy-MM-dd\') and "
+                        + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                        + schemeConditionBean.getField()
                         + " <= to_date(\'" + schemeConditionBean.getProperties().get(1).getDisplay()
                         + "\',\'yyyy-MM-dd\')) and ";
             } else if ("CBG".equals(schemeConditionBean.getType()) || "C".equals(schemeConditionBean.getType())
@@ -749,7 +779,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 for (int j = 0; j < schemeConditionBean.getProperties().size(); j++) {
                     if (schemeConditionBean.getProperties().get(j).isState()) {
                         selectedCount++;
-                        gridCondition = gridCondition + schemeConditionBean.getField() + " = \'"
+                        gridCondition = gridCondition
+                                + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                                + schemeConditionBean.getField() + " = \'"
                                 + schemeConditionBean.getProperties().get(j).getValue() + "\' or ";
                     }
                 }
@@ -761,7 +793,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             } else {
                 if (schemeConditionBean.getProperties().size() == 1) {
                     if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
-                        mCondition = mCondition + "(" + schemeConditionBean.getField()
+                        mCondition = mCondition + "("
+                                + (TextUtils.isEmpty(schemeConditionBean.getTable()) ? "" : (schemeConditionBean.getTable() + "."))
+                                + schemeConditionBean.getField()
                                 + " like \'%" + schemeConditionBean.getProperties().get(0).getDisplay()
                                 + "%\') and ";
                     }
@@ -828,7 +862,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 } else {
                     mCondition = "";
                     for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
-                        mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
+                        mCondition = mCondition + "("
+                                + (TextUtils.isEmpty(mfuzzySchemeConditionBeans.get(i).getTable()) ? "" : (mfuzzySchemeConditionBeans.get(i).getTable() + "."))
+                                + mfuzzySchemeConditionBeans.get(i).getField()
                                 + " like \'%" + searchField + "%\') or ";
                     }
                     if (mCondition.length() >= 4) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/PDFDownloadActivity.java

@@ -91,7 +91,7 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
         mPDFView.fromFile(fileName)
 //                .pages(0, 2, 1, 3, 3, 3) // all pages are displayed by default
                 .enableSwipe(true) // allows to block changing pages using swipe
-                .swipeHorizontal(true)
+//                .swipeHorizontal(true)
                 .enableDoubletap(true)
                 .defaultPage(0)
                         // allows to draw something on the current page, usually visible in the middle of the screen
@@ -206,6 +206,6 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onInitiallyRendered(int nbPages, float pageWidth, float pageHeight) {
-        mPDFView.fitToWidth();
+//        mPDFView.fitToWidth();
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquirySchemeConditionAdapter.java

@@ -20,9 +20,7 @@ import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 
 /**
@@ -134,24 +132,6 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                     }
                 });
 
-                /*holder.numEdittext1.setOnTouchListener(new View.OnTouchListener() {
-                    @Override
-                    public boolean onTouch(View v, MotionEvent event) {
-                        mTouchPosition = (int) holder.numEdittext1.getTag();
-                        mTouchIndex = 1;
-                        return false;
-                    }
-                });
-
-                holder.numEdittext2.setOnTouchListener(new View.OnTouchListener() {
-                    @Override
-                    public boolean onTouch(View v, MotionEvent event) {
-                        mTouchPosition = (int) holder.numEdittext2.getTag();
-                        mTouchIndex = 2;
-                        return false;
-                    }
-                });*/
-
                 holder.numEdittext1.setOnFocusChangeListener(new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View v, boolean hasFocus) {
@@ -205,16 +185,13 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                 holder.textviewLl.setVisibility(View.VISIBLE);
                 holder.gridview.setVisibility(View.GONE);
 
-                holder.textview1.setText(getMonthFirstDay());
-                holder.textview2.setText(getMonthLastDay());
-
-                object.getProperties().get(0).setDisplay(getMonthFirstDay());
-                object.getProperties().get(0).setValue(getMonthFirstDay());
-                object.getProperties().get(1).setDisplay(getMonthLastDay());
-                object.getProperties().get(1).setValue(getMonthLastDay());
-
                 mProperties = object.getProperties();
 
+                if (mProperties != null && mProperties.size() == 2) {
+                    holder.textview1.setText(mProperties.get(0).getDisplay());
+                    holder.textview2.setText(mProperties.get(1).getDisplay());
+                }
+
                 holder.textview1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -368,14 +345,6 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
                     }
                 });
 
-                /*holder.stringEdittext.setOnTouchListener(new View.OnTouchListener() {
-                    @Override
-                    public boolean onTouch(View v, MotionEvent event) {
-                        mTouchPosition = (int) v.getTag();
-                        return false;
-                    }
-                });*/
-
                 holder.stringEdittext.setOnFocusChangeListener(new View.OnFocusChangeListener() {
                     @Override
                     public void onFocusChange(View v, boolean hasFocus) {
@@ -386,7 +355,7 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
 
                 strChanged = true;
                 if (mProperties != null && object.getProperties().size() == 1) {
-                    holder.stringEdittext.setText(object.getDefaultValue());
+                    holder.stringEdittext.setText(mProperties.get(0).getDisplay());
                     strChanged = false;
                 }
 
@@ -400,31 +369,6 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
         }
     }
 
-    /**
-     * 得到本月的第一天
-     */
-    public static String getMonthFirstDay() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, calendar
-                .getActualMinimum(Calendar.DAY_OF_MONTH));
-//        calendar.set( Calendar.DATE, 1);
-        SimpleDateFormat simpleFormate = new SimpleDateFormat("yyyy-MM-dd");
-        return simpleFormate.format(calendar.getTime());
-    }
-
-    /**
-     * 得到本月的最后一天
-     */
-    public static String getMonthLastDay() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.DAY_OF_MONTH, calendar
-                .getActualMaximum(Calendar.DAY_OF_MONTH));
-//        calendar.set( Calendar.DATE, 1);
-//        calendar.roll(Calendar.DATE, - 1);
-        SimpleDateFormat simpleFormate = new SimpleDateFormat("yyyy-MM-dd");
-        return simpleFormate.format(calendar.getTime());
-    }
-
     private void showDateDialog(String year, String month, String day, final TextView tv, SchemeConditionBean object, int i) {
         OASigninPicker picker = new OASigninPicker((Activity) context, 2000, 2030);
         picker.setRange(2030, 12, 31);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/ReportQueryConditionAdapter.java

@@ -182,16 +182,13 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
                 holder.textviewLl.setVisibility(View.VISIBLE);
                 holder.gridview.setVisibility(View.GONE);
 
-                holder.textview1.setText(getMonthFirstDay());
-                holder.textview2.setText(getMonthLastDay());
-
-                object.getProperties().get(0).setDisplay(getMonthFirstDay());
-                object.getProperties().get(0).setValue(getMonthFirstDay());
-                object.getProperties().get(1).setDisplay(getMonthLastDay());
-                object.getProperties().get(1).setValue(getMonthLastDay());
-
                 mProperties = object.getProperties();
 
+                if (mProperties != null && mProperties.size() == 2) {
+                    holder.textview1.setText(mProperties.get(0).getDisplay());
+                    holder.textview2.setText(mProperties.get(1).getDisplay());
+                }
+
                 holder.textview1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/bean/SchemeConditionBean.java

@@ -15,6 +15,15 @@ public class SchemeConditionBean implements Serializable, Comparable<SchemeCondi
     private boolean mAppCondition;
     private String mDefaultValue;
     private List<Property> mProperties;
+    private String mTable;
+
+    public String getTable() {
+        return mTable;
+    }
+
+    public void setTable(String table) {
+        mTable = table;
+    }
 
     public String getPosition() {
         return mPosition;

WeiChat/src/main/res/layout/activity_data_inquiry_list.xml

@@ -6,42 +6,58 @@
                 android:focusableInTouchMode="true"
                 android:orientation="vertical">
 
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/data_inquiry_list_ptlv"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@color/gray_light"
-        android:dividerHeight="1dp"
-        android:layerType="software"
-        android:scrollingCache="false"/>
+        android:orientation="vertical">
+
+        <com.handmark.pulltorefresh.library.PullToRefreshListView
+            android:id="@+id/data_inquiry_list_ptlv"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:divider="@color/gray_light"
+            android:dividerHeight="1dp"
+            android:layerType="software"
+            android:scrollingCache="false"/>
+
+        <ImageView
+            android:id="@+id/data_inquiry_list_total_spread_iv"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:background="@color/white"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_menu_spread"/>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/data_inquiry_list_total_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="#80FFFFFF"
+        android:background="@color/white"
         android:orientation="vertical"
         android:visibility="gone">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="6dp">
+            android:padding="8dp">
 
             <ImageView
                 android:id="@+id/data_inquiry_list_total_hide_iv"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="12dp"
+                android:layout_marginRight="5dp"
                 android:src="@drawable/node_delete"/>
         </RelativeLayout>
 
-        <com.xzjmyk.pm.activity.view.MyListView
+        <ListView
             android:id="@+id/data_inquiry_list_total_lv"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="140dp"
+            android:layout_marginBottom="10dp"/>
     </LinearLayout>
 
     <LinearLayout

WeiChat/src/main/res/layout/item_list_data_inquiry.xml

@@ -13,7 +13,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:padding="10dp"
+        android:paddingBottom="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
         android:src="@drawable/ic_menu_retract"/>
 
 
@@ -23,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/item_data_inquiry_flex_iv"
         android:clickable="false"
-        android:focusable="false"
         android:divider="@null"
+        android:focusable="false"
         android:scrollbars="none"/>
 </RelativeLayout>

WeiChat/src/main/res/layout/item_list_data_inquiry_total.xml

@@ -3,15 +3,18 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="10dp">
+    android:padding="4dp">
 
     <TextView
         android:id="@+id/data_inquiry_item_total_caption"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
         android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="2"
         android:gravity="right|center_vertical"
         android:textSize="14sp"
         tools:text="current whoal:"/>
@@ -19,18 +22,20 @@
     <TextView
         android:id="@+id/data_inquiry_item_total_value"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:layout_marginLeft="6dp"
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:textColor="@color/titleBlue"
-        android:layout_marginLeft="6dp"
         android:textSize="14sp"
         tools:text="349013718.270345"/>
 
     <ImageView
         android:id="@+id/data_inquiry_item_total_delete_iv"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginRight="6dp"
+        android:layout_width="14dp"
+        android:layout_height="14dp"
+        android:layout_marginRight="14dp"
         android:src="@drawable/to_back"/>
 </LinearLayout>