Commit 73c600ef authored by jianglx's avatar jianglx

修改签到页面的样式;修改cookie的存储地址;屏蔽免费天数的入口

parent 199eebb6
......@@ -116,14 +116,11 @@ public class OkHttpCreate {
public void log(String message) {
LogUtils.d(message);
}
});
loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
this.mHttpBuilder.addInterceptor(loggingInterceptor);
}
/**
* 设置超时时间
*
......
......@@ -5,7 +5,7 @@ import android.content.SharedPreferences;
public class Cooker {
private final static String COOKIE_FILE = "cookie" ;
private final static String COOKIE_FILE = "cookie";
private static SharedPreferences preferences;
......@@ -67,6 +67,7 @@ public class Cooker {
public static float getFloatValue(Context context, String key, float def) {
return getPreference(context).getFloat(key, def);
}
public static boolean getBooleanValue(Context context, String key) {
return getBooleanValue(context, key, false);
}
......@@ -74,6 +75,4 @@ public class Cooker {
public static boolean getBooleanValue(Context context, String key, boolean def) {
return getPreference(context).getBoolean(key, def);
}
}
......@@ -215,7 +215,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
} else if (id == R.id.tv_purchase_record) {
startActivity(new Intent(MemberCenterActivity.this, PurchaseRecordActivity.class));
} else if (id == R.id.tv_free_day) {
startActivity(new Intent(MemberCenterActivity.this, FreesDayActivity.class));
// startActivity(new Intent(MemberCenterActivity.this, FreesDayActivity.class));
}
}
......
package com.rv.points;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
......@@ -12,6 +19,7 @@ import com.frame.rv.config.RvFrameConfig;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.DisplayUtil;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
......@@ -35,6 +43,8 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
InnerGridView innerGridView;
@BindView(R2.id.tv_sign_day)
TextView tvSignDay;
@BindView(R2.id.img_back)
ImageView imgBack;
private DateAdapter dateAdapter;
@Override
......@@ -44,13 +54,19 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("签到");
titleView.setVisibility(View.GONE);
btnSign.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
sign();
}
});
imgBack.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
}
});
dateAdapter = new DateAdapter(this);
innerGridView.setAdapter(dateAdapter);
}
......@@ -66,7 +82,10 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
if (requestType == 0) {
SignRecordBean bean = (SignRecordBean) result;
if (bean.getData() != null && bean.getData().size() > 0) {
tvSignDay.setText("你已累计签到" + bean.getData().size() + "天");
SpannableString msp = new SpannableString("累计签到 " + bean.getData().size() + " 天");
msp.setSpan(new ForegroundColorSpan(Color.parseColor("#FDC349")), 5, msp.length() - 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
msp.setSpan(new AbsoluteSizeSpan(DisplayUtil.sp2px(getApplicationContext(),18)), 5, msp.length() - 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
tvSignDay.setText(msp);
dateAdapter.setSignData(bean.getData());
}
}
......@@ -97,9 +116,9 @@ public class SignActivity extends BaseStatusActivity<CommonPresenter> {
Map<String, Object> header = new HashMap<>();
header.put("Authorization", OkGoUtil.getToken());
Map<String,Object> body = new HashMap<>() ;
body.put("integralRuleCode","SIGN") ;
mPresenter.postData(RvFrameConfig.HOST ,1, ApiConfig.HTTP_URL_SIGN, SignResultBean.class, body, header, true);
Map<String, Object> body = new HashMap<>();
body.put("integralRuleCode", "SIGN");
mPresenter.postData(RvFrameConfig.HOST, 1, ApiConfig.HTTP_URL_SIGN, SignResultBean.class, body, header, true);
}
}
......
......@@ -27,6 +27,7 @@ public class DateAdapter extends BaseAdapter {
private List<Integer> days = new ArrayList<>();
private List<Integer> singRecords = new ArrayList<>();
private int today;
//签到成功的回调方法,相应的可自行添加签到失败时的回调方法
......@@ -34,13 +35,14 @@ public class DateAdapter extends BaseAdapter {
public DateAdapter(Context context) {
this.context = context;
int maxDay = DateUtil.getCurrentMonthLastDay();//获取当月天数
Calendar calendar = Calendar.getInstance();
today = calendar.get(Calendar.DAY_OF_MONTH);
for (int i = 0; i < DateUtil.getFirstDayOfMonth() - 1; i++) {
//DateUtil.getFirstDayOfMonth()获取当月第一天是星期几,星期日是第一天,依次类推
days.add(0);
}
for (int i = 0; i < maxDay; i++) {
days.add(i + 1);
}
}
......@@ -72,16 +74,24 @@ public class DateAdapter extends BaseAdapter {
viewHolder.tv = view.findViewById(R.id.tvWeek);
viewHolder.rlItem = view.findViewById(R.id.rlItem);
viewHolder.ivStatus = view.findViewById(R.id.ivStatus);
if (today == i) {
viewHolder.tv.setText("今天");
} else {
viewHolder.tv.setText(days.get(i) + "");
}
if (days.get(i) == 0) {
viewHolder.rlItem.setVisibility(View.GONE);
}
if (singRecords != null && singRecords.contains(i)) {
viewHolder.tv.setTextColor(Color.parseColor("#FD0000"));
viewHolder.ivStatus.setImageResource(R.drawable.icon_signed);
viewHolder.ivStatus.setVisibility(View.VISIBLE);
} else {
viewHolder.tv.setTextColor(Color.parseColor("#666666"));
viewHolder.ivStatus.setVisibility(View.GONE);
if (today > i) {
viewHolder.ivStatus.setImageResource(R.drawable.icon_unsign);
viewHolder.ivStatus.setVisibility(View.VISIBLE);
} else {
viewHolder.ivStatus.setVisibility(View.INVISIBLE);
}
}
return view;
......
......@@ -8,24 +8,28 @@ import android.graphics.Rect;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import com.rv.component.utils.DisplayUtil;
public class WeekNavigation extends View {
private String weeks[] = { "天","一", "二", "三", "四", "五", "六"};
private String weeks[] = {"天", "一", "二", "三", "四", "五", "六"};
private Context mContext;
private Paint wordsPaint;
private int itemWidth;
private int itemHeight;
public WeekNavigation(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
mContext = context;
wordsPaint = new Paint();
wordsPaint.setColor(Color.WHITE);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int width = getMeasuredWidth();
itemHeight = DisplayUtil.sp2px(getContext(), 30);
itemWidth = width / 7;
}
......@@ -34,16 +38,13 @@ public class WeekNavigation extends View {
super.onDraw(canvas);
wordsPaint.setTextSize(DisplayUtil.sp2px(mContext, 14));
for (int i = 0; i < weeks.length; i++) {
if (0 == i || 6 == i) {
wordsPaint.setColor(Color.GRAY);
} else {
wordsPaint.setColor(Color.BLACK);
}
Rect rect = new Rect();
wordsPaint.getTextBounds(weeks[i], 0, 1, rect);
int wordWidth = rect.width();
float wordX = i * itemWidth + itemWidth/2 ;
float wordY = wordWidth ;
int wordHeight = rect.height();
float wordX = i * itemWidth + itemWidth / 2 - wordWidth / 2;
float wordY = itemHeight / 2 + wordWidth / 2;
canvas.drawText(weeks[i], wordX, wordY, wordsPaint);
}
}
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="#ffffff" />
<stroke
android:width="@dimen/size_1"
android:color="#FEAD8A" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="30dp" />
<solid android:color="#FDC349" />
</shape>
\ No newline at end of file
......@@ -9,20 +9,68 @@
tools:context=".SignActivity">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_48"
android:background="@color/colorWrite">
<ImageView
android:id="@+id/img_back"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="320dp"
android:maxLines="1"
android:text="签到领积分"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
</RelativeLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="180dip"
android:scaleType="fitXY"
android:src="@drawable/banner_sign" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/bg_points_sign"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_20"
android:paddingTop="@dimen/size_20"
android:paddingRight="@dimen/size_20"
android:paddingBottom="@dimen/size_20">
android:paddingLeft="@dimen/size_10"
android:paddingTop="@dimen/size_10"
android:paddingRight="@dimen/size_10"
android:paddingBottom="@dimen/size_10">
<ImageView
android:id="@+id/img_icon"
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_50"
android:layout_width="@dimen/size_40"
android:layout_height="@dimen/size_40"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" />
android:layout_centerVertical="true"
android:src="@drawable/icon_sign" />
<TextView
android:id="@+id/tv_sign_day"
......@@ -35,27 +83,45 @@
<Button
android:id="@+id/btn_sign"
android:layout_width="@dimen/size_80"
android:layout_width="@dimen/size_90"
android:layout_height="@dimen/size_35"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/bg_sing_btn_able"
android:gravity="center"
android:text="打卡"
android:textSize="@dimen/sp_12" />
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/bg_points_sign"
android:orientation="vertical">
<com.rv.points.view.WeekNavigation
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="5dp"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
android:background="@color/white" />
android:layout_height="30dp"
android:background="@drawable/bg_sign_weeks"
android:gravity="center_vertical" />
<com.rv.points.view.InnerGridView
android:id="@+id/view_month"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:numColumns="7"/>
android:layout_marginLeft="@dimen/size_2"
android:layout_marginTop="@dimen/size_5"
android:layout_marginRight="@dimen/size_2"
android:layout_marginBottom="@dimen/size_2"
android:background="#fffbf5"
android:numColumns="7" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rlItem"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvWeek"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="一"
android:layout_centerHorizontal="true"
android:background="#fffbf5"
android:gravity="center"
android:textColor="#666"
android:background="@android:color/white">
</TextView>
android:padding="3dp"
android:text="一"
android:textColor="#666" />
<ImageView
android:layout_marginBottom="@dimen/size_5"
android:id="@+id/ivStatus"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/icon_select"
android:layout_marginRight="10dp"
android:visibility="gone"
android:layout_alignParentRight="true"/>
android:layout_below="@id/tvWeek"
android:layout_centerHorizontal="true"
android:src="@drawable/icon_signed"
android:visibility="invisible" />
</RelativeLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment