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

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

@@ -103,7 +103,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="20dp"
+                android:layout_marginLeft="@dimen/padding"
                 android:layout_toRightOf="@+id/tv_id3"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -138,7 +138,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="35dp"
+                android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id4"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -170,7 +170,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="50dp"
+                android:layout_marginLeft="35dp"
                 android:layout_toRightOf="@+id/phone_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -204,7 +204,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="20dp"
+                android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/tv_id5"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -237,7 +237,7 @@
             <TextView
                 android:id="@+id/textView"
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="20dp"
+                android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/tv_id6"
                 android:text="*"
                 android:textColor="@color/red" />

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

@@ -74,7 +74,8 @@
         <com.core.widget.view.HorizontalStepsView
             android:id="@+id/stepsView"
             android:layout_width="match_parent"
-            android:layout_height="80dp" />
+            android:layout_height="wrap_content"
+            android:minHeight="80sp"/>
 
     </LinearLayout>
 

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

@@ -90,6 +90,7 @@
 
         <RelativeLayout
             style="@style/crm_ll_sale_item"
+            android:layout_marginRight="110dp"
             android:layout_gravity="right"
             >
 

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

@@ -117,7 +117,7 @@
                 android:background="@color/black_gray" />
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:gravity="center_vertical"

app_core/common/src/main/java/com/core/utils/time/wheel/ConfirmPopup.java

@@ -7,6 +7,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
@@ -215,7 +216,7 @@ public abstract class ConfirmPopup<V extends View> extends BottomPopup<View> {
         cancelButton.setLayoutParams(cancelButtonLayoutParams);
         cancelButton.setBackgroundColor(Color.TRANSPARENT);
         cancelButton.setGravity(Gravity.CENTER);
-        cancelButton.setTextSize(18f);
+        cancelButton.setTextSize(TypedValue.COMPLEX_UNIT_DIP,18f);
         if (!TextUtils.isEmpty(cancelText)) {
             cancelButton.setText(cancelText);
         }
@@ -251,7 +252,7 @@ public abstract class ConfirmPopup<V extends View> extends BottomPopup<View> {
         submitButtonLayoutParams.rightMargin = ConvertUtils.toPx(activity, 10);
         submitButton.setLayoutParams(submitButtonLayoutParams);
         submitButton.setBackgroundColor(Color.TRANSPARENT);
-        submitButton.setTextSize(18f);
+        submitButton.setTextSize(TypedValue.COMPLEX_UNIT_DIP,18f);
         submitButton.setGravity(Gravity.CENTER);
         if (!TextUtils.isEmpty(submitText)) {
             submitButton.setText(submitText);

app_core/common/src/main/java/com/core/widget/view/HorizontalStepsView.java

@@ -163,16 +163,34 @@ public class HorizontalStepsView extends View {
 
     private void drawMessage(Canvas canvas, int i) {
         String title = titles[i];
-        float textX = surface.textPaint.measureText(title);
+//        float textX = surface.textPaint.measureText(title);
         float textY = surface.lineY + surface.stopRadius + surface.textPaint.getTextSize();
-        if (textX > surface.itemWidth) {
-            String mag1 = title.substring(0, title.length() / 2);
-            String mag2 = title.substring(title.length() / 2, title.length());
-            canvas.drawText(mag1, surface.startX + (i * surface.itemWidth), textY, surface.textPaint);
-            canvas.drawText(mag2, surface.startX + (i * surface.itemWidth), textY + surface.textPaint.getTextSize(), surface.textPaint);
-        } else {
-            canvas.drawText(title, surface.startX + (i * surface.itemWidth), textY, surface.textPaint);
+
+        int length = title.length();//剩余字符数
+        int currentPosition = 0;
+        int line = 0;
+        while (length > currentPosition) {
+            if (line > 2) {
+                String mag = "...";
+                canvas.drawText(mag, surface.startX + (i * surface.itemWidth), textY + surface.textPaint.getTextSize() * line, surface.textPaint);
+                currentPosition = length;
+            } else {
+                String mag = title.substring(currentPosition, Math.min(length, currentPosition + 2));
+                canvas.drawText(mag, surface.startX + (i * surface.itemWidth), textY + surface.textPaint.getTextSize() * line, surface.textPaint);
+
+            }
+            line++;
+            currentPosition += 2;
         }
+
+//        if (textX > surface.itemWidth) {
+//            String mag1 = title.substring(0, title.length() / 2);
+//            String mag2 = title.substring(title.length() / 2, title.length());
+//            canvas.drawText(mag1, surface.startX + (i * surface.itemWidth), textY, surface.textPaint);
+//            canvas.drawText(mag2, surface.startX + (i * surface.itemWidth), textY + surface.textPaint.getTextSize(), surface.textPaint);
+//        } else {
+//            canvas.drawText(title, surface.startX + (i * surface.itemWidth), textY, surface.textPaint);
+//        }
     }
 
     private void drawPoints(Canvas canvas, int i, float x) {

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

@@ -74,7 +74,7 @@
         <com.core.widget.view.HorizontalStepsView
             android:id="@+id/stepsView"
             android:layout_width="match_parent"
-            android:layout_height="80dp" />
+            android:layout_height="80sp" />
 
     </LinearLayout>
 

app_modular/applocation/src/main/AndroidManifest.xml

@@ -1,8 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.uas.applocation">
-
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"
+        tools:ignore="MockLocation,ProtectedPermissions" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <uses-permission
         android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />

app_modular/applocation/src/main/java/com/uas/applocation/utils/AreaUtils.java

@@ -50,10 +50,6 @@ public class AreaUtils {
 
     }
 
-
-/**
- * 方法二
- */
     /**
      * 查询手机的 MCC+MNC
      */

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

@@ -257,6 +257,7 @@ public class SignUtils implements OnHttpResultListener {
             }
         }
         form.put("cl_phone", phone);
+        form.put("facecard", 1);//添加一个参数
         form.put("cl_emcode", getSharedPreferences(ct, "erp_username"));
         form.put("cl_emname", CommonUtil.getName());
         form.put("cl_distance", dis);

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/WorkPresenter.java

@@ -13,21 +13,17 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.core.dao.UserDao;
 import com.core.dao.WorkLocationDao;
 import com.core.dao.work.WorkModelDao;
-import com.core.model.User;
 import com.core.model.WorkLocationModel;
 import com.core.model.WorkModel;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
-import com.core.utils.CommonInterface;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.WorkHandlerUtil;
@@ -126,55 +122,6 @@ public class WorkPresenter implements OnHttpResultListener {
     }
 
 
-    //签到
-    private void signinWork(Bundle bundle, String code) {
-        if (iWorkView != null) iWorkView.showLoading();
-        Map<String, Object> param = new HashMap<>();
-        Map<String, Object> form = new HashMap<>();
-
-        //如果是erp就上传code
-        if (!isB2b)
-            form.put("cl_code", code);
-        if (StringUtil.isEmpty(address))
-            address = PreferenceUtils.getString("bdaddress");
-        String phone = MyApplication.getInstance().mLoginUser.getTelephone();
-        if (StringUtil.isEmpty(phone)) {
-            String userId = MyApplication.getInstance().mLoginUser.getUserId();
-            if (!StringUtil.isEmpty(userId)) {
-                User user = UserDao.getInstance().getUserByUserId(userId);
-                phone = user.getTelephone();
-            } else
-                phone = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_phone");
-        }
-        String emCode = CommonUtil.getEmcode();
-        String emname = CommonUtil.getName();
-        if (StringUtil.isEmpty(loaction))
-            loaction = PreferenceUtils.getString("bdlocation");
-        form.put("cl_address", address);//地址
-        form.put("cl_phone", phone);    //电话号码
-        form.put("cl_distance", distance);//距离
-        form.put("cl_emname", emname);  //名字
-        form.put("cl_location", loaction); //位置
-        form.put("cl_emcode", emCode);//编号 erp员工编号  b2b  enuu
-        if (isB2b) {
-            form.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            form.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-        }
-        String formStore = JSONUtil.map2JSON(form);
-        param.put("formStore", formStore);
-        if (!isB2b)
-            param.put("caller", "CardLog");
-
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url : "mobile/saveCardLog.action";
-        Request request = new Request.Bulider()
-                .setUrl(url)
-                .setWhat(SIGNING)
-                .setMode(Request.Mode.POST)
-                .setParam(param)
-                .setBundle(bundle)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
 
 
     /*获取高级设置*/
@@ -566,29 +513,6 @@ public class WorkPresenter implements OnHttpResultListener {
         }
     }
 
-    /**
-     * 提交打卡
-     *
-     * @param models     班次以及打卡记录数据
-     * @param macAddress mac地址
-     */
-    private void submitWork(final ArrayList<WorkModel> models, String macAddress) {
-        subMitTime = System.currentTimeMillis();
-        final Bundle bundle = new Bundle();
-        bundle.putParcelableArrayList("models", models);
-        if (isB2b) {
-            signinWork(bundle, "");
-        } else {
-            CommonInterface.getInstance().getCodeByNet("CardLog", new CommonInterface.OnResultListener() {
-                @Override
-                public void result(boolean isOk, int result, String message) {
-                    signinWork(bundle, message);
-                }
-            });
-
-            //validatorMac(models, macAddress);//TODO 去除mac地址验证
-        }
-    }
 
 
     /**

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -216,6 +216,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                 phone = getSharedPreferences(MyApplication.getInstance(), "user_phone");
         }
         form.put("cl_phone", phone);
+        form.put("facecard", 1);//添加一个参数
         form.put("cl_emcode", getSharedPreferences(ct, "erp_username"));
         String emname = getSharedPreferences(ct, "erp_emname");
         if (StringUtil.isEmpty(emname)) {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/BusinessTravelAdapter.java

@@ -11,32 +11,16 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.alibaba.fastjson.JSON;
-import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
-import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.hmac.Md5Util;
-import com.core.app.MyApplication;
-import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
-import com.core.utils.IntentUtils;
-import com.core.utils.ToastUtil;
 import com.modular.apputils.widget.TravelDirectionView;
 import com.uas.appworks.OA.platform.model.BusinessTravel;
 import com.uas.appworks.R;
 import com.uas.appworks.utils.TravelUtils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by Bitlike on 2017/12/12.
@@ -316,13 +300,13 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 dateTv;//入住时间|返程时间
         RelativeLayout subRl;
         RelativeLayout userInfoRl;
-        RelativeLayout orderInfoRl;
+        LinearLayout orderInfoRl;
         View line;
 
         public BaseViewHlder(View itemView) {
             super(itemView);
             subRl = (RelativeLayout) itemView.findViewById(R.id.subRl);
-            orderInfoRl = (RelativeLayout) itemView.findViewById(R.id.orderInfoRl);
+            orderInfoRl = itemView.findViewById(R.id.orderInfoRl);
             line = itemView.findViewById(R.id.line);
             userInfoRl = (RelativeLayout) itemView.findViewById(R.id.userInfoRl);
             codeTv = (TextView) itemView.findViewById(R.id.codeTv);

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

@@ -37,27 +37,27 @@
             android:textSize="@dimen/text_hine" />
 
         <View
+            android:id="@+id/line"
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
-            android:id="@+id/line"
             android:layout_below="@id/codeTv"
             android:background="@color/item_line" />
 
-        <RelativeLayout
+        <LinearLayout
             android:id="@+id/orderInfoRl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/codeTv"
-            android:layout_marginTop="@dimen/padding">
+            android:layout_marginTop="@dimen/padding"
+            android:orientation="horizontal">
 
             <LinearLayout
                 android:id="@+id/fromLL"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/codeTv"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="@dimen/padding"
-                android:layout_marginTop="@dimen/padding"
+                android:layout_weight="1"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
@@ -65,7 +65,10 @@
                     android:id="@+id/fromCityTv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="上海"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:maxLines="2"
+                    android:text=""
                     android:textColor="@color/white"
                     android:textSize="@dimen/textXXL" />
 
@@ -89,14 +92,23 @@
 
             </LinearLayout>
 
+            <com.modular.apputils.widget.TravelDirectionView
+                android:id="@+id/mTravelDirectionView"
+                android:layout_width="80dp"
+                android:layout_height="60dp"
+                app:time="2小时20分"
+                app:timeSize="14dp"
+                app:title="D7890"
+                app:titleSize="16dp" />
+
             <LinearLayout
                 android:id="@+id/toLL"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_alignTop="@id/fromLL"
                 android:layout_marginLeft="@dimen/padding"
                 android:layout_marginRight="20dp"
+                android:layout_weight="1"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
@@ -106,7 +118,8 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_below="@id/codeTv"
-                    android:text="深圳"
+                    android:gravity="center"
+                    android:text=""
                     android:textColor="@color/white"
                     android:textSize="@dimen/textXXL" />
 
@@ -133,20 +146,7 @@
             </LinearLayout>
 
 
-            <com.modular.apputils.widget.TravelDirectionView
-                android:id="@+id/mTravelDirectionView"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_alignTop="@id/fromLL"
-                android:layout_toLeftOf="@id/toLL"
-                android:layout_toRightOf="@id/fromLL"
-                app:time="2小时20分"
-                app:timeSize="@dimen/text_hine"
-                app:title="D7890"
-                app:titleSize="@dimen/text_main" />
-
-
-        </RelativeLayout>
+        </LinearLayout>
 
 
     </RelativeLayout>
@@ -185,7 +185,7 @@
             android:layout_marginLeft="@dimen/padding"
             android:layout_toLeftOf="@id/idTypeTv"
             android:layout_toRightOf="@id/nameTv"
-            android:text="4501221994312319827"
+            android:text=""
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
 
@@ -193,7 +193,7 @@
             android:id="@+id/orderTypeTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/nameTv"
+            android:layout_below="@id/idCardTv"
             android:layout_marginBottom="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
             android:text="1间"
@@ -217,12 +217,12 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/orderTypeTv"
             android:layout_marginLeft="30dp"
+            android:layout_toLeftOf="@+id/payTypeTv"
             android:layout_toRightOf="@id/seatTv"
-            android:text="54元"
+            android:ellipsize="end"
             android:lines="1"
             android:paddingRight="3dp"
-            android:ellipsize="end"
-            android:layout_toLeftOf="@+id/payTypeTv"
+            android:text="54元"
             android:textColor="@color/indianred"
             android:textSize="@dimen/text_main" />