Merge branch 'master' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote

app/src/main/java/com/kuxuan/moneynote/receiver/AlarmReceiver.java

@@ -2,16 +2,19 @@ package com.kuxuan.moneynote.receiver;
 
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.os.SystemClock;
 import android.support.v7.app.NotificationCompat;
 import android.util.Log;
 import android.widget.RemoteViews;
 
 import com.kuxuan.moneynote.R;
+import com.kuxuan.moneynote.ui.activitys.MainActivity;
 
 import static com.umeng.socialize.utils.ContextUtil.getPackageName;
 
@@ -36,6 +39,11 @@ public  class AlarmReceiver extends BroadcastReceiver {
             builder.setPriority(Notification.PRIORITY_DEFAULT);
             NotificationManager notificationManager = (NotificationManager) context
                     .getSystemService(Context.NOTIFICATION_SERVICE);
+        Intent intent1 = new Intent(context, MainActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        int requestCode = (int) SystemClock.uptimeMillis();
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent1, PendingIntent.FLAG_UPDATE_CURRENT);
+        contentView.setOnClickPendingIntent(R.id.notification, pendingIntent);
             notificationManager.notify(111, builder.build());
 
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/mine/MineFragment.java

@@ -323,7 +323,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         public void onResult(SHARE_MEDIA platform) {
 
             if (platform.name().equals("WEIXIN_FAVORITE")) {
-                Toast.makeText(mActivity.get(), platform + " 收藏成功啦", Toast.LENGTH_SHORT).show();
+                Toast.makeText(mActivity.get()," 收藏成功啦", Toast.LENGTH_SHORT).show();
             } else {
                 if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
                         && platform != SHARE_MEDIA.EMAIL
@@ -337,7 +337,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
                         && platform != SHARE_MEDIA.GOOGLEPLUS
                         && platform != SHARE_MEDIA.YNOTE
                         && platform != SHARE_MEDIA.EVERNOTE) {
-                    Toast.makeText(mActivity.get(), platform + " 分享成功啦", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(mActivity.get(),  " 分享成功啦", Toast.LENGTH_SHORT).show();
                 }
 
             }
@@ -357,7 +357,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
                     && platform != SHARE_MEDIA.GOOGLEPLUS
                     && platform != SHARE_MEDIA.YNOTE
                     && platform != SHARE_MEDIA.EVERNOTE) {
-                Toast.makeText(mActivity.get(), platform + " 分享失败啦", Toast.LENGTH_SHORT).show();
+                Toast.makeText(mActivity.get(),  " 分享失败啦", Toast.LENGTH_SHORT).show();
                 if (t != null) {
                     Log.d("throw", "throw:" + t.getMessage());
                 }
@@ -368,7 +368,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         @Override
         public void onCancel(SHARE_MEDIA platform) {
 
-            Toast.makeText(mActivity.get(), platform + " 分享取消了", Toast.LENGTH_SHORT).show();
+            Toast.makeText(mActivity.get(),  " 分享取消了", Toast.LENGTH_SHORT).show();
         }
     }
 

app/src/main/res/layout/notification.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:gravity="center"
+    android:id="@+id/notification"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 <ImageView