Commit a39381ea authored by jianglx's avatar jianglx

上传未提交的文件

parent ad285164
...@@ -200,7 +200,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -200,7 +200,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
@OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying, @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying,
R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information, R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information,
R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler, R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler,
R2.id.tv_view_privileges, R2.id.rl_item_share,R2.id.rl_item_coupon,R2.id.rl_item_integral,R2.id.rl_item_wallet}) R2.id.tv_view_privileges, R2.id.rl_item_share, R2.id.rl_item_coupon, R2.id.rl_item_points, R2.id.rl_item_wallet})
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); int id = view.getId();
if (id == R.id.iv_avatar) { if (id == R.id.iv_avatar) {
...@@ -282,9 +282,10 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -282,9 +282,10 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
} else if (id == R.id.rl_item_share) { } else if (id == R.id.rl_item_share) {
if (isLogin()) return; if (isLogin()) return;
startActivity(new Intent(_mActivity, ShareActivity.class)); startActivity(new Intent(_mActivity, ShareActivity.class));
}else if (id == R.id.rl_item_integral){ } else if (id == R.id.rl_item_points) {
if (isLogin()) return;
}else if (id == R.id.rl_item_wallet){ startActivity(new Intent(_mActivity, PointsActivity.class));
} else if (id == R.id.rl_item_wallet) {
ARouter.getInstance() ARouter.getInstance()
.build(Constance.ACTIVITY_URL_WALLET) .build(Constance.ACTIVITY_URL_WALLET)
.navigation(); .navigation();
......
...@@ -563,29 +563,7 @@ ...@@ -563,29 +563,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_integral" android:id="@+id/rl_item_points"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_visitors" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="分享"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
......
...@@ -35,6 +35,7 @@ import com.rv.points.bean.UserPointInfoBean; ...@@ -35,6 +35,7 @@ import com.rv.points.bean.UserPointInfoBean;
import com.rv.points.presenter.PointPresenter; import com.rv.points.presenter.PointPresenter;
import com.yuyife.okgo.OkGoUtil; import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -80,7 +81,7 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> { ...@@ -80,7 +81,7 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
} }
} }
recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false)); recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
adapter = new PointAdapter(); adapter = new PointAdapter(new ArrayList<PointBean.RvPointItem>());
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override @Override
...@@ -143,12 +144,10 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> { ...@@ -143,12 +144,10 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
public void onShowResult(int requestType, BaseBean result) { public void onShowResult(int requestType, BaseBean result) {
if (requestType == 1) { if (requestType == 1) {
if (result != null && result instanceof PointBean) {
PointBean pointBean = (PointBean) result; PointBean pointBean = (PointBean) result;
if (pointBean.getData() != null && pointBean.getData().getData() != null) { if (pointBean.getData() != null && pointBean.getData().getData() != null) {
adapter.setNewData(pointBean.getData().getData()); adapter.getData().clear();
} adapter.addData(pointBean.getData().getData());
} }
} }
......
...@@ -17,8 +17,8 @@ import java.util.List; ...@@ -17,8 +17,8 @@ import java.util.List;
public class PointAdapter extends BaseQuickAdapter<PointBean.RvPointItem, BaseViewHolder> { public class PointAdapter extends BaseQuickAdapter<PointBean.RvPointItem, BaseViewHolder> {
public PointAdapter() { public PointAdapter(List<PointBean.RvPointItem> lists) {
super(R.layout.item_point); super(R.layout.item_point, lists);
} }
@Override @Override
......
...@@ -50,7 +50,7 @@ public class SharePresenter extends CommonPresenter { ...@@ -50,7 +50,7 @@ public class SharePresenter extends CommonPresenter {
tvBill.setCompoundDrawables(null, drawable2, null, null); tvBill.setCompoundDrawables(null, drawable2, null, null);
tvBill.setVisibility(View.VISIBLE); tvBill.setVisibility(View.VISIBLE);
Drawable drawable3 = context.getResources().getDrawable(R.drawable.icon_share_qq); Drawable drawable3 = context.getResources().getDrawable(R.drawable.icon_share_more);
drawable3.setBounds(0, 0, DisplayUtil.dip2px(context, drawableSize), DisplayUtil.dip2px(context, drawableSize)); drawable3.setBounds(0, 0, DisplayUtil.dip2px(context, drawableSize), DisplayUtil.dip2px(context, drawableSize));
tvMore.setCompoundDrawables(null, drawable3, null, null); tvMore.setCompoundDrawables(null, drawable3, null, null);
tvMore.setVisibility(View.VISIBLE); tvMore.setVisibility(View.VISIBLE);
......
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