提交类型 下拉代码合并给苟安

提交内容 昨晚测试的一些代码和通用dbfind选择类的一些修改内容
冲突处理 版本文件，取网络

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 10 15:56:45 CST 2018
-debugName=405
+#Wed Jan 10 19:17:36 CST 2018
+debugName=409
 versionName=624
-debugCode=405
+debugCode=409
 versionCode=163

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1049,7 +1049,7 @@ public class ViewUtil {
         url = url + "mobile/login.action";
 //        if (BaseConfig.isDebug()){
 //            master=CommonUtil.getMaster();
-//            url="http://192.168.253.97:8080/ERP/mobile/login.action";
+//            url=CommonUtil.getAppBaseUrl(MyApplication.getInstance())+"mobile/login.action";
 //        }
  //       url="http://192.168.253.58:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.29:8080/ERP/mobile/login.action";

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

@@ -125,6 +125,9 @@ public class SelectNetAcitivty extends OABaseActivity {
                 if (bundle != null) {
                     if (bundle.getInt(CodeUtils.RESULT_TYPE) == CodeUtils.RESULT_SUCCESS) {
                         String result = bundle.getString(CodeUtils.RESULT_STRING);
+                        LogUtil.i("result="+result);
+                        lastKey=result;
+                        showLoading();
                         loadSearch(page = 1, result);
                     }
                 }
@@ -302,19 +305,17 @@ public class SelectNetAcitivty extends OABaseActivity {
                     }
                 }
             });
-            if (ListUtils.isEmpty(models)) {
-                mEmptyLayout.showEmpty();
-            }
+
         } else {
             if (page == 1) {
                 mAdapter.setModels(models);
-                if (ListUtils.isEmpty(models)) {
-                    mEmptyLayout.showEmpty();
-                }
             } else {
                 mAdapter.addModls(models);
             }
         }
+        if (ListUtils.isEmpty(models)) {
+            mEmptyLayout.showEmpty();
+        }
     }
 
     private String getShowName(Map<String, String> object) throws Exception {

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -8,9 +8,8 @@ import com.common.config.BaseConfig;
  */
 
 public class SwitchUtil {
-
     public static boolean showYiyuanjuan() {
-        return false;
+        return true;
     }
 
     public static boolean showShebeiguanli() {