Explorar o código

review代码:
资金有变化时,更新用户信息;修复我的战绩中的日历右边可能不充满的问题

zengjiebin %!s(int64=7) %!d(string=hai) anos
pai
achega
dc72947ffc

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -10,6 +10,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.fragment.FgtMyMoney1;
 import com.sheep.gamegroup.view.fragment.FgtMyMoney2;
 import com.sheep.gamegroup.view.fragment.FgtMyMoney3;
@@ -26,6 +28,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.afinal.simplecache.ApiKey;
+
 import butterknife.BindView;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
@@ -152,6 +156,10 @@ public class ActMyMoney extends BaseActivity {
                         .subscribe(new SheepSubscriber<BaseMessage>(this) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
+                                boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.MY_ASSETS);
+                                if(isNewData){
+                                    CommonUtil.getInstance().updateUserInfo(null);
+                                }
                                 UserAssets userAssets = baseMessage.getData(UserAssets.class);
                                 loadData(userAssets);
                                 hideProgress();

+ 4 - 4
app/src/main/java/com/sheep/gamegroup/view/customview/CalendarMonthView.java

@@ -61,7 +61,7 @@ public class CalendarMonthView extends MonthView {
     protected void onDrawScheme(Canvas canvas, Calendar calendar, int x, int y) {
         this.mSchemeBasicPaint.setColor(calendar.getSchemeColor());
 //        canvas.drawRect((float) (x + this.mPadding), (float) (y + this.mPadding), (float) (x + this.mItemWidth - this.mPadding), (float) (y + this.mItemHeight - this.mPadding), this.mSchemeBasicPaint);
-        canvas.drawRect((float) (x), (float) (y - this.mPadding / 2), (float) (x + this.mItemWidth), (float) (y + this.mItemHeight - this.mPadding / 2), this.mSchemeBasicPaint);
+        canvas.drawRect((float) (x), y - this.mPadding / 2.0F, x + this.mItemWidth + (calendar.getWeek() == 0 ? this.mPadding : 0), y + this.mItemHeight - this.mPadding / 2.0F, this.mSchemeBasicPaint);
 //        canvas.drawRoundRect((float) (x + this.mPadding), (float) (y + this.mPadding), (float) (x + this.mItemWidth - this.mPadding), (float) (y + this.mItemHeight - this.mPadding), this.mSchemeBasicPaint);
 //        canvas.drawText(calendar.getScheme(), (float) (x + this.mItemWidth - this.mPadding) - this.mRadio / 2.0F - this.getTextWidth(calendar.getScheme()) / 2.0F, (float) (y + this.mPadding) + this.mSchemeBaseLine, this.mTextPaint);
     }
@@ -105,7 +105,7 @@ public class CalendarMonthView extends MonthView {
     //画当天背景
     protected void onDrawCurDay(Canvas canvas, Calendar calendar, int x, int y, boolean hasScheme) {
         this.mCurDayPaint.setStyle(Paint.Style.FILL);
-        canvas.drawCircle((float) (x + this.mItemWidth / 2.0F), (float) (y - this.mPadding + this.mItemWidth / 2.0F), this.mItemWidth * 2 / 5, this.mCurDayPaint);
+        canvas.drawCircle(x + this.mItemWidth / 2.0F, y + this.mItemHeight / 2.0F, (Math.min(this.mItemHeight, this.mItemWidth) - this.mPadding) / 2.0F, this.mCurDayPaint);
     }
 
     /**
@@ -115,8 +115,8 @@ public class CalendarMonthView extends MonthView {
      * @param dpValue dp
      * @return px
      */
-    static float dipToPx(Context context, float dpValue) {
+    static int dipToPx(Context context, float dpValue) {
         final float scale = context.getResources().getDisplayMetrics().density;
-        return dpValue * scale + 0.5f;
+        return (int) (dpValue * scale + 0.5f);
     }
 }

+ 1 - 0
app/src/main/java/org/afinal/simplecache/ApiKey.java

@@ -95,5 +95,6 @@ public class ApiKey {
     }
     public static final String slideshowGame = "app/game_banner?platform=1";
     public static final String friend_count_and_award = "app/user/friend_count_and_award";
+    public static final String MY_ASSETS = "app/user/my_assets";
 
 }