修改高度获取机制

MagicMashRoom · Jun 28, 2017 · cf6f703 · cf6f703
1 parent 51fd83d
commit cf6f703
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/calendar/src/main/java/com/ldf/calendar/view/Calendar.java b/calendar/src/main/java/com/ldf/calendar/view/Calendar.java
@@ -59,7 +59,7 @@ protected void onDraw(Canvas canvas) {
 	@Override
 	protected void onSizeChanged(int w, int h, int oldW, int oldH) {
 		super.onSizeChanged(w, h, oldW, oldH);
-		cellHeight = w / Const.TOTAL_ROW;
+		cellHeight = h / Const.TOTAL_ROW;
 		cellWidth = w / Const.TOTAL_COL;
 		calendarAttr.setCellHeight(cellHeight);
 		calendarAttr.setCellWidth(cellWidth);

diff --git a/calendar/src/main/java/com/ldf/calendar/view/MonthPager.java b/calendar/src/main/java/com/ldf/calendar/view/MonthPager.java
@@ -16,7 +16,6 @@ public class MonthPager extends ViewPager {
     private int currentPosition = CURRENT_DAY_INDEX;
     private int cellHeight = 0;
     private int rowIndex = 6;
-    private int mCellSpace;
 
     private ViewPager.OnPageChangeListener viewPageChangeListener;
     private OnPageChangeListener monthPageChangeListener;
@@ -81,13 +80,13 @@ public void addOnPageChangeListener(OnPageChangeListener listener) {
 
     @Override
     protected void onSizeChanged(int w, int h, int oldW, int oldH) {
-        mCellSpace = h / 6;
+        cellHeight = h / 6;
         super.onSizeChanged(w, h, oldW, oldH);
     }
 
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if(mCellSpace > 0){
-            super.onMeasure(widthMeasureSpec,MeasureSpec.makeMeasureSpec(mCellSpace * 6,
+        if(cellHeight > 0){
+            super.onMeasure(widthMeasureSpec,MeasureSpec.makeMeasureSpec(cellHeight * 6,
                     MeasureSpec.EXACTLY));
         } else {
             super.onMeasure(widthMeasureSpec,heightMeasureSpec);
@@ -113,8 +112,6 @@ public int getTopMovableDistance() {
     }
 
     public int getCellHeight() {
-        CalendarViewAdapter calendarViewAdapter = (CalendarViewAdapter) getAdapter();
-        cellHeight = calendarViewAdapter.getPagers().get(currentPosition  % 3).getCellHeight();
         return cellHeight;
     }
 

diff --git a/example/src/main/java/com/hqyxjy/ldf/supercalendar/CustomDayView.java b/example/src/main/java/com/hqyxjy/ldf/supercalendar/CustomDayView.java
@@ -33,7 +33,6 @@ public CustomDayView(Context context, int layoutResource) {
         dateTv = (TextView) findViewById(R.id.date);
         marker = (ImageView) findViewById(R.id.maker);
         selectedBackground = findViewById(R.id.selected_background);
-        selectedBackground = findViewById(R.id.selected_background);
         todayBackground = findViewById(R.id.today_background);
     }
 

diff --git a/example/src/main/res/layout/activity_syllabus.xml b/example/src/main/res/layout/activity_syllabus.xml
@@ -128,7 +128,7 @@
         <com.ldf.calendar.view.MonthPager
             android:id="@+id/calendar_view"
             android:layout_width="match_parent"
-            android:layout_height="360dp"
+            android:layout_height="300dp"
             android:background="#fff">
         </com.ldf.calendar.view.MonthPager>
 

diff --git a/example/src/main/res/layout/custom_day.xml b/example/src/main/res/layout/custom_day.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="51.4dp"
-    android:layout_height="60dp">
+    android:layout_height="50dp">
     <View
         android:id="@+id/today_background"
         android:layout_width="33dp"