选中模式改成枚举

vistar1986 · Jul 9, 2019 · a5f7449 · a5f7449
1 parent 1e21ffe
commit a5f7449
Show file tree

Hide file tree

Showing 29 changed files with 314 additions and 381 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 2
-        versionName "4.0.4"
+        versionName "4.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/necer/ncalendar/CustomPainter.java b/app/src/main/java/com/necer/ncalendar/CustomPainter.java
diff --git a/app/src/main/java/com/necer/ncalendar/activity/BaseActivity.java b/app/src/main/java/com/necer/ncalendar/activity/BaseActivity.java
@@ -0,0 +1,32 @@
+package com.necer.ncalendar.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+
+import com.necer.enumeration.SelectedModel;
+
+public abstract class BaseActivity extends AppCompatActivity {
+
+    protected final static String TAG = "NECER";
+    protected String title;
+    protected SelectedModel selectedModel;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        selectedModel = (SelectedModel) getIntent().getSerializableExtra("selectedModel");
+        title = getIntent().getStringExtra("title");
+
+        ActionBar supportActionBar = getSupportActionBar();
+
+        if (supportActionBar != null) {
+            supportActionBar.setTitle(title);
+        }
+    }
+
+
+}
diff --git a/app/src/main/java/com/necer/ncalendar/activity/CustomCalendarActivity.java b/app/src/main/java/com/necer/ncalendar/activity/CustomCalendarActivity.java
@@ -6,28 +6,56 @@
 import android.view.View;
 
 import com.necer.calendar.Miui10Calendar;
-import com.necer.ncalendar.CustomPainter;
+import com.necer.enumeration.SelectedModel;
 import com.necer.ncalendar.R;
 import com.necer.ncalendar.painter.LigaturePainter;
-import com.necer.painter.CalendarPainter;
+import com.necer.ncalendar.painter.TicketPainter;
+
+import org.joda.time.LocalDate;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by necer on 2019/1/4.
  */
 public class CustomCalendarActivity extends AppCompatActivity {
 
     Miui10Calendar miui10Calendar;
-    CustomPainter customPainter;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_custom);
         miui10Calendar = findViewById(R.id.miui10Calendar);
-        miui10Calendar.setMultipleSelset(true);
-       // customPainter = new CustomPainter(this);
+        miui10Calendar.setSelectedMode(SelectedModel.MULTIPLE);
         LigaturePainter painter = new LigaturePainter(this);
         miui10Calendar.setCalendarPainter(painter);
 
     }
+
+    public void ligaturePainter(View view) {
+        LigaturePainter painter = new LigaturePainter(this);
+        miui10Calendar.setCalendarPainter(painter);
+    }
+
+    public void ticketPainter(View view) {
+        TicketPainter ticketPainter = new TicketPainter(this, miui10Calendar);
+
+        Map<LocalDate, String> priceMap = new HashMap<>();
+        priceMap.put(new LocalDate("2019-06-07"), "￥350");
+        priceMap.put(new LocalDate("2019-07-07"), "￥350");
+        priceMap.put(new LocalDate("2019-06-30"), "￥350");
+        priceMap.put(new LocalDate("2019-07-03"), "￥350");
+        priceMap.put(new LocalDate("2019-07-04"), "￥350");
+        priceMap.put(new LocalDate("2019-07-10"), "￥350");
+        priceMap.put(new LocalDate("2019-07-15"), "￥350");
+        priceMap.put(new LocalDate("2019-07-30"), "￥350");
+        priceMap.put(new LocalDate("2019-08-04"), "￥350");
+        priceMap.put(new LocalDate("2019-08-29"), "￥350");
+
+        ticketPainter.setPriceMap(priceMap);
+
+        miui10Calendar.setCalendarPainter(ticketPainter);
+    }
 }
diff --git a/app/src/main/java/com/necer/ncalendar/activity/MainActivity.java b/app/src/main/java/com/necer/ncalendar/activity/MainActivity.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.necer.enumeration.SelectedModel;
 import com.necer.ncalendar.R;
 
 
@@ -16,72 +17,89 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-         TextView tvVersion = (TextView) findViewById(R.id.tv_version);
-         tvVersion.setText("版本：" + Utils.getCurrentVersion(this));
+        TextView tvVersion = (TextView) findViewById(R.id.tv_version);
+        tvVersion.setText("版本：" + Utils.getCurrentVersion(this));
+
+    }
 
 
+    public void month_selected(View view) {
+        startActivity(getNewIntent(TestMonthActivity.class, SelectedModel.SINGLE_SELECTED, "月日历默认选中"));
     }
 
-    public void testMonth(View view) {
-        startActivity(new Intent(this, TestMonthActivity.class));
+    public void month_unSelected(View view) {
+        startActivity(getNewIntent(TestMonthActivity.class, SelectedModel.SINGLE_UNSELECTED, "月日历默认不选中"));
     }
 
-    public void testWeek(View view) {
-        startActivity(new Intent(this, TestWeekActivity.class));
+    public void month_multiple(View view) {
+        startActivity(getNewIntent(TestMonthActivity.class, SelectedModel.MULTIPLE, "月日历多选"));
     }
 
+    public void week_selected(View view) {
+        startActivity(getNewIntent(TestWeekActivity.class, SelectedModel.SINGLE_SELECTED, "周日历默认选中"));
+    }
 
-    public void miui9_0(View view) {
-        TestMiui9Activity.startActivity(this, true, false);
+    public void week_unSelected(View view) {
+        startActivity(getNewIntent(TestWeekActivity.class, SelectedModel.SINGLE_UNSELECTED, "周日历默认不选中"));
     }
 
-    public void miui9_1(View view) {
-        TestMiui9Activity.startActivity(this, false, false);
+    public void week_multiple(View view) {
+        startActivity(getNewIntent(TestWeekActivity.class,  SelectedModel.MULTIPLE, "周日历多选"));
     }
 
-    public void miui9_2(View view) {
-        TestMiui9Activity.startActivity(this, false, true);
+    public void miui9_selected(View view) {
+        startActivity(getNewIntent(TestMiui9Activity.class, SelectedModel.SINGLE_SELECTED, "miui9默认选中"));
     }
 
-    public void miui10_0(View view) {
-        TestMiui10Activity.startActivity(this, true, false);
+    public void miui9_unSelected(View view) {
+        startActivity(getNewIntent(TestMiui9Activity.class, SelectedModel.SINGLE_UNSELECTED, "miui9默认不选中"));
     }
 
-    public void miui10_1(View view) {
-        TestMiui10Activity.startActivity(this, false, false);
+    public void miui9_multiple(View view) {
+        startActivity(getNewIntent(TestMiui9Activity.class,  SelectedModel.MULTIPLE, "miui9多选"));
     }
 
-    public void miui10_2(View view) {
-        TestMiui10Activity.startActivity(this, false, true);
+    public void miui10_selected(View view) {
+        startActivity(getNewIntent(TestMiui10Activity.class, SelectedModel.SINGLE_SELECTED, "miui10默认选中"));
     }
 
+    public void miui10_unSelected(View view) {
+        startActivity(getNewIntent(TestMiui10Activity.class, SelectedModel.SINGLE_UNSELECTED, "miui10默认不选中"));
+    }
 
-    public void emiui_0(View view) {
-        TestEmuiActivity.startActivity(this, true, false);
+    public void miui10_multiple(View view) {
+        startActivity(getNewIntent(TestMiui10Activity.class,  SelectedModel.MULTIPLE, "miui10多选"));
     }
 
-    public void emiui_1(View view) {
-        TestEmuiActivity.startActivity(this, false, false);
+    public void emiui_selected(View view) {
+        startActivity(getNewIntent(TestEmuiActivity.class, SelectedModel.SINGLE_SELECTED, "emiui默认选中"));
     }
 
-    public void emiui_2(View view) {
-        TestEmuiActivity.startActivity(this, false, true);
+    public void emiui_unSelected(View view) {
+        startActivity(getNewIntent(TestEmuiActivity.class, SelectedModel.SINGLE_UNSELECTED, "emiui默认不选中"));
     }
 
+    public void emiui_multiple(View view) {
+        startActivity(getNewIntent(TestEmuiActivity.class,  SelectedModel.MULTIPLE, "emiui多选"));
+    }
 
     public void toHoldWeek(View view) {
-
         startActivity(new Intent(this, TestWeekHoldActivity.class));
     }
 
     public void addView(View view) {
-
         startActivity(new Intent(this, TestAddViewActivity.class));
     }
 
-    public void customCalendar(View view) {
-
+    public void custom_painter(View view) {
         startActivity(new Intent(this, CustomCalendarActivity.class));
     }
 
+    private Intent getNewIntent(Class<? extends BaseActivity> clazz, SelectedModel selectedModel, String title) {
+        Intent intent = new Intent(this, clazz);
+        intent.putExtra("selectedModel", selectedModel);
+        intent.putExtra("title", title);
+        return intent;
+    }
+
 }