Skip to content

android / dayu

Go to a project
Commit 3cf2cdad by 罗翻
Options

footview适配4.4

parent 1c7c3e96
Inline Side-by-side
Showing with 161 additions and 177 deletions
app/src/main/AndroidManifest.xml
......@@ -46,8 +46,8 @@
android:label="@string/tv_dayu"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:label,icon,theme">
tools:replace="android:label,icon,theme"
>
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.dayu.bigfish.fileProvider"
......@@ -163,11 +163,11 @@
android:screenOrientation="portrait"
/>
<activity
android:name=".ui.AccountBalanceActivity11"
android:name=".ui.AccountBalanceActivity"
android:screenOrientation="portrait"
/>
<activity
android:name=".ui.AccountBalanceActivity"
android:name=".ui.AccountBalanceTest"
android:screenOrientation="portrait"
/>
<activity
......
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -23,13 +23,13 @@ public class Constants {
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
/**************************正式环境*******************************/
// public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.dayu.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://192.168.1.132:8080/#/sop";
// public final static String WEB_SOP = "http://192.168.1.132:8080/#/sop";
/*****************/
public static final String LOGIN_URL = "/check";
//登录时发送验证码的URL
......@@ -87,18 +87,10 @@ public class Constants {
public final static int PAGESIZE = 10;
//相册选择照片删除时传递的key
public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
//通用的工程师id
public final static String USER_ID = "/engineerId/";
//通用的站点id
public final static String SITE_ID = "siteId/";
public final static String TAB_NUM_COUNT = "/count";
public final static String ORDER_TEMP = "/detail";
//工程师的账户余额
public final static String ACCOUNT_BALANCE = "account_balance";
public final static String ACCOUNT_ID = "accountId";
public final static String ORDER_ID = "orderId";
public final static String TOKEN = "token";
public final static String ORDER_POSTION = "order_position";
//是否显示去设置alipay账户de对话框
public final static String IS_SHOW_ALIPAY_DILAOG = "is_show_alipay_dialog";
......@@ -106,12 +98,7 @@ public class Constants {
public final static String OLD_PAKAGENUM = "old_pakegnum";
//订单进行状态
public final static String ORDER_STATE = "order_state";
public final static String DUMP_INDEX = "dump_index";
public final static String MESSAGE_INFO = "message_info";
public final static String SECOND_INDEX = "dump_second_index";
//环信message
public final static String HX_MESSAGE = "hx_message";
public static final int FLAG_MULTI_VH = 0x000001;
......
app/src/main/java/com/dayu/bigfish/base/CoreAdapter.java
......@@ -20,7 +20,6 @@ import java.util.List;
*/
@SuppressWarnings("unchecked")
public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> {
private boolean needHint = false;
private TypeSelector<M> mTypeSelector;
private List<M> mItemList = new ArrayList<>();
public boolean isHasMore = true;
......@@ -50,35 +49,18 @@ public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> {
@Override
public void onBindViewHolder(BaseViewHolder holder, int position) {
Object item = getItem(position);
if (needHint && holder.itemView.getTag() == null) {
holder.itemView.setTag(item);
holder.itemView.postDelayed(() -> {
if (mPresenter != null) {
holder.mBind.setVariable(BR.presenter, mPresenter);
}
holder.mBind.setVariable(BR.item, holder.itemView.getTag());
holder.mBind.executePendingBindings();
if (!(item instanceof Boolean)) {
onBind(holder, (M) item);
if (mPresenter != null) {
holder.mBind.setVariable(BR.presenter, mPresenter);
}
holder.mBind.setVariable(BR.item, item);
holder.mBind.executePendingBindings();
if (item != null && !(item instanceof Boolean)) {
onBind(holder, (M) item);
holder.mBind.getRoot().setOnClickListener(v -> {
if (mOnItemClickListener != null) {
mOnItemClickListener.OnItemClick(item, holder.mBind);
}
}, 100);
} else {
if (needHint) {
holder.itemView.setTag(item);
}
if (mPresenter != null) {
holder.mBind.setVariable(BR.presenter, mPresenter);
}
holder.mBind.setVariable(BR.item, item);
holder.mBind.executePendingBindings();
if (item != null && !(item instanceof Boolean)) {
onBind(holder, (M) item);
holder.mBind.getRoot().setOnClickListener(v -> {
if (mOnItemClickListener != null) {
mOnItemClickListener.OnItemClick(item, holder.mBind);
}
});
}
});
}
}
......
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity.java
package com.dayu.bigfish.ui;
import android.content.Intent;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.databinding.ActivityAccountbalanceLayout1Binding;
import com.dayu.bigfish.databinding.ActivityAccountbalanceLayoutBinding;
import com.dayu.bigfish.presenter.accountbalance.AccountBalanceContract;
import com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter;
import com.dayu.bigfish.ui.adapter.AccountBalanceAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
/**
* Created by luofan on 2017/11/1.
*/
public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePresenter, ActivityAccountbalanceLayout1Binding>
implements AccountBalanceContract.View {
public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePresenter, ActivityAccountbalanceLayoutBinding> implements AccountBalanceContract.View
, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private int mUserId;
private AccountBalanceAdapter mAdapter;
private int mPage = 1;
private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override
public int getLayoutId() {
......@@ -32,29 +43,58 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
@Override
public void initView() {
mBind.setPresenter(mPresenter);
initData();
ProgressUtil.startLoad(mActivity);
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
initData();
}
private void initData() {
mBind.rlBalance.setRefreshListener(() -> {
mPage = 1;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
});
mBind.rlBalance.setOnLoadMoreListener(() -> mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId));
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
mBind.tvAccountBalance.setText("￥" + balance);
mAdapter = new AccountBalanceAdapter(R.layout.item_account_balance_layout11, null);
mBind.rlBalance.setLayoutManager(new LinearLayoutManager(this));
mBind.rlBalance.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mBind.rlBalance);
mBind.swipeRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mBind.rlBalance);
mAdapter.setEnableLoadMore(false);
}
@Override
public void getBalanceSuccess(BasePageBean<AccountBalance> balance) {
mPage++;
mBind.rlBalance.setPageData(balance);
mTotalPage = balance.getTotalPages();
mPageSize = balance.getPageSize();
if (mRefreshState == 1) {
mBind.swipeRefersh.setRefreshing(false);
mAdapter.setNewData(balance.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(balance.getData());
}
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
mPage += 1;
}
mPage += 1;
if (balance.getData().size() == 0) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
View view = inflater.inflate(R.layout.tips_empty, null);
TextView tip = (TextView) view.findViewById(R.id.tv_empty);
tip.setText(getString(R.string.no_record));
mAdapter.setEmptyView(view);
}
}
@Override
public void getBalanceError() {
mBind.rlBalance.setDataFail();
mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.loadMoreFail();
ToastUtils.showShortToast(getString(R.string.get_account_list_error));
mBind.lineOne.setVisibility(View.VISIBLE);
}
@Override
......@@ -68,4 +108,18 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
return "￥" + balance;
}
@Override
public void onRefresh() {
mRefreshState = 1;
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
@Override
public void onLoadMoreRequested() {
mRefreshState = 2;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
}
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity11.java → app/src/main/java/com/dayu/bigfish/ui/AccountBalanceTest.java
package com.dayu.bigfish.ui;
import android.content.Intent;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.databinding.ActivityAccountbalanceLayoutBinding;
import com.dayu.bigfish.databinding.ActivityAccountbalanceTestBinding;
import com.dayu.bigfish.presenter.accountbalance.AccountBalanceContract;
import com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter;
import com.dayu.bigfish.ui.adapter.AccountBalanceAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
/**
* Created by luofan on 2017/11/1.
*/
public class AccountBalanceActivity11 extends BaseBingdActivity<AccountBalancePresenter, ActivityAccountbalanceLayoutBinding> implements AccountBalanceContract.View
, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class AccountBalanceTest extends BaseBingdActivity<AccountBalancePresenter, ActivityAccountbalanceTestBinding>
implements AccountBalanceContract.View {
private int mUserId;
private AccountBalanceAdapter mAdapter;
private int mPage = 1;
private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override
public int getLayoutId() {
return R.layout.activity_accountbalance_layout11;
return R.layout.activity_accountbalance_test;
}
@Override
public void initView() {
mBind.setPresenter(mPresenter);
initData();
ProgressUtil.startLoad(mActivity);
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
initData();
}
private void initData() {
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
mBind.tvAccountBalance.setText("￥" + balance);
mAdapter = new AccountBalanceAdapter(R.layout.item_account_balance_layout11, null);
mBind.rlBalance.setLayoutManager(new LinearLayoutManager(this));
mBind.rlBalance.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mBind.rlBalance);
mBind.swipeRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mBind.rlBalance);
mAdapter.setEnableLoadMore(false);
mBind.rlBalance.setRefreshListener(() -> {
mPage = 1;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
});
mBind.rlBalance.setOnLoadMoreListener(() -> mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId));
}
@Override
public void getBalanceSuccess(BasePageBean<AccountBalance> balance) {
mTotalPage = balance.getTotalPages();
mPageSize = balance.getPageSize();
if (mRefreshState == 1) {
mBind.swipeRefersh.setRefreshing(false);
mAdapter.setNewData(balance.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(balance.getData());
}
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
mPage += 1;
}
mPage += 1;
if (balance.getData().size() == 0) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
View view = inflater.inflate(R.layout.tips_empty, null);
TextView tip = (TextView) view.findViewById(R.id.tv_empty);
tip.setText(getString(R.string.no_record));
mAdapter.setEmptyView(view);
}
mPage++;
mBind.rlBalance.setPageData(balance);
}
@Override
public void getBalanceError() {
mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.loadMoreFail();
ToastUtils.showShortToast(getString(R.string.get_account_list_error));
mBind.lineOne.setVisibility(View.VISIBLE);
mBind.rlBalance.setDataFail();
}
@Override
......@@ -109,18 +68,4 @@ public class AccountBalanceActivity11 extends BaseBingdActivity<AccountBalancePr
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
return "￥" + balance;
}
@Override
public void onRefresh() {
mRefreshState = 1;
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
@Override
public void onLoadMoreRequested() {
mRefreshState = 2;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
}
app/src/main/java/com/dayu/bigfish/ui/FeedBackActivity.java
......@@ -7,6 +7,7 @@ import com.dayu.bigfish.presenter.feedback.FeedBackContract;
import com.dayu.bigfish.presenter.feedback.FeedBackPresenter;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
/**
* 设置页面 --反馈提交
......@@ -26,11 +27,15 @@ public class FeedBackActivity extends BaseBingdActivity<FeedBackPresenter, Activ
@Override
public void initView() {
mBind.setPresenter(mPresenter);
userName = GetUserInfo.getUserName(this);
userPhone = GetUserInfo.getUserPhone(this);
mBind.setPresenter(mPresenter);
mBind.submitIdea.setOnClickListener(o -> {
mComment = mBind.etContent.getText().toString();
if (UtilsUserAccountMatcher.containsEmoji(mComment)) {
ToastUtils.showShortToast(getString(R.string.no_emoij));
return;
}
mPresenter.comFirmSuggist(mComment, userName, userPhone);
});
}
......
app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java
......@@ -17,6 +17,7 @@ import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction;
......@@ -161,6 +162,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
mWebView.callHandler("getToken", json, new CallBackFunction() {
@Override
public void onCallBack(String data) {
ToastUtils.showShortToast("获取token成功"+mOrderId);
}
});
}
......
app/src/main/java/com/dayu/bigfish/ui/WithdrawalsActivity.java
......@@ -101,7 +101,7 @@ public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter,
@Override
public void boundSuccess(boolean flag) {
ToastUtils.showShortToast(getString(R.string.modify_alipay_account_success));
ToastUtils.showShortToast(getString(R.string.comfirm_alipay_account_success));
finish();
}
......@@ -113,10 +113,17 @@ public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter,
@Override
public void comfirm() {
ProgressUtil.startLoad(mActivity);
if (mState == 0) {
if (getInfo() == null) {
return;
}
ProgressUtil.startLoad(mActivity);
mPresenter.boundAlipay(getInfo());
} else {
if (getInfo() == null) {
return;
}
ProgressUtil.startLoad(mActivity);
mPresenter.modifyAlipay(getInfo());
}
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/BigFishMessageFragment.java
......@@ -25,7 +25,7 @@ import com.dayu.bigfish.utils.ProgressUtil;
* on 2017/10/11.
*/
public class BigFishMessageFragment extends BaseBingFragment<messagePresenter,FragmentMessageSystemBinding>
public class BigFishMessageFragment extends BaseBingFragment<messagePresenter, FragmentMessageSystemBinding>
implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private SystemMessageAdapter mAdapter;
private String hxUserId;
......@@ -74,7 +74,7 @@ public class BigFishMessageFragment extends BaseBingFragment<messagePresenter,Fr
}
Intent intent = new Intent(mActivity, SystemMesDetailActivity.class);
intent.putExtra(Constants.HX_MESSAGE, message);
intent.putExtra("state", 1);
intent.putExtra("category", 2);
startActivity(intent);
});
}
......@@ -105,6 +105,9 @@ public class BigFishMessageFragment extends BaseBingFragment<messagePresenter,Fr
@Override
public void getHxMessageFail() {
if (mBind.spRefersh.isRefreshing()) {
mBind.spRefersh.setRefreshing(false);
}
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
......@@ -27,7 +27,7 @@ import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.databinding.FragmentPersonalCenterBinding;
import com.dayu.bigfish.presenter.homefourtab.HomeFourContract;
import com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter;
import com.dayu.bigfish.ui.AccountBalanceActivity;
import com.dayu.bigfish.ui.AccountBalanceTest;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.SettingActivity;
import com.dayu.bigfish.ui.WithdrawalsActivity;
......@@ -174,7 +174,7 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
@Override
public void dumpToAccount() {
Intent intent = new Intent(mActivity, AccountBalanceActivity.class);
Intent intent = new Intent(mActivity, AccountBalanceTest.class);
intent.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance);
startActivity(intent);
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/SystemMessageFragment.java
......@@ -52,7 +52,7 @@ public class SystemMessageFragment extends BaseBingFragment<messagePresenter, Fr
}
Intent intent = new Intent(mActivity, SystemMesDetailActivity.class);
intent.putExtra(Constants.HX_MESSAGE, message);
intent.putExtra("state", 0);
intent.putExtra("category", 1);
startActivity(intent);
});
}
......@@ -105,6 +105,9 @@ public class SystemMessageFragment extends BaseBingFragment<messagePresenter, Fr
@Override
public void getHxMessageFail() {
if (mBind.spRefersh.isRefreshing()) {
mBind.spRefersh.setRefreshing(false);
}
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/views/LRecyclerView.java
......@@ -2,7 +2,6 @@ package com.dayu.bigfish.ui.views;
import android.content.Context;
import android.content.res.TypedArray;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
......@@ -40,10 +39,6 @@ public class LRecyclerView<M, B> extends FrameLayout {
*/
private boolean isReverse = false;
/**
* 是否需要延迟.
*/
private boolean needHint = false;
/**
* 是否需要使用默认adapter.
*/
private boolean needCoreAdapter = false;
......@@ -52,13 +47,12 @@ public class LRecyclerView<M, B> extends FrameLayout {
*/
private boolean isNeedFoot = true;
/**
* 是否s是刷新状态.
* 是否是刷新状态.
*/
private boolean isRefresh = true;
/**
* 是否处在空布局状态.
*/
private boolean isEmpty = false;
private int headType, footType;
private SwipeRefreshLayout swipeRefresh;
private RecyclerView recyclerview;
......@@ -70,6 +64,7 @@ public class LRecyclerView<M, B> extends FrameLayout {
private int itemType;
private LinearLayout ll_faileView;
public LRecyclerView(@NonNull Context context) {
super(context);
init(context, null);
......@@ -83,6 +78,7 @@ public class LRecyclerView<M, B> extends FrameLayout {
public LRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init(context, attrs);
}
private void init(Context context, AttributeSet attrs) {
......@@ -94,7 +90,6 @@ public class LRecyclerView<M, B> extends FrameLayout {
isReverse = ta.getBoolean(R.styleable.LRecyclerView_isReverse, false);
isNeedFoot = ta.getBoolean(R.styleable.LRecyclerView_needFoot, true);
needCoreAdapter = ta.getBoolean(R.styleable.LRecyclerView_needCoreAdapter, false);
if (!needHint) needHint = ta.getBoolean(R.styleable.LRecyclerView_needHint, false);
boolean isRefreshable = ta.getBoolean(R.styleable.LRecyclerView_isRefreshable, true);
ta.recycle();
//初始化recycleview
......@@ -268,7 +263,7 @@ public class LRecyclerView<M, B> extends FrameLayout {
*
* @param type
*/
public void setViewType(@LayoutRes int type) {
public void setViewType(int type) {
mCoreAdapter.setViewType(type);
}
......
app/src/main/res/drawable/progressbar.xml
......@@ -16,4 +16,6 @@
android:centerY="0.50"
android:endColor="#c6c6c6" />
</shape>
</animated-rotate>
\ No newline at end of file
</animated-rotate>
app/src/main/res/layout/activity_accountbalance_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
......@@ -10,7 +9,6 @@
<variable
name="presenter"
type="AccountBalancePresenter"/>
</data>
<LinearLayout
......@@ -57,7 +55,6 @@
android:layout_height="100dp"
android:gravity="center"
android:textColor="#ffbe2d"
android:text="@{presenter.totalPrice}"
android:textSize="40sp"
/>
......@@ -70,15 +67,19 @@
android:visibility="gone"
/>
<com.dayu.bigfish.ui.views.LRecyclerView
android:id="@+id/rl_balance"
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refersh"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:needCoreAdapter="true"
app:itemType="@layout/item_account_balance_layout"
>
</com.dayu.bigfish.ui.views.LRecyclerView>
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_balance"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_accountbalance_layout11.xml → app/src/main/res/layout/activity_accountbalance_test.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<data>
......@@ -9,6 +10,7 @@
<variable
name="presenter"
type="AccountBalancePresenter"/>
</data>
<LinearLayout
......@@ -55,6 +57,7 @@
android:layout_height="100dp"
android:gravity="center"
android:textColor="#ffbe2d"
android:text="@{presenter.totalPrice}"
android:textSize="40sp"
/>
......@@ -67,19 +70,15 @@
android:visibility="gone"
/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refersh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_balance"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<com.dayu.bigfish.ui.views.LRecyclerView
android:id="@+id/rl_balance"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:needCoreAdapter="true"
app:itemType="@layout/item_account_balance_layout"
>
</com.dayu.bigfish.ui.views.LRecyclerView>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_datails.xml
......@@ -237,7 +237,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="附 件"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3"/>
......
app/src/main/res/layout/lrecycler_foot.xml
......@@ -23,7 +23,7 @@
style="@android:style/Widget.ProgressBar.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateDrawable="@anim/progress_round"
android:indeterminateDrawable="@drawable/progressbar"
android:visibility="@{item == null?View.GONE:(item?View.VISIBLE:View.GONE)}"/>
<TextView
......
app/src/main/res/values/attrs.xml
......@@ -5,7 +5,6 @@
<attr name="isRefreshable" format="boolean"/>
<attr name="needCoreAdapter" format="boolean"/>
<attr name="needFoot" format="boolean"/>
<attr name="needHint" format="boolean"/>
<attr name="itemType" format="reference"/>
<attr name="headType" format="reference"/>
<attr name="footType" format="reference"/>
......
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 sign in to comment