Skip to content

android / dayu

Go to a project
Commit 875973da by 罗翻
Options

将mvp替换成mvvm

parent fa3b60dd
Expand all
Inline Side-by-side
Showing with 830 additions and 44 deletions
app/build.gradle
...@@ -25,6 +25,7 @@ android { ...@@ -25,6 +25,7 @@ android {
versionName "1.0.0" versionName "1.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
vectorDrawables.useSupportLibrary = true
} }
compileOptions { compileOptions {
......
app/src/main/java/com/dayu/bigfish/base/CoreAdapter.java
...@@ -154,6 +154,8 @@ public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> { ...@@ -154,6 +154,8 @@ public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> {
isHasMore = true; isHasMore = true;
} }
this.mItemList = data.getData(); this.mItemList = data.getData();
// DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DiffCallBack(mOldDatas, mItemList), true);
// diffResult.dispatchUpdatesTo(this);
notifyDataSetChanged(); notifyDataSetChanged();
} }
......
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourContract.java
...@@ -63,5 +63,10 @@ public interface HomeFourContract { ...@@ -63,5 +63,10 @@ public interface HomeFourContract {
* 跳转到工单记录. * 跳转到工单记录.
*/ */
public abstract void dumpToOrderRecord(); public abstract void dumpToOrderRecord();
/**
* 跳转到个人资料.
*/
public abstract void dumpToPersonalInfo();
} }
} }
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java
...@@ -7,6 +7,7 @@ import com.dayu.bigfish.bean.EngineerInfo; ...@@ -7,6 +7,7 @@ import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord; import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement; import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance; import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.ui.PersonInfoActivity;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
...@@ -66,4 +67,9 @@ public class HomePersonPresenter extends HomeFourContract.Presenter { ...@@ -66,4 +67,9 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
mView.dumpToOrderRecord(); mView.dumpToOrderRecord();
} }
@Override
public void dumpToPersonalInfo() {
startActivity(PersonInfoActivity.class);
}
} }
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
package com.dayu.bigfish.presenter.main; package com.dayu.bigfish.presenter.main;
import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.databinding.ObservableField;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
...@@ -18,7 +18,6 @@ import com.dayu.bigfish.bean.Order; ...@@ -18,7 +18,6 @@ import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo; import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.VersionInfo; import com.dayu.bigfish.bean.VersionInfo;
import com.dayu.bigfish.ui.listener.onDownloadListener; import com.dayu.bigfish.ui.listener.onDownloadListener;
import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.AppUtils; import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
...@@ -37,7 +36,10 @@ import okhttp3.RequestBody; ...@@ -37,7 +36,10 @@ import okhttp3.RequestBody;
*/ */
@InstanceFactory @InstanceFactory
public class MainPresenter extends MainContract.Presenter { public class MainPresenter extends MainContract.Presenter {
/**
* 待接单数目.
*/
public ObservableField<String> tabRecive = new ObservableField("0");
private UserInfo mUser; private UserInfo mUser;
private int mAccountId; private int mAccountId;
private int mSiteId; private int mSiteId;
...@@ -108,7 +110,7 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -108,7 +110,7 @@ public class MainPresenter extends MainContract.Presenter {
ApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(new Consumer<BasePageBean<Order>>() { ApiFactory.getOrders(state, userId, siteId, pagerId, pagerSize).subscribe(baseObserver(new Consumer<BasePageBean<Order>>() {
@Override @Override
public void accept(BasePageBean<Order> orders) throws Exception { public void accept(BasePageBean<Order> orders) throws Exception {
mView.mBind.tabOrderNum.setText(orders.getTotalRows() + ""); tabRecive.set(orders.getTotalRows() + "");
} }
})); }));
} }
...@@ -126,12 +128,10 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -126,12 +128,10 @@ public class MainPresenter extends MainContract.Presenter {
} }
private void showUpdateDialog(VersionInfo info) { private void showUpdateDialog(VersionInfo info) {
mView.showUpdateDialog(info.getUpgradePrompt(), new CustomDialog.OnCloseListener() { mView.showUpdateDialog(info.getUpgradePrompt(), (dialog, confirm) -> {
@Override
public void onClick(Dialog dialog, boolean confirm) {
if (confirm) { if (confirm) {
File sdDir = Environment.getExternalStorageDirectory(); File sdDir = Environment.getExternalStorageDirectory();
File file = new File(sdDir, "dayu" + ".apk"); File file = new File(sdDir + "/dayu/", "dayu" + ".apk");
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
mView.showToast(R.string.on_download); mView.showToast(R.string.on_download);
mView.initNotification(); mView.initNotification();
...@@ -165,7 +165,6 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -165,7 +165,6 @@ public class MainPresenter extends MainContract.Presenter {
} }
} }
dialog.dismiss(); dialog.dismiss();
}
}); });
} }
......
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoContract.java 0 → 100755
package com.dayu.bigfish.presenter.personinfo;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface PersonInfoContract {
interface View extends BaseView {
}
abstract class Presenter extends BasePresenter<View> {
public abstract void dumpToHeader();
public abstract void dumpToModifyPerson();
}
}
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java 0 → 100644
package com.dayu.bigfish.presenter.personinfo;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.ui.ModifyPersonInfoActivity;
import com.dayu.bigfish.ui.MyHeaderIvActivity;
/**
* Created by luofan on 2017/11/14.
*/
@InstanceFactory
public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@Override
public void onAttached() {
}
@Override
public void dumpToHeader() {
startActivity(MyHeaderIvActivity.class);
}
@Override
public void dumpToModifyPerson() {
startActivity(ModifyPersonInfoActivity.class);
}
}
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -47,6 +47,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -47,6 +47,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private HomeOrderFragment secondFragment; private HomeOrderFragment secondFragment;
private HomeMessageTabFragment thirdFragment; private HomeMessageTabFragment thirdFragment;
private HomePersonFragment fourFragment; private HomePersonFragment fourFragment;
private int mFirstPositon = 1;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -89,9 +90,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -89,9 +90,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
transaction.add(R.id.fl_container, fragment); transaction.add(R.id.fl_container, fragment);
transaction.hide(fragment); transaction.hide(fragment);
} }
transaction.show(mFragments[1]); transaction.show(mFragments[mFirstPositon]);
transaction.commit(); transaction.commit();
resetSelected(1); resetSelected(mFirstPositon);
} }
/** /**
...@@ -112,6 +113,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -112,6 +113,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
/** /**
* 重置按钮状态. * 重置按钮状态.
*
* @param position * @param position
*/ */
public void resetSelected(int position) { public void resetSelected(int position) {
...@@ -119,7 +121,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -119,7 +121,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
mTabs[i].setSelected(false); mTabs[i].setSelected(false);
} }
mTabs[position].setSelected(true); mTabs[position].setSelected(true);
mPosition =position; mPosition = position;
} }
...@@ -166,6 +168,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -166,6 +168,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
/** /**
* 处理intent传来的信息. * 处理intent传来的信息.
*
* @param intent * @param intent
*/ */
private void doAction(Intent intent) { private void doAction(Intent intent) {
...@@ -221,7 +224,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -221,7 +224,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void recevieNum(RefreshReceivingNum event) { public void recevieNum(RefreshReceivingNum event) {
mBind.tabOrderNum.setText(event.getTabNum() + ""); mPresenter.tabRecive.set(event.getTabNum()+"");
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
......
app/src/main/java/com/dayu/bigfish/ui/ModifyPersonInfoActivity.java 0 → 100644
package com.dayu.bigfish.ui;
import android.content.Intent;
import android.os.Environment;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivityModifyPersonActivityBinding;
import com.dayu.bigfish.utils.GlideImageLoader;
import com.dayu.bigfish.utils.ToastUtils;
import com.luck.picture.lib.PictureSelectionModel;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* Created by luofan on 2017/12/25.
*/
public class ModifyPersonInfoActivity extends DataBindingActivity<ActivityModifyPersonActivityBinding> {
private List<LocalMedia> mSelectList;
@Override
public int getLayoutId() {
return R.layout.activity_modify_person_activity;
}
@Override
public void initView() {
mSelectList = new ArrayList<>();
mBind.ivAdd.setOnClickListener(v -> showPicDialog());
mBind.titleBack.setOnClickListener(v -> finish());
mBind.ivDelete.setOnClickListener(v -> {
mBind.rlHeader.setVisibility(View.GONE);
mBind.tvPicNum.setText(getString(R.string.commite_pic_zero));
mSelectList.clear();
});
}
public void showPicDialog() {
if (mSelectList.size() == 1) {
ToastUtils.showShortToast(R.string.one_pic_most);
return;
}
PictureSelectionModel selector = PictureSelector.create(mActivity)
.openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
.maxSelectNum(1)// 最大图片选择数量 int
.imageSpanCount(4)// 每行显示个数 int
.selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
.previewImage(true)// 是否可预览图片 true or false
.isCamera(true)// 是否显示拍照按钮 true or false
.isZoomAnim(true)// 图片列表点击 缩放效果 默认true
.sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
.setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
.compress(true)// 是否压缩 true or false
.glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
.hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
.compressSavePath(getPath())//压缩图片保存地址
.previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
// .minimumCompressSize(100)// 小于100kb的图片不压缩
.synOrAsy(true)//同步true或异步false 压缩 默认同步、
.enableCrop(true)//是否裁剪
.withAspectRatio(1, 1)
.freeStyleCropEnabled(true);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
private String getPath() {
String path = Environment.getExternalStorageDirectory() + "/dayu/image/";
File file = new File(path);
if (file.mkdirs()) {
return path;
}
return path;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
mSelectList = PictureSelector.obtainMultipleResult(data);
if (mSelectList != null) {
for (int a = 0; a < mSelectList.size(); a++) {
GlideImageLoader.load(mActivity, mSelectList.get(a).getCompressPath(), mBind.ivHeader);
mBind.rlHeader.setVisibility(View.VISIBLE);
mBind.tvPicNum.setText(getString(R.string.commite_pic_one));
}
}
break;
}
}
}
}
app/src/main/java/com/dayu/bigfish/ui/MyHeaderIvActivity.java 0 → 100644
package com.dayu.bigfish.ui;
import android.content.Intent;
import android.os.Environment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.databinding.MyHeaderActivityBinding;
import com.dayu.bigfish.utils.GlideImageLoader;
import com.luck.picture.lib.PictureSelectionModel;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* Created by luofan on 2017/12/25.
*/
public class MyHeaderIvActivity extends DataBindingActivity<MyHeaderActivityBinding> {
private List<LocalMedia> mSelectList;
@Override
public int getLayoutId() {
return R.layout.my_header_activity;
}
@Override
public void initView() {
mSelectList = new ArrayList<>();
mBind.tvRightTitle.setOnClickListener(v -> showPicDialog());
mBind.titleBack.setOnClickListener(v -> finish());
}
public void showPicDialog() {
PictureSelectionModel selector = PictureSelector.create(mActivity)
.openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
.maxSelectNum(1)// 最大图片选择数量 int
.imageSpanCount(4)// 每行显示个数 int
.selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
.previewImage(true)// 是否可预览图片 true or false
.isCamera(true)// 是否显示拍照按钮 true or false
.isZoomAnim(true)// 图片列表点击 缩放效果 默认true
.sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
.setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
.compress(true)// 是否压缩 true or false
.glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
.hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
.compressSavePath(getPath())//压缩图片保存地址
.previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
// .minimumCompressSize(100)// 小于100kb的图片不压缩
.synOrAsy(true)//同步true或异步false 压缩 默认同步、
.enableCrop(true)//是否裁剪
.withAspectRatio(1, 1)
.freeStyleCropEnabled(true);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
private String getPath() {
String path = Environment.getExternalStorageDirectory() + "/dayu/image/";
File file = new File(path);
if (file.mkdirs()) {
return path;
}
return path;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
mSelectList = PictureSelector.obtainMultipleResult(data);
if (mSelectList != null) {
for (int a = 0; a < mSelectList.size(); a++) {
GlideImageLoader.load(mActivity, mSelectList.get(a).getCompressPath(), mBind.ivHeader);
}
}
break;
}
}
}
}
app/src/main/java/com/dayu/bigfish/ui/PersonInfoActivity.java 0 → 100644
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.databinding.ActivityPersonInfoBinding;
import com.dayu.bigfish.presenter.personinfo.PersonInfoContract;
import com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter;
public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, ActivityPersonInfoBinding> implements PersonInfoContract.View{
@Override
public int getLayoutId() {
return R.layout.activity_person_info;
}
@Override
public void initView() {
}
}
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
...@@ -49,7 +49,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -49,7 +49,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
@Override @Override
public void initView() { public void initView() {
mSelectList = new ArrayList<>(); mSelectList = new ArrayList<>();
mAddIV.setOnClickListener(v -> choosePic()); mAddIV.setOnClickListener(v -> showPicDialog());
} }
public void initAddIv() { public void initAddIv() {
...@@ -59,7 +59,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -59,7 +59,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
mAddIV.setImageResource(R.mipmap.settopic_pictrue); mAddIV.setImageResource(R.mipmap.settopic_pictrue);
} }
public void choosePic() { public void showPicDialog() {
PictureSelectionModel selector = PictureSelector.create(mActivity) PictureSelectionModel selector = PictureSelector.create(mActivity)
.openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo() .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
.maxSelectNum(5 - mImages.size())// 最大图片选择数量 int .maxSelectNum(5 - mImages.size())// 最大图片选择数量 int
......
app/src/main/java/com/dayu/bigfish/ui/views/CircleImageView.java
...@@ -15,7 +15,6 @@ import android.graphics.drawable.ColorDrawable; ...@@ -15,7 +15,6 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.ImageView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
...@@ -23,7 +22,7 @@ import com.dayu.bigfish.R; ...@@ -23,7 +22,7 @@ import com.dayu.bigfish.R;
* Created by yu on 2017/8/24. * Created by yu on 2017/8/24.
*/ */
public class CircleImageView extends ImageView { public class CircleImageView extends android.support.v7.widget.AppCompatImageView {
private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP; private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;
private static final Bitmap.Config BITMAP_CONFIG = Bitmap.Config.ARGB_8888; private static final Bitmap.Config BITMAP_CONFIG = Bitmap.Config.ARGB_8888;
private static final int COLORDRAWABLE_DIMENSION = 2; private static final int COLORDRAWABLE_DIMENSION = 2;
......
app/src/main/java/com/dayu/bigfish/ui/views/StatusBarView.java deleted 100755 → 0
package com.dayu.bigfish.ui.views;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
/**
* Created by Jaeger on 16/6/8.
*
* Email: chjie.jaeger@gmail.com
* GitHub: https://github.com/laobie
*/
public class StatusBarView extends View {
public StatusBarView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public StatusBarView(Context context) {
super(context);
}
}
app/src/main/java/com/dayu/bigfish/utils/BindingUtils.java
...@@ -102,6 +102,7 @@ public class BindingUtils { ...@@ -102,6 +102,7 @@ public class BindingUtils {
* *
* @param view * @param view
*/ */
@Deprecated
@BindingAdapter({"dataSours"}) @BindingAdapter({"dataSours"})
public static void setDatas(LRecyclerView view, Object obj) { public static void setDatas(LRecyclerView view, Object obj) {
if (obj instanceof BasePageBean) { if (obj instanceof BasePageBean) {
......
app/src/main/java/com/dayu/bigfish/utils/DiffCallBack.java 0 → 100644
package com.dayu.bigfish.utils;
import android.support.v7.util.DiffUtil;
import com.dayu.bigfish.bean.Order;
import java.util.List;
/**
* Created by luofan on 2017/12/24.
*/
public class DiffCallBack<M> extends DiffUtil.Callback {
private List<M> mOldDatas;
private List<M> mNewDatas;
public DiffCallBack(List<M> olddatas, List<M> newDatas) {
this.mOldDatas = olddatas;
this.mNewDatas = newDatas;
}
@Override
public int getOldListSize() {
return mOldDatas != null ? mOldDatas.size() : 0;
}
@Override
public int getNewListSize() {
return mNewDatas != null ? mNewDatas.size() : 0;
}
@Override
public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
if (mNewDatas.get(0) instanceof Order) {
return ((Order) mOldDatas.get(oldItemPosition)).getId() == ((Order) mNewDatas.get(oldItemPosition)).getId();
} else {
return false;
}
}
@Override
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
if (mNewDatas.get(0) instanceof Order) {
return ((Order) mOldDatas.get(oldItemPosition)).getId() == ((Order) mNewDatas.get(oldItemPosition)).getId();
} else {
return false;
}
}
}
app/src/main/res/layout/activity_main.xml
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
android:id="@+id/tab_order_num" android:id="@+id/tab_order_num"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0" android:text="@{presenter.tabRecive}"
android:textColor="@color/cl_white" android:textColor="@color/cl_white"
android:textSize="16.7sp" android:textSize="16.7sp"
/> />
......
app/src/main/res/layout/activity_modify_person_activity.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFF5F5F5"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@string/modify_personal_info" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back" />
<TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:text="@string/submission_of_audit"
android:textColor="#FF4BAFFD"
android:textSize="15sp" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_6"
android:layout_alignParentBottom="true"
android:src="@drawable/line_shape" />
</RelativeLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:text="@string/real_name"
android:textSize="15sp" />
<EditText
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:background="@null"
android:hint="请输入真实姓名"
android:textSize="15sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:text="@string/person_identity"
android:textSize="15sp" />
<EditText
android:id="@+id/tv_identity_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:background="@null"
android:hint="请输入证件号"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:text="@string/commite_identity_pic"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_pic_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="@string/commite_pic_zero"
android:textSize="15sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="140dp"
android:background="@color/white"
android:gravity="center_vertical">
<RelativeLayout
android:id="@+id/rl_header"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginLeft="15dp"
android:visibility="gone">
<ImageView
android:id="@+id/iv_header"
android:layout_width="100dp"
android:layout_height="100dp" />
<ImageView
android:id="@+id/iv_delete"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_alignParentRight="true"
android:src="@mipmap/img_photo_delete" />
</RelativeLayout>
<ImageView
android:id="@+id/iv_add"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginLeft="15dp"
android:src="@mipmap/icon_identity_default" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="18sp"
android:text="@string/reminder"
android:textColor="#FF46ADFC"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="138dp"
android:layout_marginTop="10dp"
android:text="@string/reminder_content"
android:textColor="#FF8B9198"
android:textSize="12sp" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_person_info.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="presenter"
type="com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFF5F5F5"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@string/personal_info" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back"
android:onClick="@{()->presenter.dumpBack()}"
/>
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_6"
android:layout_alignParentBottom="true"
android:src="@drawable/line_shape" />
</RelativeLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:text="@string/header_pic"
android:textSize="15sp" />
<com.dayu.bigfish.ui.views.CircleImageView
android:id="@+id/cv_header"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentRight="true"
android:layout_marginLeft="10dp"
android:onClick="@{()->presenter.dumpToHeader()}"
android:src="@mipmap/user"
app:border_color="@color/cl_home_circleimageview_bg"
app:border_width="@dimen/size_home_circleimageview_border" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="@dimen/dp_10"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/person_mobile"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_15"
android:text="13567810832"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:onClick="@{()->presenter.dumpToModifyPerson()}"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/real_name"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="罗"
android:textSize="15sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight="@dimen/dp_15"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:gravity="center_vertical"
android:onClick="@{()->presenter.dumpToModifyPerson()}"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/person_identity"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_identity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="手机号"
android:textSize="15sp" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight="@dimen/dp_15"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:background="@color/white"
android:gravity="center_vertical"
android:onClick="@{()->presenter.dumpToModifyPerson()}"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:text="@string/person_identity_pic"
android:textSize="15sp" />
<ImageView
android:id="@+id/cv_identity"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/icon_identity" />
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight="@dimen/dp_15"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_personal_center.xml
...@@ -52,13 +52,15 @@ ...@@ -52,13 +52,15 @@
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@mipmap/person_title_view" /> android:src="@mipmap/person_title_view" />
<com.dayu.bigfish.ui.views.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto" <com.dayu.bigfish.ui.views.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/iv_header" android:id="@+id/iv_header"
imageUrl="@{imgurl}" imageUrl="@{imgurl}"
android:layout_width="@dimen/size_login_mlcircleimageview_width" android:layout_width="86dp"
android:layout_height="@dimen/size_login_mlcircleimageview_height" android:layout_height="86dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="83.3dp" android:layout_marginTop="83.3dp"
android:onClick="@{()->presenter.dumpToPersonalInfo()}"
android:src="@mipmap/user" android:src="@mipmap/user"
app:border_color="@color/cl_home_circleimageview_bg" app:border_color="@color/cl_home_circleimageview_bg"
app:border_width="@dimen/size_home_circleimageview_border" /> app:border_width="@dimen/size_home_circleimageview_border" />
...@@ -74,6 +76,15 @@ ...@@ -74,6 +76,15 @@
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp" android:textSize="14.7sp"
android:textStyle="bold" /> android:textStyle="bold" />
<ImageView
android:layout_width="41dp"
android:layout_height="14dp"
android:layout_below="@id/iv_header"
android:layout_marginLeft="2dp"
android:layout_marginTop="17dp"
android:layout_toRightOf="@id/tv_name"
android:src="@mipmap/icon_authentication" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
...@@ -157,7 +168,8 @@ ...@@ -157,7 +168,8 @@
android:id="@+id/linearLayout_evaluate" android:id="@+id/linearLayout_evaluate"
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_below="@id/person_line"> android:layout_below="@id/person_line"
android:background="@drawable/personal_center_selector">
<TextView <TextView
android:id="@+id/text_today_yeji" android:id="@+id/text_today_yeji"
......
app/src/main/res/layout/my_header_activity.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@string/title_my_header" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back" />
<TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:text="@string/modify_header_iv"
android:textColor="#FF2D2D2D"
android:textSize="15sp" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_6"
android:layout_alignParentBottom="true"
android:src="@drawable/line_shape" />
</RelativeLayout>
</RelativeLayout>
<ImageView
android:id="@+id/iv_header"
android:layout_width="match_parent"
android:layout_height="375dp"
android:layout_marginTop="50dp" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
...@@ -256,6 +256,23 @@ ...@@ -256,6 +256,23 @@
<string name="customer_server_mobile">客服电话</string> <string name="customer_server_mobile">客服电话</string>
<string name="abount_us">关于我们</string> <string name="abount_us">关于我们</string>
<string name="problem_feedback">问题反馈</string> <string name="problem_feedback">问题反馈</string>
<string name="personal_info">个人资料</string>
<string name="modify_personal_info">修改资料</string>
<string name="submission_of_audit">提交审核</string>
<string name="title_my_header">我的头像</string>
<string name="modify_header_iv">修改头像</string>
<string name="header_pic">头像</string>
<string name="person_mobile">手机号码</string>
<string name="real_name">真实姓名</string>
<string name="person_identity">身份证号</string>
<string name="person_identity_pic">身份证照片</string>
<string name="commite_identity_pic">上传身份证照片</string>
<string name="commite_pic_zero">已上传0/1张</string>
<string name="commite_pic_one">已上传1/1张</string>
<string name="one_pic_most">最多只能选择一张照片</string>
<string name="reminder">温馨提示</string>
<string name="reminder_content">"·请上传真实清晰完整的手持身份证照片·若认证失败，可修改认证信息后再次提交"</string>
<!--error--> <!--error-->
...@@ -348,6 +365,4 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -348,6 +365,4 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
1. 甲方同意本平台通过以下任何方式向其送达各类通知或文件，包括但不限于：网页公告、APP公告、大鱼平台账户通知、向甲方预留的联系方式发送电子邮件、短信、信函等\n 1. 甲方同意本平台通过以下任何方式向其送达各类通知或文件，包括但不限于：网页公告、APP公告、大鱼平台账户通知、向甲方预留的联系方式发送电子邮件、短信、信函等\n
2. 如果本协议的任何条款被视为不合法、无效或无法强制执行的，其不应影响本协议任何其他条款的有效性或可执行性。\n 2. 如果本协议的任何条款被视为不合法、无效或无法强制执行的，其不应影响本协议任何其他条款的有效性或可执行性。\n
</string> </string>
</resources> </resources>
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