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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Feb 26 10:21:52 CST 2018
-debugName=474
-versionName=618
-debugCode=474
-versionCode=157
+#Mon Feb 26 10:14:32 CST 2018
+debugName=251
+versionName=620
+debugCode=251
+versionCode=159

app_modular/apputils/src/main/java/com/modular/apputils/activity/SelectNetAcitivty.java

@@ -153,8 +153,6 @@ public class SelectNetAcitivty extends OABaseActivity {
             corekey = intent.getStringExtra("corekey");
             isDevice = intent.getBooleanExtra("isDevice", false);
         }
-
-
         VoiceSearchView voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         refreshListView = (PullToRefreshListView) findViewById(R.id.refreshListView);
         refreshListView.setMode(PullToRefreshBase.Mode.BOTH);
@@ -163,6 +161,19 @@ public class SelectNetAcitivty extends OABaseActivity {
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setEmptyMessage("没有符合条件的数据");
+        voiceSearchView.addTextChangedListener(new EditChangeListener() {
+            @Override
+            public void afterTextChanged(Editable s) {
+                lastKey = s == null ? "" : s.toString();
+                if (dataForm) {
+                    findByLocal();
+                } else if (isDevice && !TextUtils.isEmpty(lastKey)) {
+                    loadSearchDevice(lastKey);
+                } else {
+                    loadSearch(page = 1, lastKey);
+                }
+            }
+        });
         voiceSearchView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -177,7 +188,6 @@ public class SelectNetAcitivty extends OABaseActivity {
                 return false;
             }
         });
-
         if (dataForm) {
             refreshListView.setMode(PullToRefreshBase.Mode.DISABLED);
         } else {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/TravelDataFormDetailActivity.java

@@ -1567,7 +1567,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
 
     private void paseSelectDbFind(int clickGroupId, JSONObject object) throws Exception {
         LogUtil.i("clickGroupId=" + clickGroupId);
-        if (ListUtils.getSize(mAdapter.getmListData()) > clickGroupId && clickGroupId > 0) {
+        if (ListUtils.getSize(mAdapter.getmListData()) > clickGroupId && clickGroupId >= 0) {
             GroupData gridDatas = mAdapter.getmListData().get(clickGroupId);
             if (gridDatas != null && !ListUtils.isEmpty(gridDatas.getDatas())) {
                 for (Data e : gridDatas.getDatas()) {