Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

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

@@ -22,7 +22,6 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 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.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
 
 import java.util.HashMap;
@@ -183,19 +182,19 @@ public class CustomerDetailActivity extends BaseActivity {
                         tv_position.setText(jsonArray.getString("cu_degree"));
                         tv_name.setText(jsonArray.getString("cu_contact"));
                         steps = jsonArray.getString("cu_nichestep");
-                        for (int i = 0; i < labels.length; i++) {
-                            if (!StringUtils.isEmpty(steps)) {
-                                if (labels[i].equals(steps)) {
-                                    mStepsView.setCompletedPosition(i % labels.length)
-                                            .setLabels(labels)
-                                            .setBarColorIndicator(
-                                                    ct.getResources().getColor(R.color.light_gray))
-                                            .setProgressColorIndicator(ct.getResources().getColor(R.color.orange))
-                                            .setLabelColorIndicator(ct.getResources().getColor(R.color.orange))
-                                            .drawView();
-                                }
-                            }
-                        }
+//                        for (int i = 0; i < labels.length; i++) {
+//                            if (!StringUtils.isEmpty(steps)) {
+//                                if (labels[i].equals(steps)) {
+//                                    mStepsView.setCompletedPosition(i % labels.length)
+//                                            .setLabels(labels)
+//                                            .setBarColorIndicator(
+//                                                    ct.getResources().getColor(R.color.light_gray))
+//                                            .setProgressColorIndicator(ct.getResources().getColor(R.color.orange))
+//                                            .setLabelColorIndicator(ct.getResources().getColor(R.color.orange))
+//                                            .drawView();
+//                                }
+//                            }
+//                        }
                         tv_visitTimes.setText(jsonArray.getString("bfcount"));
                         tv_modifyRecord.setText(jsonArray.getString("cu_remark"));
                         tv_feilv.setText(jsonArray.getString("cu_taxrate"));

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

@@ -44,6 +44,9 @@ import com.xzjmyk.pm.activity.bean.oa.OABean;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 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.LeaveActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 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.form.DataFormDetailActivity;
@@ -56,9 +59,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
-import com.xzjmyk.pm.activity.ui.platform.pageforms.TravelPageActivity;
-import com.xzjmyk.pm.activity.ui.platform.pageforms.WorkPageActivity;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -956,21 +956,21 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             case R.id.erp://请假申请
                 // startActivity(new Intent(activity, ErpMenActivity.class));//旧的考勤界面
                 if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-                    startActivity(new Intent(activity, LeavePageActivity.class));
+                    startActivity(new Intent(activity, LeaveActivity.class));
                 } else if (ApiUtils.getApiModel() instanceof ApiUAS) {
                     startActivity(new Intent(activity, DataFormDetailActivity.class).putExtra("caller", "Ask4Leave"));
                 }
                 break;
             case R.id.outtask://出差申请
                 if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-                    startActivity(new Intent(activity, TravelPageActivity.class));
+                    startActivity(new Intent(activity, TravelActivity.class));
                 } else if (ApiUtils.getApiModel() instanceof ApiUAS) {
                     startActivity(new Intent(activity, DataFormDetailActivity.class).putExtra("caller", "FeePlease!CCSQ"));
                 }
                 break;
             case R.id.oamain_overtime_apply_tv://加班申请
                 if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-                    startActivity(new Intent(activity, WorkPageActivity.class));
+                    startActivity(new Intent(activity, WorkExtraActivity.class));
                 } else if (ApiUtils.getApiModel() instanceof ApiUAS) {
                     startActivity(new Intent(activity, DataFormDetailActivity.class).putExtra("caller", "Workovertime"));
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/StepsView.java

@@ -123,10 +123,10 @@ public class StepsView extends LinearLayout implements StepsViewIndicator.OnDraw
                 TextView textView = new TextView(getContext());
                 textView.setText(mLabels[i]);
                 textView.setTextColor(mLabelColorIndicator);
-                textView.setX(indicatorPosition.get(i)- 0.25f*CommonUtil.dip2px(this.getContext(), 40));
-                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP,9);
+                textView.setX(indicatorPosition.get(i)- 0.25f*CommonUtil.dip2px(this.getContext(), 25));
+                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP,11);
                 textView.setLayoutParams(
-                        new ViewGroup.LayoutParams(CommonUtil.dip2px(this.getContext(),40),
+                        new ViewGroup.LayoutParams(CommonUtil.dip2px(this.getContext(),25),
                                 ViewGroup.LayoutParams.WRAP_CONTENT));
 
                 if (i <= mCompletedPosition) {

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

@@ -15,6 +15,6 @@
         android:id="@+id/labels_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp" />
+        android:layout_marginTop="7dp" />
 
 </LinearLayout>