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

app/src/main/java/com/kuxuan/moneynote/json/MineJson.java

@@ -16,6 +16,15 @@ public class MineJson {
     private String phone_verified;
     private String nickname;
     private String headimgurl;
+    private String android_share_url;
+
+    public String getAndroid_share_url() {
+        return android_share_url;
+    }
+
+    public void setAndroid_share_url(String android_share_url) {
+        this.android_share_url = android_share_url;
+    }
 
     public String getHeadimgurl() {
         return headimgurl;

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

@@ -30,7 +30,6 @@ public  class AlarmReceiver extends BroadcastReceiver {
             // 需要VIBRATE权限
             builder.setDefaults(Notification.DEFAULT_VIBRATE);
             builder.setPriority(Notification.PRIORITY_DEFAULT);
-
             NotificationManager notificationManager = (NotificationManager) context
                     .getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.notify(111, builder.build());

app/src/main/java/com/kuxuan/moneynote/service.java

@@ -0,0 +1,37 @@
+package com.kuxuan.moneynote;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+/**
+ * @author HFRX hfrx1314@qq.com
+ * @version 1.0.0
+ */
+public class service extends Service {
+    public static final String TAG = "MyService";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Log.d(TAG, "onCreate() executed");
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Log.d(TAG, "onStartCommand() executed");
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d(TAG, "onDestroy() executed");
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}

app/src/main/java/com/kuxuan/moneynote/ui/activitys/alarm/AlarmActivity.java

@@ -1,7 +1,5 @@
 package com.kuxuan.moneynote.ui.activitys.alarm;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.support.v7.widget.RecyclerView;
@@ -10,11 +8,8 @@ import android.view.View;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.base.mvpbase.MVPFragmentActivity;
 import com.kuxuan.moneynote.json.Time;
-import com.kuxuan.moneynote.receiver.AlarmReceiver;
 import com.kuxuan.moneynote.utils.PickerUtil;
 
-import java.util.Calendar;
-
 import butterknife.Bind;
 import butterknife.OnClick;
 import cn.addapp.pickers.picker.TimePicker;
@@ -56,38 +51,6 @@ public class AlarmActivity extends MVPFragmentActivity<AlarmPresenter, AlarmMode
                 });
         mPresenter.initRecyclerView(this, mRecyclerView);
 
-        //得到日历实例，主要是为了下面的获取时间
-        Calendar mCalendar1 = Calendar.getInstance();
-        mCalendar1.setTimeInMillis(System.currentTimeMillis());
-
-        //获取当前毫秒值
-        long systemTime = System.currentTimeMillis();
-
-        //是设置日历的时间，主要是让日历的年月日和当前同步
-        mCalendar1.setTimeInMillis(System.currentTimeMillis());
-        // 这里时区需要设置一下，不然可能个别手机会有8个小时的时间差
-        mCalendar1.setTimeZone(java.util.TimeZone.getTimeZone("GMT+8"));
-        //设置在几点提醒  设置的为13点
-        mCalendar1.set(Calendar.HOUR_OF_DAY, 12);
-        //设置在几分提醒  设置的为25分
-        mCalendar1.set(Calendar.MINUTE, 10);
-        //下面这两个看字面意思也知道
-        mCalendar1.set(Calendar.SECOND, 0);
-        mCalendar1.set(Calendar.MILLISECOND, 0);
-
-
-        long selectTime = mCalendar1.getTimeInMillis();
-        // 如果当前时间大于设置的时间，那么就从第二天的设定时间开始
-        if (systemTime > selectTime) {
-            mCalendar1.add(Calendar.DAY_OF_MONTH, 1);
-        }
-        //AlarmReceiver.class为广播接受者
-        Intent intent = new Intent(AlarmActivity.this, AlarmReceiver.class);
-        PendingIntent pi = PendingIntent.getBroadcast(AlarmActivity.this, 0, intent, 0);
-        //得到AlarmManager实例
-        AlarmManager am = (AlarmManager) getSystemService(ALARM_SERVICE);
-//        am.set(AlarmManager.RTC_WAKEUP, mCalendar1.getTimeInMillis(), pi);
-        am.setRepeating(AlarmManager.RTC_WAKEUP, mCalendar1.getTimeInMillis(), 24 * 60 * 60 * 1000, pi);
     }
 
     @Override

app/src/main/java/com/kuxuan/moneynote/ui/activitys/alarm/AlarmPresenter.java

@@ -10,6 +10,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.widget.Toast;
 
+import com.kuxuan.moneynote.MyApplication;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.json.Time;
 import com.kuxuan.moneynote.listener.DeleteListener;
@@ -90,10 +91,10 @@ public class AlarmPresenter extends AlarmContract.AlarmPresent implements Delete
             mCalendar1.add(Calendar.DAY_OF_MONTH, 1);
         }
         //AlarmReceiver.class为广播接受者
-        Intent intent = new Intent(mContext, AlarmReceiver.class);
-        PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, intent, 0);
+        Intent intent = new Intent(MyApplication.getInstance(), AlarmReceiver.class);
+        PendingIntent pi = PendingIntent.getBroadcast(MyApplication.getInstance(), 0, intent, 0);
         //得到AlarmManager实例
-        AlarmManager am = (AlarmManager)mContext.getSystemService(ALARM_SERVICE);
+        AlarmManager am = (AlarmManager)MyApplication.getInstance().getSystemService(ALARM_SERVICE);
         am.setRepeating(AlarmManager.RTC_WAKEUP,mCalendar1.getTimeInMillis(),24*60*60*1000,pi);
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/login/LoginActivity.java

@@ -76,7 +76,7 @@ public class LoginActivity extends BaseFragmentActivity {
             e.printStackTrace();
         }
         AppManager.getAppManager().addActivity(this);
-        Glide.with(this).load(R.mipmap.icon_logo).transform(new GlideRoundTransform(this, 16)).into(mLogo);
+        Glide.with(this).load(R.mipmap.icon_logo).transform(new GlideRoundTransform(this, 10)).into(mLogo);
     }
 
     @OnClick({R.id.activity_login_wchat_btn, R.id.activity_login_more_text,R.id.activity_login_finish_text})

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

@@ -159,22 +159,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         activity = (BaseFragmentActivity) getActivity();
 
         mShareListener = new CustomShareListener(getActivity());
-        mShareAction = new ShareAction(getActivity()).setDisplayList(
-                SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE,
-                SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE) .setShareboardclickCallback(new ShareBoardlistener() {
-            @Override
-            public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
-                    UMWeb web = new UMWeb("https://www.baidu.com");
-                    web.setTitle("来自分享面板标题");
-                    web.setDescription("来自分享面板内容");
-                    web.setThumb(new UMImage(getActivity(), R.mipmap.ic_launcher));
-                    new ShareAction(getActivity()).withMedia(web)
-                            .setPlatform(share_media)
-                            .setCallback(mShareListener)
-                            .share();
 
-            }
-        });
 
        month = cal.get(Calendar.MONTH )+1+"";
         year = cal.get(Calendar.YEAR )+"";
@@ -234,7 +219,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
     }
 
     @Override
-    public void setMineData(MineJson mineModel) {
+    public void setMineData(final MineJson mineModel) {
         if(mineModel.getUsername()==null&&mineModel.getNickname()==null){
             mNameText.setText("");
         }else{
@@ -257,7 +242,21 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
             }
         }
 
+        mShareAction = new ShareAction(getActivity()).setDisplayList(
+                SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE) .setShareboardclickCallback(new ShareBoardlistener() {
+            @Override
+            public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
+                UMWeb web = new UMWeb(mineModel.getAndroid_share_url());
+                web.setTitle("来自分享面板标题");
+                web.setDescription("来自分享面板内容");
+                web.setThumb(new UMImage(getActivity(), R.mipmap.app_icon));
+                new ShareAction(getActivity()).withMedia(web)
+                        .setPlatform(share_media)
+                        .setCallback(mShareListener)
+                        .share();
 
+            }
+        });
     }
 
     @Override
@@ -281,6 +280,9 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         TextSetUtil.setTextForMoey(0.00+"",incomeText,16,12);
         TextSetUtil.setTextForMoey(0.00+"",payText,16,12);
         TextSetUtil.setTextForMoey(0.00+"",balanceText,16,12);
+
+
+
     }
 
     @Override