Ver código fonte

修改订阅号、外勤签到字数限制、屏幕不适配

Bitliker 9 anos atrás
pai
commit
8a2f5e2b80
33 arquivos alterados com 89 adições e 558 exclusões
  1. 1 1
      WeiChat/build.gradle
  2. 1 9
      WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SigninBean.java
  3. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/AddTaskActivity.java
  4. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java
  5. 0 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java
  6. 1 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java
  7. 8 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SigninAdapter.java
  8. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java
  9. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPCManager.java
  10. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPCNCalendar.java
  11. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPCalendar.java
  12. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPUSCalendar.java
  13. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/SolarTerm.java
  14. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/decors/DPDecor.java
  15. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/languages/CN.java
  16. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/languages/DPLManager.java
  17. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/languages/EN.java
  18. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPBaseTheme.java
  19. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPCNTheme.java
  20. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPTManager.java
  21. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPTheme.java
  22. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/cons/DPMode.java
  23. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/entities/DPInfo.java
  24. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/utils/DataUtils.java
  25. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/utils/MeasureUtil.java
  26. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/utils/OnDatePickedListener.java
  27. 7 7
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/DatePicker.java
  28. 17 9
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/MonthView.java
  29. 6 8
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/TaskDatePicker.java
  30. 6 6
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/TaskMonthView.java
  31. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/TimeView.java
  32. 0 468
      WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java
  33. 17 18
      WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

+ 1 - 1
WeiChat/build.gradle

@@ -8,7 +8,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 1 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SigninBean.java

@@ -5,7 +5,7 @@ package com.xzjmyk.pm.activity.bean.oa;
  */
 public class SigninBean {
     private String cl_code;//
-    private String cl_time;  //打卡时间
+//    private String cl_time;  //打卡时间
     private String cl_address;//打卡地址
     private String cl_phone;//打卡手机号
     private String cl_emcode;//打卡员工编号
@@ -21,14 +21,6 @@ public class SigninBean {
         this.cl_code = cl_code;
     }
 
-    public String getCl_time() {
-        return cl_time;
-    }
-
-    public void setCl_time(String cl_time) {
-        this.cl_time = cl_time;
-    }
-
     public String getCl_address() {
         return cl_address;
     }

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/AddTaskActivity.java

@@ -43,8 +43,8 @@ import com.lidroid.xutils.http.client.HttpRequest.HttpMethod;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
-import com.xzjmyk.pm.activity.ui.calendar.views.TaskDatePicker;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.cons.DPMode;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.views.TaskDatePicker;
 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;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -294,6 +294,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     tv_content.getText().toString() +
                     "\",\n" + (isBusiness ? strs : "") +
                     "}";
+
         } else {
             formStore = "{\n" +
                     "\"taskcode\":\"" + tv_code + "\",\n" +//编号
@@ -323,7 +324,6 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     "\",\n" + (isBusiness ? strs : "") +
                     "}";
         }
-
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);

+ 0 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -109,7 +109,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private OAListAdapter adapter; //当前列表的数据
     private PagerAdapter pagerAdapter;//当前Viewpager适配器
     private Date curDate;    //当前显示的日期  包含年月日信息
-
     private Set<Integer> meInt;     //我的任务
     private Set<Integer> otherInt;  //我的下属的任务
     private int posItem;           //当前为滑动到的哪个Viewpager

+ 1 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -140,7 +140,6 @@ public class OutSigninOKActivity extends BaseActivity {
                 showPopup();
             }
         });
-
         text_edit.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -153,7 +152,7 @@ public class OutSigninOKActivity extends BaseActivity {
             @Override
             public void afterTextChanged(Editable editable) {
                 int num = editable.length();
-                text_num.setText(num+"/"+ 60);
+                text_num.setText(num + "/" + 60);
                 if (num > 60) {
                     text_edit.setText(editable.subSequence(0, 60));
                 }

+ 8 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SigninAdapter.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,7 +31,6 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
         this.ct = ct;
         time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
     }
-
     public ArrayList<SigninFragment.Bean> getBeans() {
         return beans;
     }
@@ -61,11 +61,12 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
         SigninFragment.Bean b = beans.get(position);
         holder.time.setText(b.getStartTime() == null ? "" : b.getStartTime());
         holder.time2.setText(b.getEndTime() == null ? "" : b.getEndTime());
+        //当签到列表数据为空时候
         if (ListUtils.isEmpty(b.getSigninList()) || b.getSigninList().size() <= 0) {
             holder.signin.setText("");
             holder.signin2.setText("");
             if (isToday) {
-                if (b.getStartTime()!=null&&time.compareTo(b.getStartTime()) < 0) {//当前时间小于打卡时间
+                if (b.getStartTime() != null && time.compareTo(b.getStartTime()) < 0) {//当前时间小于打卡时间
                     holder.tag.setVisibility(View.GONE);
                 } else if (time.compareTo(getNext90(b.getStartTime(), true)) < 0 && time.compareTo(b.getStartTime()) > 0) {
                     holder.tag.setVisibility(View.VISIBLE);
@@ -74,7 +75,7 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
                     holder.tag.setVisibility(View.VISIBLE);
                     holder.tag.setText("缺勤");
                 }
-                if (b.getEndSignnin()!=null&&time.compareTo(b.getEndSignnin()) < 0) {//当前时间小于打卡时间
+                if (b.getEndSignnin() != null && time.compareTo(b.getEndSignnin()) < 0) {//当前时间小于打卡时间
                     holder.tag2.setVisibility(View.GONE);
                 } else {
                     holder.tag2.setVisibility(View.VISIBLE);
@@ -92,7 +93,10 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
                     end = "";
             boolean isFrist = false;
             for (String e : b.getSigninList()) {
+                Log.i("gongpengmingTime", e);
+                Log.i("gongpengmingTime", b.getStartSignin());
                 if (!isFrist && e.compareTo(b.getStartSignin()) > 0 && e.compareTo(getNext90(b.getStartTime(), true)) < 0) {
+                    Log.i("gongpengmingTime", "进来了");
                     holder.signin.setText(e);
                     start = getTag(b.getStartTime(), b.getStartSignin(), getNext90(b.getStartTime(), true), e, true);
                     isFrist = true;
@@ -103,7 +107,7 @@ public class SigninAdapter extends RecyclerView.Adapter<SigninAdapter.ViewHoler>
                 }
             }
 
-            if ((!StringUtils.isEmpty(start) && "-1".equals(start) )|| (StringUtils.isEmpty(start) && isToday &&time.compareTo(b.getStartTime()) < 0)) {
+            if ((!StringUtils.isEmpty(start) && "-1".equals(start)) || (StringUtils.isEmpty(start) && isToday && time.compareTo(b.getStartTime()) < 0)) {
                 holder.tag.setVisibility(View.GONE);
             } else {
                 holder.tag.setVisibility(View.VISIBLE);

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -570,7 +570,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         bean.setCl_code(code);
         bean.setCl_distance(distance);
         bean.setCl_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-        bean.setCl_time(time);
+//        bean.setCl_time(time);
         bean.setCl_location(loaction);
         bean.setCl_address(addr);
         bean.setCl_emname(MyApplication.getInstance().mLoginUser.getNickName());

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/calendars/DPCManager.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPCManager.java

@@ -1,8 +1,8 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.calendars;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars;
 
 import android.text.TextUtils;
 
-import com.xzjmyk.pm.activity.ui.calendar.entities.DPInfo;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.entities.DPInfo;
 
 import java.util.HashMap;
 import java.util.HashSet;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/calendars/DPCNCalendar.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPCNCalendar.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.calendars;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars;
 
 import android.text.TextUtils;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/calendars/DPCalendar.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPCalendar.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.calendars;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars;
 
 import java.util.Calendar;
 import java.util.HashSet;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/calendars/DPUSCalendar.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/DPUSCalendar.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.calendars;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars;
 
 import android.text.TextUtils;
 

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/calendars/SolarTerm.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/calendars/SolarTerm.java

@@ -1,7 +1,7 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.calendars;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars;
 
 
-import com.xzjmyk.pm.activity.ui.calendar.utils.DataUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.utils.DataUtils;
 
 /**
  * 农历二十四节气算法

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/decors/DPDecor.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/decors/DPDecor.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.decors;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.decors;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/languages/CN.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/languages/CN.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.languages;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.languages;
 
 /**
  * 中文的默认实现类

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/languages/DPLManager.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/languages/DPLManager.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.languages;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.languages;
 
 import java.util.Locale;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/languages/EN.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/languages/EN.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.languages;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.languages;
 
 /**
  * 英文的默认实现类

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/themes/DPBaseTheme.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPBaseTheme.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.themes;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes;
 
 /**
  * 主题的默认实现类

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/themes/DPCNTheme.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPCNTheme.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.themes;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes;
 
 /**
  * 天朝日历主题类

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/themes/DPTManager.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPTManager.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.themes;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes;
 
 /**
  * 日历主题管理器

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/bizs/themes/DPTheme.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/bizs/themes/DPTheme.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.bizs.themes;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes;
 
 /**
  * 主题抽象类

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/cons/DPMode.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/cons/DPMode.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.cons;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.cons;
 
 /**
  * 日期选择模式

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/entities/DPInfo.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/entities/DPInfo.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.entities;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.entities;
 
 /**
  * 日历数据实体

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/utils/DataUtils.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/utils/DataUtils.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.utils;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.utils;
 
 /**
  * 数组操作工具类

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/utils/MeasureUtil.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/utils/MeasureUtil.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.utils;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.utils;
 
 import android.content.Context;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/utils/OnDatePickedListener.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/utils/OnDatePickedListener.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.utils;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.utils;
 
 /**
  * 日期单选监听器

+ 7 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/DatePicker.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/DatePicker.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.views;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -9,12 +9,12 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.ui.calendar.bizs.decors.DPDecor;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.languages.DPLManager;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.themes.DPTManager;
-import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
-import com.xzjmyk.pm.activity.ui.calendar.utils.MeasureUtil;
-import com.xzjmyk.pm.activity.ui.calendar.utils.OnDatePickedListener;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.decors.DPDecor;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.languages.DPLManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes.DPTManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.cons.DPMode;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.utils.MeasureUtil;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.utils.OnDatePickedListener;
 
 import java.util.List;
 

+ 17 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/MonthView.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/MonthView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.views;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.views;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -16,18 +16,19 @@ import android.graphics.drawable.shapes.OvalShape;
 import android.os.Build;
 import android.os.Parcelable;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.Scroller;
 
-import com.xzjmyk.pm.activity.ui.calendar.bizs.calendars.DPCManager;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.decors.DPDecor;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.themes.DPTManager;
-import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
-import com.xzjmyk.pm.activity.ui.calendar.entities.DPInfo;
-import com.xzjmyk.pm.activity.ui.calendar.utils.OnDatePickedListener;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars.DPCManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.decors.DPDecor;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes.DPTManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.cons.DPMode;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.entities.DPInfo;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.utils.OnDatePickedListener;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -96,7 +97,6 @@ public class MonthView extends View {
     private List<String> dateSelected = new ArrayList<>();
 
     public MonthView(Context context) {
-
         super(context);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             scaleAnimationListener = new ScaleAnimationListener();
@@ -126,11 +126,12 @@ public class MonthView extends View {
     }
 
 
-
     @Override
     public boolean onTouchEvent(MotionEvent event) {
+        Log.i("gongpengming", "onTouchEvent");
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
+                Log.i("gongpengming", "MotionEvent.ACTION_DOWN");
                 mScroller.forceFinished(true);
                 mSlideMode = null;
                 isNewEvent = true;
@@ -138,6 +139,7 @@ public class MonthView extends View {
                 lastPointY = (int) event.getY();
                 break;
             case MotionEvent.ACTION_MOVE:
+                Log.i("gongpengming", "MotionEvent.ACTION_MOVE");
                 if (isNewEvent) {
                     if (Math.abs(lastPointX - event.getX()) > 100) {
                         mSlideMode = SlideMode.HOR;
@@ -156,6 +158,7 @@ public class MonthView extends View {
                 }
                 break;
             case MotionEvent.ACTION_UP:
+                Log.i("gongpengming", "MotionEvent.ACTION_UP");
                 if (mSlideMode == SlideMode.VER) {
                     if (Math.abs(lastPointY - event.getY()) > 25) {
                         if (lastPointY < event.getY()) {
@@ -218,6 +221,10 @@ public class MonthView extends View {
 
     @Override
     protected void onSizeChanged(int w, int h, int oldW, int oldH) {
+        Log.i("gongpengming", "onSizeChanged");
+        Log.i("gongpengming", "w=" + w + "   oldW=" + oldW);
+        Log.i("gongpengming", "h=" + h + "    h=" + oldH);
+
         width = w;
         height = h;
 
@@ -279,6 +286,7 @@ public class MonthView extends View {
 
     @Override
     protected void onDraw(Canvas canvas) {
+        Log.i("gongpengming", "onDraw");
         canvas.drawColor(mTManager.colorBG());
         draw(canvas, width * indexMonth, (indexYear - 1) * height, topYear, topMonth);
         draw(canvas, width * (indexMonth - 1), height * indexYear, leftYear, leftMonth);

+ 6 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/TaskDatePicker.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/TaskDatePicker.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.views;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -9,11 +9,11 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.ui.calendar.bizs.decors.DPDecor;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.themes.DPTManager;
-import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
-import com.xzjmyk.pm.activity.ui.calendar.utils.MeasureUtil;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.languages.DPLManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.decors.DPDecor;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes.DPTManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.cons.DPMode;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.utils.MeasureUtil;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.languages.DPLManager;
 
 import java.util.List;
 
@@ -31,8 +31,6 @@ public class TaskDatePicker extends LinearLayout {
     private TaskMonthView taskMonthView;// 月视图
     private TextView tvYear, tvMonth;// 年份 月份显示
     private TextView tvEnsure;// 确定按钮显示
-
-
     private OnDateSelectedListener onDateSelectedListener;// 日期多选后监听
     private TimeView timeView;
     private String time;

+ 6 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/TaskMonthView.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/TaskMonthView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.views;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.views;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -22,11 +22,11 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.Scroller;
 
-import com.xzjmyk.pm.activity.ui.calendar.bizs.calendars.DPCManager;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.decors.DPDecor;
-import com.xzjmyk.pm.activity.ui.calendar.bizs.themes.DPTManager;
-import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
-import com.xzjmyk.pm.activity.ui.calendar.entities.DPInfo;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.calendars.DPCManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.decors.DPDecor;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.bizs.themes.DPTManager;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.cons.DPMode;
+import com.xzjmyk.pm.activity.ui.erp.view.calendar.entities.DPInfo;
 
 import java.util.ArrayList;
 import java.util.Arrays;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/TimeView.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calendar/views/TimeView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.calendar.views;
+package com.xzjmyk.pm.activity.ui.erp.view.calendar.views;
 
 import android.content.Context;
 import android.view.Gravity;

+ 0 - 468
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java

@@ -1,468 +0,0 @@
-package com.xzjmyk.pm.activity.view;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 日历控件 功能:获得点选的日期区间
- * update by:Bitliker 2016/07/11
- */
-public class CalendarView extends View implements View.OnTouchListener {
-    private Date curDate; // 当前日历显示的月
-    private Date today; // 今天的日期文字显示红色
-    private Date downDate; // 手指按下状态时临时日期
-    private int downIndex; // 按下的格子索引
-    private Calendar calendar;
-    private Surface surface;
-    private int[] date = new int[42]; // 日历显示数字
-    private int curStartIndex, curEndIndex; // 当前显示的日历起始的索引
-    private boolean isSelectMore = false;
-    private int[] taskDay;
-    //给控件设置监听事件
-    private OnItemClickListener onItemClickListener;
-
-    public CalendarView(Context context) {
-        super(context);
-        init();
-    }
-
-    public CalendarView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public int getDownIndex() {
-        return downIndex;
-    }
-
-    private void init() {
-        //获取当前日期对象
-        downDate = curDate = today = new Date();
-        calendar = Calendar.getInstance();
-        calendar.setTime(curDate);
-        downIndex = calendar.get(Calendar.DAY_OF_MONTH)+3;
-        surface = new Surface();
-        surface.density = getResources().getDisplayMetrics().density;
-        setBackgroundColor(surface.bgColor);
-        setOnTouchListener(this);
-    }
-
-    public void setTaskDay(int[] taskDay) {
-        this.taskDay = taskDay;
-        invalidate();
-    }
-
-    public int[] getTaskDay() {
-        return taskDay;
-    }
-
-    //计算视图大小
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        surface.width = getResources().getDisplayMetrics().widthPixels;
-        surface.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);
-        widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(surface.width, View.MeasureSpec.EXACTLY);
-        heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(surface.height, View.MeasureSpec.EXACTLY);
-        setMeasuredDimension(widthMeasureSpec, heightMeasureSpec);
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right,
-                            int bottom) {
-        if (changed) {
-            surface.init();
-        }
-        super.onLayout(changed, left, top, right, bottom);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        float weekTextY = surface.monthHeight + surface.weekHeight * 3 / 4f;
-        for (int i = 0; i < surface.weekText.length; i++) {
-            float weekTextX = i
-                    * surface.cellWidth
-                    + (surface.cellWidth - surface.weekPaint
-                    .measureText(surface.weekText[i])) / 2f;
-            canvas.drawText(surface.weekText[i], weekTextX, weekTextY,
-                    surface.weekPaint);
-        }
-
-        // 计算日期
-        calculateDate();
-        // 按下状态,选择状态背景色
-        drawDownOrSelectedBg(canvas);
-        // write date number
-        // today index
-        int todayIndex = -1;
-        calendar.setTime(curDate);
-        String curYearAndMonth = calendar.get(Calendar.YEAR) + ""
-                + calendar.get(Calendar.MONTH);
-        calendar.setTime(today);
-        String todayYearAndMonth = calendar.get(Calendar.YEAR) + ""
-                + calendar.get(Calendar.MONTH);
-        if (curYearAndMonth.equals(todayYearAndMonth)) {
-            int todayNumber = calendar.get(Calendar.DAY_OF_MONTH);
-            todayIndex = curStartIndex + todayNumber - 1;
-        }
-        //绘制日期
-        for (int i = curStartIndex; i < 42; i++) {
-            if (!isLastMonth(i) && !isNextMonth(i)) {
-                int color = surface.textColor;
-                if (todayIndex != -1 && i == todayIndex) {
-                    color = surface.todayNumberColor;
-                    drawCellText(canvas, i, "今", color);
-                    if (downDate == null)
-                        drawCellBg(canvas, i, surface.cellDownColor);
-                } else {
-                    drawCellText(canvas, i, date[i] + "", color);
-                }
-                if (taskDay != null && taskDay.length > 0)
-                    for (int k : taskDay) {
-                        if (date[i] == k) {
-                            drawTask(canvas, i);
-                        }
-                    }
-            }
-        }
-        super.onDraw(canvas);
-    }
-
-    private void calculateDate() {
-        calendar.setTime(curDate);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        int dayInWeek = calendar.get(Calendar.DAY_OF_WEEK);
-        int monthStart = dayInWeek;
-        if (monthStart == 1) {
-            monthStart = 8;
-        }
-        monthStart -= 1;  //以日为开头-1,以星期一为开头-2
-        curStartIndex = monthStart;
-        date[monthStart] = 1;
-        // last month
-        if (monthStart > 0) {
-            calendar.set(Calendar.DAY_OF_MONTH, 0);
-            int dayInmonth = calendar.get(Calendar.DAY_OF_MONTH);
-            for (int i = monthStart - 1; i >= 0; i--) {
-                date[i] = dayInmonth;
-                dayInmonth--;
-            }
-            calendar.set(Calendar.DAY_OF_MONTH, date[0]);
-        }
-        // this month
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, 1);
-        calendar.set(Calendar.DAY_OF_MONTH, 0);
-        // calendar.get(Calendar.DAY_OF_MONTH));
-        int monthDay = calendar.get(Calendar.DAY_OF_MONTH);
-        for (int i = 1; i < monthDay; i++) {
-            date[monthStart + i] = i + 1;
-        }
-        curEndIndex = monthStart + monthDay;
-        // next month
-        for (int i = monthStart + monthDay; i < 42; i++) {
-            date[i] = i - (monthStart + monthDay) + 1;
-        }
-        if (curEndIndex < 42) {
-            // 显示了下一月的
-            calendar.add(Calendar.DAY_OF_MONTH, 1);
-        }
-        calendar.set(Calendar.DAY_OF_MONTH, date[41]);
-    }
-
-    /**
-     * 绘画有任务日期星号
-     *
-     * @param canvas
-     * @param index
-     */
-    private void drawTask(Canvas canvas, int index) {
-        int x = getXByIndex(index);
-        int y = getYByIndex(index);
-        float cellY = surface.monthHeight + surface.weekHeight + (y - 1)
-                * surface.cellHeight + //当前日期框最上方
-                surface.cellHeight * 9 / 16f;//当前框的中心Y
-        float cellX = (surface.cellWidth * (x - 1)) //当前日期框左边框
-                + surface.cellWidth / 2;//当前中心X
-        float radius = Math.min(surface.cellHeight, surface.cellWidth) * (3 / 8f);//获取最短的长度的
-// 绘制圆,参数一是中心点的x轴,参数二是中心点的y轴,参数三是半径,参数四是paint对象;
-        canvas.drawCircle(cellX, cellY, radius, surface.circlePaint);
-    }
-
-    /**
-     * @param canvas
-     * @param index
-     * @param text
-     */
-    private void drawCellText(Canvas canvas, int index, String text, int color) {
-        int x = getXByIndex(index);
-        int y = getYByIndex(index);
-        if (downDate != null && downIndex == index)
-            surface.datePaint.setColor(surface.bgColor);
-        else
-            surface.datePaint.setColor(color);
-        float cellY = surface.monthHeight + surface.weekHeight + (y - 1)
-                * surface.cellHeight + //当前日期框最上方
-                surface.cellHeight * 3 / 4f;
-        float cellX = (surface.cellWidth * (x - 1))   //当前日期框左边框
-                + (surface.cellWidth - surface.datePaint.measureText(text))
-                / 2f;
-        canvas.drawText(text, cellX, cellY, surface.datePaint);
-    }
-
-    /**
-     * 画被点击的背景
-     *
-     * @param canvas
-     * @param index
-     * @param color
-     */
-    private void drawCellBg(Canvas canvas, int index, int color) {
-        int x = getXByIndex(index);
-        int y = getYByIndex(index);
-        float cellY = surface.monthHeight + surface.weekHeight + (y - 1)
-                * surface.cellHeight + //当前日期框最上方
-                surface.cellHeight * 9 / 16f;//当前框的中心Y
-        float cellX = (surface.cellWidth * (x - 1)) //当前日期框左边框
-                + surface.cellWidth / 2;//当前中心X
-        float radius = Math.min(surface.cellHeight, surface.cellWidth) * (3 / 8f);//获取最短的长度的
-// 绘制圆,参数一是中心点的x轴,参数二是中心点的y轴,参数三是半径,参数四是paint对象;
-        canvas.drawCircle(cellX, cellY, radius, surface.cellBgPaint);
-    }
-
-    private void drawDownOrSelectedBg(Canvas canvas) {
-        if (downDate != null) {
-            drawCellBg(canvas, downIndex, surface.cellDownColor);
-        }
-
-    }
-
-    private boolean isLastMonth(int i) {
-        if (i < curStartIndex) {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isNextMonth(int i) {
-        if (i >= curEndIndex) {
-            return true;
-        }
-        return false;
-    }
-
-    private int getXByIndex(int i) {
-        return i % 7 + 1; // 1 2 3 4 5 6 7
-    }
-
-    private int getYByIndex(int i) {
-        return i / 7 + 1; // 1 2 3 4 5 6
-    }
-
-    // 获得当前应该显示的年月
-    public String getYearAndmonth() {
-        calendar.setTime(curDate);
-        int year = calendar.get(Calendar.YEAR);
-        int month = calendar.get(Calendar.MONTH) + 1;
-        return year + "-" + month;
-    }
-
-    //上一月
-    public String clickLeftMonth() {
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, -1);
-        curDate = calendar.getTime();
-        invalidate();
-        return getYearAndmonth();
-    }
-
-    //下一月
-    public String clickRightMonth() {
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, 1);
-        curDate = calendar.getTime();
-        invalidate();
-        return getYearAndmonth();
-    }
-
-    //设置日历时间
-    public void setCalendarData(Date date) {
-        calendar.setTime(date);
-        invalidate();
-    }
-
-    //获取日历时间
-    public void getCalendatData() {
-        calendar.getTime();
-    }
-
-    //设置是否多选
-    public boolean isSelectMore() {
-        return isSelectMore;
-    }
-
-    public void setSelectMore(boolean isSelectMore) {
-        this.isSelectMore = isSelectMore;
-    }
-
-
-    private void setSelectedDateByCoor(float x, float y) {
-        if (y > surface.monthHeight + surface.weekHeight) {
-            int m = (int) (Math.floor(x / surface.cellWidth) + 1);
-            int n = (int) (Math.floor((y - (surface.monthHeight + surface.weekHeight))
-                    / Float.valueOf(surface.cellHeight)) + 1);
-            int index = (n - 1) * 7 + m - 1;
-            if (index < curStartIndex || curEndIndex <= index) return;
-            downIndex = index;
-            calendar.setTime(curDate);
-            if (isLastMonth(downIndex)) {
-                calendar.add(Calendar.MONTH, -1);
-            } else if (isNextMonth(downIndex)) {
-                calendar.add(Calendar.MONTH, 1);
-            }
-            calendar.set(Calendar.DAY_OF_MONTH, date[downIndex]);
-            downDate = calendar.getTime();
-        }
-        //判断点击的在当月日期里面
-//        invalidate();
-    }
-
-    float x;
-    float y;
-
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                x = event.getX();
-                y = event.getY();
-                break;
-            case MotionEvent.ACTION_UP:
-                if (Math.abs(event.getX() - x) > 10 || Math.abs(event.getY() - y) > 10)
-                    return true;
-                setSelectedDateByCoor(event.getX(), event.getY());
-                if (downDate != null) {
-                    //响应监听事件
-                    onItemClickListener.OnItemClick(date[downIndex]);
-                }
-                invalidate();
-                break;
-        }
-        return true;
-    }
-
-    //给控件设置监听事件
-    public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
-        this.onItemClickListener = onItemClickListener;
-    }
-
-    //监听接口
-    public interface OnItemClickListener {
-        void OnItemClick(int date);
-    }
-
-    /**
-     * 1. 布局尺寸 2. 文字颜色,大小 3. 当前日期的颜色,选择的日期颜色
-     */
-    private class Surface {
-        public float density;
-        public int width; // 整个控件的宽度
-        public int height; // 整个控件的高度
-        public float monthHeight; // 显示月的高度
-        public float weekHeight; // 显示星期的高度
-        public float cellWidth; // 日期方框宽度
-        public float cellHeight; // 日期方框高度
-        public float borderWidth;
-        public int bgColor = Color.parseColor("#EBE9E9");
-        private int textColor = Color.BLACK;
-        private int btnColor = Color.parseColor("#666666");
-        private int borderColor = Color.parseColor("#CCCCCC");
-        public int todayNumberColor = Color.RED;
-        public int cellDownColor = Color.parseColor("#CCFFFF");
-        public int cellSelectedColor = Color.parseColor("#ea493d");
-        public Paint borderPaint;
-        public Paint monthPaint;
-        public Paint weekPaint;
-        public Paint datePaint;
-        public Paint circlePaint;
-        public Paint monthChangeBtnPaint;
-        public Paint cellBgPaint;
-        public Path boxPath; // 边框路径
-        public String[] weekText = {"日", "一", "二", "三", "四", "五", "六"};
-
-        public void init() {
-            float temp = height / 7f;
-            monthHeight = 0;//(float) ((temp + temp * 0.3f) * 0.6);
-            weekHeight = (float) ((temp + temp * 0.3f) * 0.7);
-            cellHeight = (height - monthHeight - weekHeight) / 5f;
-            weekHeight = cellHeight = (height - 10) / 6f;
-            weekHeight += 10;
-//            weekHeight = (float) (cellHeight * 1.2);
-            cellWidth = width / 7f;
-            borderPaint = new Paint();
-            borderPaint.setColor(borderColor);
-            borderPaint.setStyle(Paint.Style.STROKE);
-            borderWidth = (float) (0.5 * density);
-            borderWidth = borderWidth < 1 ? 1 : borderWidth;
-            borderPaint.setStrokeWidth(borderWidth);
-            monthPaint = new Paint();
-            monthPaint.setColor(textColor);
-            monthPaint.setAntiAlias(true);
-            float textSize = cellHeight * 0.4f;
-            monthPaint.setTextSize(textSize);
-            //monthPaint.setTypeface(Typeface.DEFAULT_BOLD);
-            weekPaint = new Paint();
-            weekPaint.setColor(textColor);
-            weekPaint.setAntiAlias(true);
-            float weekTextSize = weekHeight * 0.5f;
-            weekPaint.setTextSize(weekTextSize);
-            //weekPaint.setTypeface(Typeface.DEFAULT_BOLD);
-            datePaint = new Paint();
-            datePaint.setColor(textColor);
-            datePaint.setAntiAlias(true);
-            circlePaint = new Paint();
-            circlePaint.setColor(Color.RED);
-            circlePaint.setAntiAlias(true);//抗锯齿 不然会不好看
-            circlePaint.setFilterBitmap(true);
-            circlePaint.setStyle(Paint.Style.STROKE);//空心
-            circlePaint.setStrokeWidth(3);
-            float cellTextSize = cellHeight * 0.5f;
-            datePaint.setTextSize(cellTextSize);
-            //datePaint.setTypeface(Typeface.DEFAULT_BOLD);
-            boxPath = new Path();
-            boxPath.rLineTo(width, 0);
-            boxPath.moveTo(0, monthHeight + weekHeight);
-            boxPath.rLineTo(width, 0);
-            for (int i = 1; i < 6; i++) {
-                boxPath.moveTo(0, monthHeight + weekHeight + i * cellHeight);
-                boxPath.rLineTo(width, 0);
-                boxPath.moveTo(i * cellWidth, monthHeight);
-                boxPath.rLineTo(0, height - monthHeight);
-            }
-            boxPath.moveTo(6 * cellWidth, monthHeight);
-            boxPath.rLineTo(0, height - monthHeight);
-            monthChangeBtnPaint = new Paint();
-            monthChangeBtnPaint.setAntiAlias(true);
-            monthChangeBtnPaint.setStyle(Paint.Style.FILL_AND_STROKE);
-            monthChangeBtnPaint.setColor(btnColor);
-            cellBgPaint = new Paint();
-            cellBgPaint.setAntiAlias(true);
-            cellBgPaint.setStyle(Paint.Style.FILL);
-            cellBgPaint.setColor(cellSelectedColor);
-            datePaint.setFakeBoldText(false);
-            weekPaint.setFakeBoldText(false);
-            borderPaint.setFakeBoldText(false);
-            cellBgPaint.setFakeBoldText(false);
-            monthPaint.setFakeBoldText(false);
-        }
-    }
-}

+ 17 - 18
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -16,6 +16,8 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+
+
 /**
  * Created by pengminggong on 2016/9/20.
  */
@@ -188,19 +190,19 @@ public class OACalendarView extends View implements View.OnTouchListener {
             //圆的最中心
             float cellY = surface.weekHeight + surface.cellHeight * (downIndex / 7) + surface.cellHeight / 2;
             float cellX = surface.cellWidth * (downIndex % 7) + surface.cellWidth / 2;
-            float radius = Math.min(surface.cellHeight, surface.cellWidth) * surface.downScale;
-            canvas.drawCircle(cellX, cellY, radius, surface.selectPaint);
+//            float radius = Math.min(surface.cellHeight, surface.cellWidth) * surface.downScale;
+            canvas.drawCircle(cellX, cellY, surface.downTaxtSize, surface.selectPaint);
         }
     }
 
     //画日期
     private void drawDay(Canvas canvas) {
-        float dayTextY = surface.weekHeight + surface.cellHeight * (1 - (1 - surface.dateScale) / 2);
+        float dayTextY = surface.weekHeight + surface.cellHeight - (surface.cellHeight - surface.dateTaxtSize) / 2;
         String chche = "";
         //画上个月日期
         calendar.setTime(curDate);
         calendar.add(Calendar.MONTH, -1);
-        int startItem = calendar.getActualMaximum(Calendar.DATE) - startIndex;//获取当月有多少天
+        int startItem = calendar.getActualMaximum(Calendar.DATE) - startIndex + 1;//获取当月有多少天
         calendar.set(Calendar.DAY_OF_MONTH, startItem);
         for (int i = 0; i < startIndex; i++) {
             float dayTextX = i * surface.cellWidth + (surface.cellWidth - surface.hineDatePaint.measureText("今")) / 2f;
@@ -274,14 +276,14 @@ public class OACalendarView extends View implements View.OnTouchListener {
         //圆的最中心
         float cellY = surface.weekHeight + surface.cellHeight * (index / 7) + surface.cellHeight / 2;
         float cellX = surface.cellWidth * (index % 7) + surface.cellWidth / 2;
-        float radius = Math.min(surface.cellWidth, surface.weekHeight) * surface.downScale;
-        canvas.drawCircle(cellX, cellY, radius, decorPaint);
+//        float radius = Math.min(surface.cellWidth, surface.weekHeight) * surface.downScale;
+        canvas.drawCircle(cellX, cellY, surface.downTaxtSize, decorPaint);
     }
 
     //画星期
     private void drawWeek(Canvas canvas) {
         //1.星期的Y抽位置,星期字体为星期框高度的一半,所以在3/4的位置开始绘画
-        float weekTextY = surface.weekHeight * (1 - (1 - surface.weekScale) / 2);
+        float weekTextY = surface.weekHeight - (surface.weekHeight - surface.weekTaxtSize) / 2;
         for (int i = 0; i < surface.weekText.length; i++) {
             //Paint.measureText  获取该字的宽度值
             float weekTextX = surface.cellWidth * i + (surface.cellWidth - surface.weekPaint.measureText(surface.weekText[i])) / 2f;
@@ -359,10 +361,8 @@ public class OACalendarView extends View implements View.OnTouchListener {
         private int height;   //整个控件高度
         private float weekHeight;//周的方框高度
         private float cellWidth; // 日期方框宽度
-        private float cellHeight; // 日期方框高度\
-
+        private float cellHeight; // 日期方框高度
         private int bgColor = 0xEBE9E9;
-
         private int weekColor = Color.BLACK;//周视图的画笔颜色
         private int dateColor = Color.BLACK;//月视图的画笔颜色x
         private int selectColor = Color.WHITE;//选择中的画笔颜色
@@ -377,13 +377,13 @@ public class OACalendarView extends View implements View.OnTouchListener {
         private Paint decorPaint;//装饰画笔
         private Paint hineDatePaint;//非本月日期
 
-        private float weekScale = 0.60f;//周字体大小所占的周的方框的比例
-        private float downScale = 0.40f;//点击后所画的圆占框的比例
-        private float dateScale = 0.50f;//日期字体大小所占的周的方框的比例
+        private float weekTaxtSize = 55f;
+        private float dateTaxtSize = 55f;
+        private float downTaxtSize;
         private String[] weekText = {"日", "一", "二", "三", "四", "五", "六"};
 
         private void init() {
-
+            downTaxtSize = (dateTaxtSize + 22) / 2;
             //计算周框的高度 1.获取日期共多少行
             int dateRowNum = date.length / 7 + (date.length % 7 > 0 ? 1 : 0);
             cellHeight = weekHeight = height / (dateRowNum + 1);
@@ -400,18 +400,17 @@ public class OACalendarView extends View implements View.OnTouchListener {
             weekPaint = new Paint();//周视图的画笔
             weekPaint.setColor(weekColor);
             weekPaint.setAntiAlias(true);
-            weekPaint.setTextSize(weekHeight * weekScale);
+            weekPaint.setTextSize(weekTaxtSize);
 
             datePaint = new Paint();//日期视图的画笔
             datePaint.setColor(dateColor);
             datePaint.setAntiAlias(true);
-            datePaint.setTextSize(cellHeight * dateScale);
+            datePaint.setTextSize(dateTaxtSize);
 
             hineDatePaint = new Paint();//日期视图的画笔
             hineDatePaint.setColor(hineDateColor);
             hineDatePaint.setAntiAlias(true);
-            hineDatePaint.setTextSize(cellHeight * dateScale);
-
+            hineDatePaint.setTextSize(dateTaxtSize);
 
         }
     }