diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c4dd8ee..fbaa36f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
 
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Checkio"
         android:icon="@mipmap/temp">
         <activity
diff --git a/lib/blocs/habit/habit_bloc.dart b/lib/blocs/habit/habit_bloc.dart
index 22bd567..b94ac84 100644
--- a/lib/blocs/habit/habit_bloc.dart
+++ b/lib/blocs/habit/habit_bloc.dart
@@ -7,52 +7,45 @@ import 'package:timefly/models/user.dart';
 
 class HabitsBloc extends Bloc<HabitsEvent, HabitsState> {
   ///初始化状态为正在加载
-  HabitsBloc() : super(HabitsLoadInProgress());
-
-  @override
-  Stream<HabitsState> mapEventToState(HabitsEvent event) async* {
-    if (event is HabitsLoad) {
-      yield* _mapHabitsLoadToState();
-    } else if (event is HabitsAdd) {
-      yield* _mapHabitsAddToState(event);
-    } else if (event is HabitUpdate) {
-      yield* _mapHabitUpdateToState(event);
-    }
+  HabitsBloc() : super(HabitsLoadInProgress()) {
+    on<HabitsLoad>(_mapHabitsLoadToState);
+    on<HabitsAdd>(_mapHabitsAddToState);
+    on<HabitUpdate>(_mapHabitUpdateToState);
   }
 
-  Stream<HabitsState> _mapHabitsLoadToState() async* {
+  void _mapHabitsLoadToState(
+      HabitsLoad event, Emitter<HabitsState> emit) async {
     try {
       if (!SessionUtils.sharedInstance().isLogin()) {
-        yield HabitLoadSuccess([]);
+        emit(HabitLoadSuccess([]));
         return;
       }
       List<Habit> habits = await DatabaseProvider.db.getAllHabits();
       print(habits);
-      yield HabitLoadSuccess(habits);
+      emit(HabitLoadSuccess(habits));
     } catch (e) {
       print(e);
-      yield HabitsLodeFailure();
+      emit(HabitsLodeFailure());
     }
   }
 
-  Stream<HabitsState> _mapHabitsAddToState(HabitsAdd habitsAdd) async* {
+  void _mapHabitsAddToState(HabitsAdd event, Emitter<HabitsState> emit) {
     if (state is HabitLoadSuccess) {
       final List<Habit> habits = List.from((state as HabitLoadSuccess).habits)
-        ..add(habitsAdd.habit);
-      yield HabitLoadSuccess(habits);
-      DatabaseProvider.db.insert(habitsAdd.habit);
+        ..add(event.habit);
+      emit(HabitLoadSuccess(habits));
+      DatabaseProvider.db.insert(event.habit);
     }
   }
 
-  Stream<HabitsState> _mapHabitUpdateToState(HabitUpdate habitUpdate) async* {
+  void _mapHabitUpdateToState(HabitUpdate event, Emitter<HabitsState> emit) {
     if (state is HabitLoadSuccess) {
       final List<Habit> habits = (state as HabitLoadSuccess)
           .habits
-          .map((habit) =>
-              habit.id == habitUpdate.habit.id ? habitUpdate.habit : habit)
+          .map((habit) => habit.id == event.habit.id ? event.habit : habit)
           .toList();
-      yield HabitLoadSuccess(habits);
-      DatabaseProvider.db.update(habitUpdate.habit);
+      emit(HabitLoadSuccess(habits));
+      DatabaseProvider.db.update(event.habit);
     }
   }
 }