字段搜索修改为全部可搜索

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutofficeSetActivity.java

@@ -25,7 +25,6 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -61,9 +60,9 @@ public class OutofficeSetActivity extends BaseActivity {
                 case 0x11:
                     object = JSON.parseObject(message);
                     if (object.containsKey("success") && object.getBoolean("success"))
-                        Crouton.makeText(ct, "保存成功");
+                        ToastMessage( "保存成功");
                     else
-                        Crouton.makeText(ct, "保存失败");
+                        ToastMessage( "保存失败");
                     break;
             }
         }

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

@@ -34,7 +34,7 @@
             android:layout_toLeftOf="@id/statusIv"
             android:layout_toRightOf="@id/handIv"
             android:ellipsize="end"
-            android:lines="1"
+            android:maxLines="2"
             android:textColor="#000000"
             android:textSize="14sp"/>
     </RelativeLayout>

app_modular/applocation/src/main/java/com/uas/applocation/base/NativeLocationManager.java

@@ -210,27 +210,6 @@ public class NativeLocationManager implements BaseLocationManager {
     }
 
 
-    /**
-     * 由于google收费，必须限制每天使用量
-     */
-    private String lastKey;
-    private boolean isWhating, isResulting = false;
-    private Handler mWhatHandler = new Handler(Looper.getMainLooper());
-
-    private void startWhat(final Context ct, final OnSearchLocationListener mOnSearchLocationListener) {
-        if (!isWhating) {
-            isWhating = true;
-            mWhatHandler.postAtTime(new Runnable() {
-                @Override
-                public void run() {
-                    isWhating = false;
-                    loadByInput(ct, null, lastKey, mOnSearchLocationListener);
-                }
-            }, 1000);
-        }
-    }
-
-
     /**
      * 获取当前位置附近位置
      *
@@ -245,6 +224,7 @@ public class NativeLocationManager implements BaseLocationManager {
                 .isDebug(true)
                 .add("location", latitude + "," + longitude)
                 .add("radius", radius)
+                .add("keyword", "公司")
                 .add("output", "json")
                 .method(Method.GET)
                 .add("key", ct.getString(R.string.app_google_key))
@@ -272,6 +252,29 @@ public class NativeLocationManager implements BaseLocationManager {
         }));
     }
 
+
+    /**
+     * 由于google收费，必须限制每天使用量
+     * 流程：
+     * 1.第一次进入直接进行搜索
+     */
+    private String lastKey;
+    private boolean isWhating, isResulting = false;
+    private Handler mWhatHandler = new Handler(Looper.getMainLooper());
+
+    private void startWhat(final Context ct, final OnSearchLocationListener mOnSearchLocationListener) {
+        if (!isWhating) {
+            isWhating = true;
+            mWhatHandler.postAtTime(new Runnable() {
+                @Override
+                public void run() {
+                    isWhating = false;
+                    loadByInput(ct, null, lastKey, mOnSearchLocationListener);
+                }
+            }, 1000);
+        }
+    }
+
     /**
      * 通过输入进行搜索
      *
@@ -281,9 +284,12 @@ public class NativeLocationManager implements BaseLocationManager {
      * @param mOnSearchLocationListener
      */
     public void loadByInput(Context ct, String city, String keyWord, final OnSearchLocationListener mOnSearchLocationListener) {
+        if (ct == null || mOnSearchLocationListener == null)
+            return;
+
         this.lastKey = keyWord;
         if (isWhating || isResulting) {
-            startWhat(ct,mOnSearchLocationListener);
+            startWhat(ct, mOnSearchLocationListener);
             return;
         }
         isResulting = true;
@@ -295,6 +301,7 @@ public class NativeLocationManager implements BaseLocationManager {
                 .method(Method.GET)
                 .add("key", ct.getString(R.string.app_google_key));
         HttpClient request = requestBuilder.build();
+        MLOGGER.log(Level.INFO, "发送请求");
         getHttpClient().Api().send(request, new ResultSubscriber<>(new Result2Listener<Object>() {
             @Override
             public void onResponse(Object s) {

app_modular/appmessages/src/main/res/layout/activity_approval_list.xml

@@ -39,13 +39,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="top|right"
-                    android:layout_marginRight="25dp"
+                    android:layout_marginRight="10dp"
                     android:visibility="visible"
                     android:background="@drawable/tab_unread_bg"
                     android:gravity="center"
                     android:text="99"
                     android:textColor="@android:color/white"
-                    android:textSize="10sp" />
+                    android:textSize="10dp" />
             </FrameLayout>
 
             <View

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

@@ -134,7 +134,7 @@ public class SelectNetAcitivty extends OABaseActivity {
             dataForm = intent.getBooleanExtra("dataForm", false);
             corekey = intent.getStringExtra("corekey");
             isDevice = intent.getBooleanExtra("isDevice", false);
-            groupId=intent.getIntExtra("groupId",0);
+            groupId = intent.getIntExtra("groupId", 0);
         }
         VoiceSearchView voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         refreshListView = (PullToRefreshListView) findViewById(R.id.refreshListView);
@@ -249,13 +249,30 @@ public class SelectNetAcitivty extends OABaseActivity {
 
     }
 
+
+    private String getCondition(String keyWork) {
+        StringBuilder builder = new StringBuilder();
+        if (configMap == null || configMap.isEmpty()) {
+            builder.append("upper(" + (StringUtil.isEmpty(corekey) ? fieldKey : corekey) + ") like '%" + keyWork.toUpperCase() + "%'");
+        } else {
+            for (Map.Entry<String, String> e : configMap.entrySet()) {
+                builder.append("upper(" + e.getKey() + ") like '%" + keyWork.toUpperCase() + "%' or ");
+            }
+            if (builder.length() > 3) {
+                builder.delete(builder.length() - 3, builder.length() - 1);
+            }
+        }
+        return builder.toString();
+    }
+
+
     private void loadSearch(int page, final String keyWork) {
         refreshListView.setMode(PullToRefreshBase.Mode.BOTH);
         String condition = null;
         if (StringUtil.isEmpty(keyWork)) {
             condition = "1=1";
         } else {
-            condition = "upper(" + (StringUtil.isEmpty(corekey) ? fieldKey : corekey) + ") like '%" + keyWork.toUpperCase() + "%'";
+            condition = getCondition(keyWork);
         }
         HttpClient.Builder builder = new HttpClient.Builder();
         boolean isForm = StringUtil.isEmpty(gCaller);
@@ -305,20 +322,24 @@ public class SelectNetAcitivty extends OABaseActivity {
     }
 
 
+    private Map<String, String> configMap;
+    private String fieldKeyLike = null;
+
     private void setData2Adapter(JSONArray data, JSONArray dbfinds) throws Exception {
-        Map<String, String> configMap = new LinkedHashMap<>();
-        //获取配置
-        JSONObject config = null;
-        String fieldKeyLike = null;
-        for (int i = 0; i < dbfinds.size(); i++) {
-            config = dbfinds.getJSONObject(i);
-            String dbGridField = JSONUtil.getText(config, "dbGridField", "ds_dbfindfield");
-            String field = JSONUtil.getText(config, "field", "ds_gridfield");
-            if (!StringUtil.isEmpty(dbGridField) && !StringUtil.isEmpty(field)) {
-                if (field.equals(fieldKey)) {
-                    fieldKeyLike = dbGridField;
+        if (configMap == null || TextUtils.isEmpty(fieldKeyLike)) {
+            configMap = new LinkedHashMap<>();
+            //获取配置
+            JSONObject config = null;
+            for (int i = 0; i < dbfinds.size(); i++) {
+                config = dbfinds.getJSONObject(i);
+                String dbGridField = JSONUtil.getText(config, "dbGridField", "ds_dbfindfield");//显示值对应字段名
+                String field = JSONUtil.getText(config, "field", "ds_gridfield");//实际字段名
+                if (!StringUtil.isEmpty(dbGridField) && !StringUtil.isEmpty(field)) {
+                    if (field.equals(fieldKey)) {
+                        fieldKeyLike = dbGridField;
+                    }
+                    configMap.put(dbGridField, field);
                 }
-                configMap.put(dbGridField, field);
             }
         }
         JSONObject o = null;
@@ -359,7 +380,7 @@ public class SelectNetAcitivty extends OABaseActivity {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                     if (mAdapter != null) {
                         Bean model = mAdapter.getModels((int) l);
-                        setResult(90, new Intent().putExtra("data", model.json).putExtra("groupId",groupId));
+                        setResult(90, new Intent().putExtra("data", model.json).putExtra("groupId", groupId));
                         finish();
 
                     }

app_modular/apputils/src/main/res/layout/item_approval_list.xml

@@ -19,7 +19,7 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="wrap_content"
             android:padding="@dimen/padding">
 
             <de.hdodenhof.circleimageview.CircleImageView

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

@@ -36,6 +36,7 @@ import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.OAConfig;
 import com.core.model.WorkModel;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.lidroid.xutils.ViewUtils;
@@ -87,7 +88,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
             if (presenter != null && !isChangePoi) presenter.upDateLocation();
         }
     };
-    private OnLocationListener mOnLocationListener= new OnLocationListener() {
+    private OnLocationListener mOnLocationListener = new OnLocationListener() {
         @Override
         public void onReceiveLocation(UASLocation mUASLocation) {
             if (presenter != null && !isChangePoi) presenter.upDateLocation();
@@ -146,7 +147,12 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        setTitle(R.string.activity_signing);
+        String mMasterName = CommonUtil.getSharedPreferences(ct, "Master_ch");
+        if (StringUtil.isEmpty(mMasterName)) {
+            setTitle(R.string.activity_signing);
+        } else {
+            setTitle(mMasterName);
+        }
         isAdmin = getIntent() == null ? false : getIntent().getBooleanExtra(AppConfig.IS_ADMIN, false);
         listview = (RecyclerView) findViewById(R.id.listview);
         empty_tv = (TextView) findViewById(R.id.empty_tv);

app_modular/appworks/src/main/res/layout/activity_business_travel.xml

@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:visibility="gone"
-        android:orientation="horizontal"
        >
 
         <ImageView
@@ -28,15 +27,20 @@
             android:layout_below="@id/remainImg"
             android:layout_width="wrap_content"
             android:textSize="@dimen/text_min"
+            android:paddingLeft="@dimen/padding"
+            android:layout_centerHorizontal="true"
+            android:paddingRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
             android:layout_height="wrap_content" />
 
         <TextView
             android:id="@+id/remainTv"
-            android:layout_alignTop="@id/remainTag"
-            android:layout_toRightOf="@id/remainTag"
+            android:layout_below="@id/remainTag"
             android:layout_width="wrap_content"
             android:textColor="#D13F57"
+            android:layout_centerHorizontal="true"
+            android:paddingLeft="@dimen/padding"
+            android:paddingRight="@dimen/padding"
             android:textSize="@dimen/text_min"
             android:layout_marginLeft="@dimen/paddingMin"
             android:layout_height="wrap_content" />