1、外勤备注区分手动和自动

2、抢商机，商机分配

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Apr 12 10:11:25 CST 2019
+#Mon Apr 29 17:27:50 CST 2019
 debugName=972
-versionName=672
+versionName=674
 debugCode=972
-versionCode=227
+versionCode=229

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailActivty.java

@@ -43,6 +43,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appworks.CRM.erp.model.Business;
 import com.uas.appworks.R;
+import com.uas.appworks.activity.businessManage.businessDetailActivity.BusinessDetailNewActivity;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -129,14 +130,15 @@ public class BusinessDetailActivty extends BaseActivity {
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                final BussinessDetailAdapter.OldViewHolder holder = (BussinessDetailAdapter.OldViewHolder) view.getTag();
+               /* final BussinessDetailAdapter.OldViewHolder holder = (BussinessDetailAdapter.OldViewHolder) view.getTag();
                 startActivity(new Intent(BusinessDetailActivty.this, BusinessDetailInfoActivity.class)
                         .putExtra("type", holder.type)
                         .putExtra("formCondition", formCondition + "=" + holder.bc_id)
                         .putExtra("gridCondition", gridCondition + "=" + holder.bc_id)
                         .putExtra("id", holder.bc_id)
-                );
-                /*try {
+                );*/
+
+                try {
                     int itemAtPosition = (int) parent.getItemIdAtPosition(position);
                     Business business = mData.get(itemAtPosition);
                     startActivity(new Intent(mContext, BusinessDetailNewActivity.class)
@@ -147,7 +149,7 @@ public class BusinessDetailActivty extends BaseActivity {
                             .putExtra(Constants.FLAG.COMMON_WHICH_PAGE, "businessCompany"));
                 } catch (Exception e) {
 
-                }*/
+                }
             }
         });
 

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

@@ -130,7 +130,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
                 plans.add(e);
             }
         }
-        MissionModel mission = reckonMission(plans);//判断
+        MissionModel mission = reckonMission(plans);//判断，获取距离最近的外勤计划
         if (mission == null) {
             iMission.showToast("无可签到签退的计划", R.color.load_error);
         } else {
@@ -451,7 +451,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
         String address = UasLocationHelper.getInstance().getUASLocation().getAddress();
         if (StringUtil.isEmpty(address))
             address = model.getCompanyAddr();
-        String remark = model.getStatus() == 2 ? "手动外勤签退" : "手动外勤签到";
+        String remark = model.getStatus() == 2 ? "Android手动外勤签退:手动" : "Android手动外勤签到:手动";
         String location = model.getCompanyName();
         if (StringUtil.isEmpty(location) || isB2b)
             location = UasLocationHelper.getInstance().getUASLocation().getName();

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

@@ -148,8 +148,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         String address = UasLocationHelper.getInstance().getUASLocation().getAddress();
         if (StringUtil.isEmpty(address))
             address = model.getCompanyAddr();
-        String remark = model.getStatus() == 2 ? MyApplication.getInstance().getString(R.string.auto_mission_signindown)
-                : MyApplication.getInstance().getString(R.string.auto_mission_signinup);
+        String remark = model.getStatus() == 2 ? "Android自动外勤签退:自动"
+                : "Android自动外勤签到:自动";
         String location = model.getCompanyName();
         if (StringUtil.isEmpty(location) || isB2b)
             location = UasLocationHelper.getInstance().getUASLocation().getName();

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

@@ -48,7 +48,8 @@
 
                 <LinearLayout
                     android:id="@+id/business_manage_home_company_ll"
-                    style="@style/business_manage_header_item">
+                    style="@style/business_manage_header_item"
+                    android:visibility="gone">
 
                     <ImageView
                         android:layout_width="40dp"
@@ -85,66 +86,40 @@
 
                 <LinearLayout
                     android:id="@+id/business_manage_home_grap_ll"
-                    style="@style/business_manage_header_item"
-                    android:visibility="invisible">
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:paddingBottom="10dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:paddingTop="0dp"
-                android:visibility="gone">
-
-                <LinearLayout
-                    android:id="@+id/business_manage_home_distribution_ll"
                     style="@style/business_manage_header_item">
 
                     <ImageView
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:src="@drawable/ic_business_header_distribution" />
+                        android:src="@drawable/ic_business_header_race" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
-                        android:text="商机分配"
+                        android:text="抢占商机"
                         android:textColor="#333333"
                         android:textSize="12sp" />
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/business_manage_home_distribution_ll"
                     style="@style/business_manage_header_item">
 
                     <ImageView
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:src="@drawable/ic_business_header_race" />
+                        android:src="@drawable/ic_business_header_distribution" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
-                        android:text="抢占商机"
+                        android:text="商机分配"
                         android:textColor="#333333"
                         android:textSize="12sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    style="@style/business_manage_header_item">
-                </LinearLayout>
 
-                <LinearLayout
-                    style="@style/business_manage_header_item">
                 </LinearLayout>
-
             </LinearLayout>
 
             <LinearLayout