处理关于外勤的相关bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -194,6 +194,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private JSONArray custs;
     @ViewInject(R.id.client_ptrsv)
     private PullToRefreshScrollView mPullToRefreshScrollView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -224,11 +225,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         mPullToRefreshScrollView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ScrollView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ScrollView> refreshView) {
-                if (CommonUtil.isNetWorkConnected(ClientActivity.this)){
+                if (CommonUtil.isNetWorkConnected(ClientActivity.this)) {
                     mHttpCount = 0;
                     initData();
-                }else {
-                    ViewUtil.ToastMessage(ClientActivity.this,"网络未连接",Style.holoRedLight,2000);
+                } else {
+                    ViewUtil.ToastMessage(ClientActivity.this, "网络未连接", Style.holoRedLight, 2000);
                     mPullToRefreshScrollView.onRefreshComplete(1000);
                 }
             }
@@ -693,8 +694,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                     }, ct.getResources().getColor(R.color.red));
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right, profits.getJSONArray(1).get(0) + "万元"
                                     , new String[]{
-                                    String.valueOf(profits.getJSONArray(0).get(0))
-                            }, ct.getResources().getColor(R.color.gray));
+                                            String.valueOf(profits.getJSONArray(0).get(0))
+                                    }, ct.getResources().getColor(R.color.gray));
                         } else {
                             if (profits.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct, "erp_username"))) {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
@@ -705,8 +706,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right, profits.getJSONArray(0).get(0) + "万元"
                                         , new String[]{
-                                        String.valueOf(profits.getJSONArray(0).get(0))
-                                }, ct.getResources().getColor(R.color.gray));
+                                                String.valueOf(profits.getJSONArray(0).get(0))
+                                        }, ct.getResources().getColor(R.color.gray));
 
                             } else {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
@@ -929,7 +930,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
-                    if (mPullToRefreshScrollView.isRefreshing()){
+                    if (mPullToRefreshScrollView.isRefreshing()) {
                         mPullToRefreshScrollView.onRefreshComplete();
                     }
                     break;
@@ -949,9 +950,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     }
                     break;
             }
-            if (mHttpCount > 4){
-                if (mPullToRefreshScrollView.isRefreshing()){
-                    ViewUtil.ToastMessage(ClientActivity.this,"刷新成功", Style.holoGreenLight,2000);
+            if (mHttpCount > 4) {
+                if (mPullToRefreshScrollView.isRefreshing()) {
+                    ViewUtil.ToastMessage(ClientActivity.this, "刷新成功", Style.holoGreenLight, 2000);
                     mPullToRefreshScrollView.onRefreshComplete();
                 }
             }
@@ -1039,7 +1040,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, INIT_PersonalRank, null, null, "post");
     }
 
-    
+
     private PopupWindow popupWindow = null;
 
     public void showPopupWindow(View parent) {
@@ -1077,10 +1078,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         /*case 5:
 
                             break;*/
-                        case 2:
-                            startActivity(new Intent(ClientActivity.this, VisitReportPlanActivity.class));
-                            break;
                         case 3:
+                            break;
+                        case 2:
                             startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
                             break;
                        /* case 4:
@@ -1144,9 +1144,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         map.put("item_name", "新增分享");
         list.add(map);*/
 
-        map = new HashMap<String, Object>();
-        map.put("item_name", "新增拜访计划");
-        list.add(map);
+//        map = new HashMap<String, Object>();
+//        map.put("item_name", "新增拜访计划");
+//        list.add(map);
 
         map = new HashMap<String, Object>();
         map.put("item_name", "新增拜访报告");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerDetailActivity.java

@@ -9,7 +9,6 @@ import android.os.Message;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -112,18 +111,18 @@ public class CustomerDetailActivity extends BaseActivity {
     }
 
     private void initListener() {
-        mAddPlanBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setClass(CustomerDetailActivity.this, VisitReportPlanActivity.class);
-                intent.putExtra("customer_name", mCustomerName);
-                intent.putExtra("customer_code",mCustomerCode);
-                intent.putExtra("contact_name", mContactName);
-                intent.putExtra("customer_address", mCustomerAddress);
-                startActivity(intent);
-            }
-        });
+//        mAddPlanBtn.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                Intent intent = new Intent();
+//                intent.setClass(CustomerDetailActivity.this, VisitReportPlanActivity.class);
+//                intent.putExtra("customer_name", mCustomerName);
+//                intent.putExtra("customer_code",mCustomerCode);
+//                intent.putExtra("contact_name", mContactName);
+//                intent.putExtra("customer_address", mCustomerAddress);
+//                startActivity(intent);
+//            }
+//        });
     }
 
     private void initData() {

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

@@ -46,7 +46,6 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.TaskAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.OAListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
@@ -271,7 +270,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             }
             finish();
         } else if (item.getItemId() == R.id.add_item) {
-            showPopupWindow(getWindow().findViewById(R.id.add_item));
+            if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) {//从客户
+                showPopupWindow(getWindow().findViewById(R.id.add_item));
+            } else {
+                Intent intent = new Intent(ct, VisitReportAddActivity.class);
+                startActivityForResult(intent, 0x20);
+            }
         } else {
             return super.onOptionsItemSelected(item);
 
@@ -584,7 +588,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     adapter = new OAListAdapter(ct);
                 for (int i = 0; i < a.size(); i++) {
                     o = a.getJSONObject(i);
-                    if (adapter.isVisit(o) || adapter.isVisitRecord(o))
+                    if (adapter.isVisit(o) || adapter.isVisitRecord(o)||adapter.isOutplan(o))
                         chcheArray.add(o);
                 }
             } else {
@@ -616,7 +620,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         for (int i = 0; i < array.size(); i++) {
             object = array.getJSONObject(i);
             time = getTimeForObject(object);
-            if (adapter.isOutplan(object) && !StringUtils.isEmpty(adapter.getJSONString(object, "mpd_status")) && "已完成".equals(adapter.getJSONString(object, "mpd_status")))
+            if (adapter.isOutplan(object) && !StringUtils.isEmpty(adapter.getJSONString(object, "mpd_status"))
+                    && "已完成".equals(adapter.getJSONString(object, "mpd_status")))
                 continue;
             if (!StringUtils.isEmpty(time) && getIsDecorat(time, TimeUtils.s_format.format(curDate))) {//该时间为选择时间
                 //判断是否为该下属
@@ -695,27 +700,17 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     popupWindow.dismiss();
                     switch (position) {
                         case 0:
-                            if (!(getIntent() == null || getIntent().getIntExtra("type", 0) != 1)) {
-                                intent = new Intent(ct, VisitReportPlanActivity.class);
-                            } else {
-                                intent = new Intent(ct, TaskAddActivity.class);
-                                intent.putExtra("type", 0);
-                            }
+                            intent = new Intent(ct, TaskAddActivity.class);
+                            intent.putExtra("type", 0);
                             break;
                         case 1:
-                            if (!(getIntent() == null || getIntent().getIntExtra("type", 0) != 1)) {
-                                intent = new Intent(ct, VisitReportAddActivity.class);
-                            } else {
-                                intent = new Intent(ct, TaskAddActivity.class);
-                                intent.putExtra("type", 1);
-                            }
+                            intent = new Intent(ct, TaskAddActivity.class);
+                            intent.putExtra("type", 1);
                             break;
                         case 2:
-                            intent = new Intent(ct, VisitReportPlanActivity.class);
-                            break;
-                        case 3:
                             intent = new Intent(ct, VisitReportAddActivity.class);
                             break;
+
                     }
                     if (intent != null)
                         startActivityForResult(intent, 0x20);
@@ -752,9 +747,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             list.add(map);
             map = new HashMap<>();
         }
-        map.put("item_name", "新增拜访计划");
-        list.add(map);
-        map = new HashMap<>();
+//        map.put("item_name", "新增拜访计划");
+//        list.add(map);
+//        map = new HashMap<>();
         map.put("item_name", "新增拜访报告");
         list.add(map);
         return list;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpService.java

@@ -138,7 +138,7 @@ public class AutoErpService extends Service {
                 if (e != null) log("BroadcastReceiver Exception=" + e.getMessage());
             }
 
-            if (PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP) == 1 && intent.getAction().equals("uu.step.destory")){
+            if (PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP) == 1 && intent.getAction().equals("uu.step.destory")) {
                 Intent i = new Intent(context, StepService.class);
                 context.startService(i);
             }
@@ -353,6 +353,7 @@ public class AutoErpService extends Service {
         } catch (Exception e) {
         }
         signinUitl = new AutoErpSigninUitl();
+        signinUitl.loadIsCompany();
         initWork();
         initMission();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java

@@ -54,11 +54,12 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
     private final int LOAD_WORKLOG = 0x13;//打卡列表
     private final int SIGNIN_MISSION = 0x14;//外勤签到
     private final int HAVE_OUT_PLAN = 0x15;//还有未拜访外勤计划
-    private final int END_MISSION = 0x19;//还有未拜访外勤计划
-
     private final int WORK_DATA = 0x16;//内勤列表
     private final int WORK_LOG = 0x17;//下拉列表时候的获取打卡列表
     private final int LOAD_PLAN = 0x18;
+    private final int END_MISSION = 0x19;//还有未拜访外勤计划
+    private final int IFINCOMPANY = 0x20;//还有未拜访外勤计划
+
 
     private NotificationManage notificationManage;
 
@@ -218,6 +219,15 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 param, bunder, this);
     }
 
+    //判断是否有
+    public void loadIsCompany() {
+        Map<String, Object> param = new HashMap<>();
+        param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
+        Bundle bunder = new Bundle();
+        HttpHandler.getInstance().loadERPByNet(IFINCOMPANY, "mobile/ifInCompany.action",
+                param, bunder, this);
+    }
+
 
     /*****************
      * 下拉列表
@@ -337,6 +347,9 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                         array = JSON.parseObject(message).getJSONArray("success");
                     }
                     handlerData(array);
+                    break;
+                case IFINCOMPANY:
+
                     break;
                 default:
                     break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -27,7 +27,6 @@ public class OACalendarView extends View implements View.OnTouchListener {
     private Date today; // 今天的日期
     private Date downDate; // 手指按下状态时临时日期
     //索引
-    private String yeasMonth = "";//年月  yyyymm
     private int todayIndex; // 今天的索引
     private int downIndex; // 按下的格子索引
     private int startIndex; // 开始的格子索引(当月)

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

@@ -360,16 +360,18 @@
                     android:textColor="#FF8E57"
                     android:textSize="15sp" />
             </LinearLayout>
+
             <HorizontalScrollView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fillViewport="true">
-            <com.xzjmyk.pm.activity.view.steps.StepsView
-                android:id="@+id/stepsView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
-                android:layout_marginBottom="10dp"/>
+
+                <com.xzjmyk.pm.activity.view.steps.StepsView
+                    android:id="@+id/stepsView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginRight="5dp" />
             </HorizontalScrollView>
         </LinearLayout>
 
@@ -518,12 +520,10 @@
         </LinearLayout>
 
         <LinearLayout
-
             style="@style/crm_ll_card"
+            android:visibility="gone"
             android:layout_height="wrap_content">
-
-            <View style="@style/app_line_gray_1dp"></View>
-
+            <View style="@style/app_line_gray_1dp"/>
             <Button
                 android:id="@+id/customer_detail_add_plan"
                 android:layout_width="match_parent"