加入群号码

smarteng · Nov 23, 2017 · 61e5e61 · 61e5e61
1 parent a4b8325
commit 61e5e61
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 43 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 2
-        versionName "2.4.4"
+        versionName "2.4.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/necer/ncalendardemo/activity/MainActivity.java b/app/src/main/java/necer/ncalendardemo/activity/MainActivity.java
@@ -6,6 +6,7 @@
 import android.view.View;
 import android.widget.TextView;
 import necer.ncalendardemo.R;
+
 public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -31,4 +32,7 @@ public void notDefaultSelect(View v) {
     public void week(View v) {
         startActivity(new Intent(this, WeekActivity.class));
     }
+
+
+
 }
diff --git a/app/src/main/java/necer/ncalendardemo/activity/MonthNotSelectActivity.java b/app/src/main/java/necer/ncalendardemo/activity/MonthNotSelectActivity.java
@@ -15,8 +15,8 @@
 
 
 /**
- * Created by 闫彬彬 on 2017/9/27.
- * QQ:619008099
+ * Created by necer on 2017/9/27.
+ * QQ群:127278900
  */
 
 public class MonthNotSelectActivity extends Activity {

diff --git a/app/src/main/java/necer/ncalendardemo/activity/MonthSelectActivity.java b/app/src/main/java/necer/ncalendardemo/activity/MonthSelectActivity.java
@@ -14,8 +14,8 @@
 import necer.ncalendardemo.R;
 
 /**
- * Created by 闫彬彬 on 2017/9/27.
- * QQ:619008099
+ * Created by necer on 2017/9/27.
+ * QQ群:127278900
  */
 
 public class MonthSelectActivity extends Activity {

diff --git a/app/src/main/java/necer/ncalendardemo/activity/NCalendarActivity.java b/app/src/main/java/necer/ncalendardemo/activity/NCalendarActivity.java
@@ -23,8 +23,8 @@
 import necer.ncalendardemo.adapter.AAAdapter;
 
 /**
- * Created by 闫彬彬 on 2017/9/27.
- * QQ:619008099
+ * Created by necer on 2017/9/27.
+ * QQ群:127278900
  */
 
 public class NCalendarActivity extends AppCompatActivity implements OnCalendarChangedListener {
@@ -53,7 +53,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         tv_date = (TextView) findViewById(R.id.tv_date);
 
 
-        ncalendar.setDateInterval("2017-04-02","2018-01-01");
+     //   ncalendar.setDateInterval("2017-04-02","2018-01-01");
 
 
 

diff --git a/app/src/main/java/necer/ncalendardemo/activity/Utils.java b/app/src/main/java/necer/ncalendardemo/activity/Utils.java
@@ -5,8 +5,8 @@
 import android.content.pm.PackageManager;
 
 /**
- * Created by 闫彬彬 on 2017/9/28.
- * QQ:619008099
+ * Created by necer on 2017/9/28.
+ * QQ群:127278900
  */
 
 public class Utils {

diff --git a/app/src/main/java/necer/ncalendardemo/activity/WeekActivity.java b/app/src/main/java/necer/ncalendardemo/activity/WeekActivity.java
@@ -9,8 +9,8 @@
 import necer.ncalendardemo.R;
 
 /**
- * Created by 闫彬彬 on 2017/10/30.
- * QQ:619008099
+ * Created by necer on 2017/10/30.
+ * QQ群:127278900
  */
 
 public class WeekActivity extends Activity {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -32,21 +32,21 @@
         android:text="周日历"
         android:onClick="week"/>
 
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="12sp"
-        android:layout_marginTop="20dp"
-        android:paddingLeft="5dp"
-        android:text="单纯的周日历和月日历使用方法完全相同"/>
+        android:layout_margin="15dp"
+        android:text="注意：1单纯的周日历和月日历使用方法完全相同
+2：单个的周日历和月日历可以设置默认不选中（即是点击才选中，不点击不选中），但是月周切换必须每页都有选中日期，这样才能体现出月周切换日期无缝切换的特点， 该日历不支持月周切换的不选中设置"/>
 
     <TextView
         android:id="@+id/tv_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="12sp"
-        android:layout_marginTop="20dp"
-        android:paddingLeft="5dp"
+        android:layout_margin="15dp"
         android:text="版本"/>
 
 

diff --git a/ncalendar/build.gradle b/ncalendar/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
-version = "2.4.4" //版本号
+version = "2.4.5" //版本号
 
 android {
     compileSdkVersion 25

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/adapter/CalendarAdapter.java b/ncalendar/src/main/java/com/necer/ncalendar/adapter/CalendarAdapter.java
@@ -11,8 +11,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/8/25.
- * QQ:619008099
+ * Created by necer on 2017/8/25.
+ * QQ群:127278900
  */
 
 public abstract class CalendarAdapter extends PagerAdapter {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/adapter/MonthAdapter.java b/ncalendar/src/main/java/com/necer/ncalendar/adapter/MonthAdapter.java
@@ -9,8 +9,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/8/28.
- * QQ:619008099
+ * Created by necer on 2017/8/28.
+ * QQ群:127278900
  */
 
 public class MonthAdapter extends CalendarAdapter {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/adapter/WeekAdapter.java b/ncalendar/src/main/java/com/necer/ncalendar/adapter/WeekAdapter.java
@@ -9,8 +9,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/8/30.
- * QQ:619008099
+ * Created by necer on 2017/8/30.
+ * QQ群:127278900
  */
 
 public class WeekAdapter extends CalendarAdapter {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/CalendarPager.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/CalendarPager.java
@@ -19,8 +19,8 @@
 import java.util.List;
 
 /**
- * Created by 闫彬彬 on 2017/8/25.
- * QQ:619008099
+ * Created by necer on 2017/8/25.
+ * QQ群:127278900
  */
 
 public abstract class CalendarPager extends ViewPager {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/MonthCalendar.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/MonthCalendar.java
@@ -17,8 +17,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/8/28.
- * QQ:619008099
+ * Created by necer on 2017/8/28.
+ * QQ群:127278900
  */
 
 public class MonthCalendar extends CalendarPager implements OnClickMonthViewListener {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/NCalendar.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/NCalendar.java
@@ -25,8 +25,8 @@
 import java.util.List;
 
 /**
- * Created by 闫彬彬 on 2017/8/25.
- * QQ:619008099
+ * Created by necer on 2017/8/25.
+ * QQ群:127278900
  */
 
 public class NCalendar extends FrameLayout implements NestedScrollingParent, ValueAnimator.AnimatorUpdateListener, OnWeekCalendarChangedListener, OnMonthCalendarChangedListener {
@@ -574,4 +574,13 @@ public void setDateInterval(String startString,String endString) {
         monthCalendar.setDateInterval(startString,endString);
         weekCalendar.setDateInterval(startString,endString);
     }
+
+
+    /**
+     * 返回100是月，返回200是周
+     * @return
+     */
+    public int getState() {
+        return STATE;
+    }
 }
diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/WeekCalendar.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/WeekCalendar.java
@@ -18,8 +18,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/8/30.
- * QQ:619008099
+ * Created by necer on 2017/8/30.
+ * QQ群:127278900
  */
 
 public class WeekCalendar extends CalendarPager implements OnClickWeekViewListener {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/listener/OnMonthCalendarChangedListener.java b/ncalendar/src/main/java/com/necer/ncalendar/listener/OnMonthCalendarChangedListener.java
@@ -3,8 +3,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/9/20.
- * QQ:619008099
+ * Created by necer on 2017/9/20.
+ * QQ群:127278900
  */
 
 public interface OnMonthCalendarChangedListener {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/listener/OnWeekCalendarChangedListener.java b/ncalendar/src/main/java/com/necer/ncalendar/listener/OnWeekCalendarChangedListener.java
@@ -3,8 +3,8 @@
 import org.joda.time.DateTime;
 
 /**
- * Created by 闫彬彬 on 2017/9/20.
- * QQ:619008099
+ * Created by necer on 2017/9/20.
+ * QQ群:127278900
  */
 
 public interface OnWeekCalendarChangedListener {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/view/CalendarView.java b/ncalendar/src/main/java/com/necer/ncalendar/view/CalendarView.java
@@ -14,8 +14,8 @@
 import java.util.List;
 
 /**
- * Created by 闫彬彬 on 2017/8/29.
- * QQ:619008099
+ * Created by necer on 2017/8/29.
+ * QQ群:127278900
  */
 
 public abstract class CalendarView extends View {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/view/MonthView.java b/ncalendar/src/main/java/com/necer/ncalendar/view/MonthView.java
@@ -18,8 +18,8 @@
 
 
 /**
- * Created by 闫彬彬 on 2017/8/25.
- * QQ:619008099
+ * Created by necer on 2017/8/25.
+ * QQ群:127278900
  */
 
 public class MonthView extends CalendarView {

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/view/WeekView.java b/ncalendar/src/main/java/com/necer/ncalendar/view/WeekView.java
@@ -18,8 +18,8 @@
 
 
 /**
- * Created by 闫彬彬 on 2017/8/25.
- * QQ:619008099
+ * Created by necer on 2017/8/25.
+ * QQ群:127278900
  */
 
 public class WeekView extends CalendarView {