Bitliker:合并发布版本代码

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

@@ -282,7 +282,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
                 startActivityForResult(intent, 0x23);
 
                 break;
-            case R.id.item_long_tv:
+            case R.id.navigation_tv:
                 intent = new Intent(ct, NavigationActivity.class);
                 intent.putExtra("toLocation", model.getLatLng());
                 startActivityForResult(intent, 0x23);

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

@@ -66,9 +66,13 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
         if (entity == null) return;
         holder.item_title_tv.setText("目的地 " + (position + 1));
         holder.item_delete_tv.setVisibility((entity.getStatus() != 1 && position != 0) ? View.VISIBLE : View.GONE);
-        if (entity.getDistance() != 0)
+        if (entity.getDistance() != 0) {
             holder.item_length_tv.setText(getKm(entity.getDistance()) + "km");
-        else holder.item_length_tv.setText("");
+            holder.navigation_tv.setVisibility(View.VISIBLE);
+        } else {
+            holder.navigation_tv.setVisibility(View.GONE);
+            holder.item_length_tv.setText("");
+        }
         if (entity.getLatLng() != null) {
             holder.item_long_tv.setText(getKm(BaiduMapUtil.getInstence().getDistance(entity.getLatLng())) + "km");
         } else {
@@ -148,11 +152,11 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
                     onitemClickListener.click(position, models.get(position), holder.item_remark_tv);
             }
         });
-        holder.item_long_tv.setOnClickListener(new View.OnClickListener() {
+        holder.navigation_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 if (onitemClickListener != null)
-                    onitemClickListener.click(position, models.get(position), holder.item_long_tv);
+                    onitemClickListener.click(position, models.get(position), holder.navigation_tv);
             }
         });
 
@@ -185,6 +189,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
                 item_time_tv,//创建时间
                 item_long_tv,
                 item_company_tv, //公司名称
+                navigation_tv, //公司名称
                 item_remark_tv;//目的
         RadioButton item_half_rb, item_all_rb;
 
@@ -204,6 +209,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
             item_remark_tv = (TextView) itemView.findViewById(R.id.item_remark_tv);
             item_half_rb = (RadioButton) itemView.findViewById(R.id.item_half_rb);
             item_all_rb = (RadioButton) itemView.findViewById(R.id.item_all_rb);
+            navigation_tv = (TextView) itemView.findViewById(R.id.navigation_tv);
         }
     }
 

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

@@ -73,7 +73,8 @@ public class OAHttpUtil {
             model.setHandler(OACheckUtil.getJson2Text(o, "handler", "visitman", "vr_emname", "doman"));
             model.setStatus(OACheckUtil.getJson2Text(o, "mpd_status", "status"));
             model.setJson(o.toString());
-            models.add(model);
+            if (canShow(model))
+                models.add(model);
         }
         if (!ListUtils.isEmpty(models)) {
             Collections.sort(models, new Comparator<OAModel>() {
@@ -96,13 +97,16 @@ public class OAHttpUtil {
         return 0;
     }
 
-    public boolean canShow(OAModel e, Date curDate) {
+    public boolean canShow(OAModel e) {
         if (e.isMission() && e.getStatus().equals("已完成"))
             return false;
-        else if (e.isTask() && "待确认".equals(e.getStatus()) && !e.getRecorder().equals(e.getHandler()))
+        else if (e.isTask() && "待确认".equals(e.getStatus()) && !e.getRecorder().trim().equals(e.getHandler().trim()))
             return false;
-        else
-            return StringUtils.isInclude(e.getFilterTime(), TimeUtils.s_format.format(curDate));
+        return true;
+    }
+
+    public boolean canShow(OAModel e, Date curDate) {
+        return StringUtils.isInclude(e.getFilterTime(), TimeUtils.s_format.format(curDate));
     }
 
     public boolean isTaskOk(OAModel e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -17,10 +17,12 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
+import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;

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

@@ -317,6 +317,7 @@
         android:paddingRight="@dimen/misson_item_pr">
 
         <TextView
+            android:id="@+id/item_long_tag"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
@@ -325,10 +326,25 @@
             android:textSize="@dimen/text_main" />
 
         <TextView
-            android:id="@+id/item_long_tv"
+            android:id="@+id/navigation_tv"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
+            android:drawablePadding="5dp"
+            android:drawableRight="@drawable/navigation"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:lines="1"
+            android:text="导航"
+            android:textColor="#1296db"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/item_long_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginRight="15dp"
+            android:layout_toLeftOf="@id/navigation_tv"
             android:ellipsize="end"
             android:gravity="center"
             android:lines="1"