Merge branch 'master' of http://39.97.65.143:81/android/android_flowbox

app/src/main/java/com/mints/flowbox/keepalive/NotificationService.java

@@ -47,7 +47,10 @@ public class NotificationService extends Service {
         super.onCreate();
 
         // 开启定时器
-        AlarmManager.getInstance().startTime();
+        try {
+            AlarmManager.getInstance().startTime();
+         } catch (Exception e) {
+        }
 
         try {
             notification = getFixedNotification(this);

app/src/main/java/com/mints/flowbox/ui/fragment/HomeFragment.kt

@@ -331,6 +331,7 @@ class HomeFragment : BaseFragment(), WifiStateManager.WifiStateCallback,
                         bundle.putInt(Constant.WRAPPER_TYPE, Constant.WRAPPER_TYPE_WZ)
                         readyGo(WrapperActivity::class.java, bundle)
                     }
+
                     Constant.HOT_ACTIVITY_CPD -> {
                         if (!UserManager.getInstance().userIsLogin()) {
                             readyGo(WxLoginActivity::class.java)