Skip to content

android / dayu

Go to a project
Commit 908d2b53 by luofan
Options

3.0开发

parent 54464037
Inline Side-by-side
Showing with 835 additions and 192 deletions
app/src/main/AndroidManifest.xml
......@@ -55,34 +55,25 @@
android:resizeableActivity="false"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:label,icon,theme,allowBackup">
<!--<provider-->
<!--android:name="android.support.v4.content.FileProvider"-->
<!--android:authorities="com.dayu.bigfish.fileProvider"-->
<!--android:exported="false"-->
<!--android:grantUriPermissions="true">-->
<!--<meta-data-->
<!--android:name="android.support.FILE_PROVIDER_PATHS"-->
<!--android:resource="@xml/file_paths" />-->
<!--</provider>-->
<!-- <provider -->
<!-- android:name="android.support.v4.content.FileProvider" -->
<!-- android:authorities="${applicationId}.provider" -->
<!-- android:exported="false" -->
<!-- android:grantUriPermissions="true"> -->
<!-- <meta-data -->
<!-- android:name="android.support.FILE_PROVIDER_PATHS" -->
<!-- android:resource="@xml/file_paths"/> -->
<!-- </provider> -->
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.dayu.bigfish.fileProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" />
</provider>
<provider
android:name=".MyProvider"
android:authorities="com.dayu.bigfish.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths"/>
android:resource="@xml/filepaths" />
</provider>
<activity
......
app/src/main/java/com/dayu/bigfish/MyProvider.java 0 → 100644
package com.dayu.bigfish;
import android.support.v4.content.FileProvider;
public class MyProvider extends FileProvider {
}
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -190,7 +190,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
saveTrack();
if (mPosition != 1) {
showHideFragment(1, mPosition);
showInfoDialog();
// showInfoDialog();
}
});
......
app/src/main/res/xml/filepaths.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<paths>
<root-path
name="sdcard"
path="." />
<external-path
name="external_storage_root"
path="." />
<external-path
name="files_root"
path="Android/data/com.dayu.bigfish/" />
<external-path
name="external_storage_root"
path="." />
</paths>
\ No newline at end of file
baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
......@@ -24,7 +24,7 @@ public abstract class DataBindingFragment<B extends ViewDataBinding> extends Fra
protected Activity mActivity;
private boolean isVisible; //是否可见状态
private boolean isPrepared; //标志位，View已经初始化完成。
private boolean isFirstLoad = true;
protected boolean isFirstLoad = true;
protected CompositeDisposable mDisposable = new CompositeDisposable();
......
baseSDK/src/main/java/com/dayu/utils/BitmapUtils.java
......@@ -114,13 +114,13 @@ public class BitmapUtils {
return null;
// 判断是否可以对SDcard进行操作
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { // 获取SDCard指定目录下
String dir = Environment.getExternalStorageDirectory() + "/dayu/imgs";
File dirFile = new File(dir);
if (!dirFile.exists()) {
dirFile.mkdirs();
File sdDir = Environment.getExternalStorageDirectory();
File file;
file = new File(sdDir + "/.dayu/");
if (!file.exists()) {
file.mkdirs();
}
File file = new File(dir, name);
file = new File(file, name);
if (file.exists())
return file;
// file.delete();
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
......@@ -399,8 +399,8 @@ public class CommonUtils {
/**
* 分享图片
*/
public static void shareImg(Activity activity, Bitmap bitmap, SHARE_MEDIA platform, UMShareListener callBack) {
UMImage image = new UMImage(activity, bitmap);//bitmap文件
public static void shareImg(Activity activity, File file, SHARE_MEDIA platform, UMShareListener callBack) {
UMImage image = new UMImage(activity, file);//bitmap文件
image.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩，默认为大小压缩，适合普通很大的图
image.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩，适合长图的分享
image.compressFormat = Bitmap.CompressFormat.PNG;//用户分享透明背景的图片可以设置这种方式，但是qq好友，微信朋友圈，不支持透明背景图片，会变成黑色
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 19
ext.target_sdk_version = 26
ext.version_code = 298
ext.verson_name = "2.9.8"
ext.version_code = 300
ext.verson_name = "3.0.0"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......@@ -15,7 +15,6 @@ buildscript {
// ext.kotlin_version = '1.2.50'
repositories {
jcenter()
google()
mavenCentral()
maven { url 'https://jitpack.io' }
......@@ -33,12 +32,11 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
mavenCentral()
maven { url 'https://jitpack.io' }
// maven { url 'https://maven.google.com' }
// maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://maven.google.com' }
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://dl.bintray.com/umsdk/release' }
}
}
......
liveModule/src/main/res/xml/filepaths.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path path="." name="external_storage_root" />
</paths>
\ No newline at end of file
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
......@@ -2,6 +2,7 @@ package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService;
......@@ -20,6 +21,7 @@ import com.dayu.order.presenter.receivingorder.ReceivingPresenter;
import com.dayu.order.ui.activity.SubcribeTimeActivity;
import com.dayu.order.ui.adapter.OrderAdapter;
import com.dayu.provider.event.RefreshApoiment;
import com.dayu.provider.event.RefreshEvent;
import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.LogUtils;
......@@ -35,6 +37,8 @@ import org.greenrobot.eventbus.ThreadMode;
import io.reactivex.functions.Consumer;
import com.dayu.utils.UserManager;
/**
* 待接单的Fragment
......@@ -79,6 +83,7 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
}));
}
});
showRegisterView();
}
@Override
......@@ -269,5 +274,55 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
.setNegativeButton(UIUtils.getString(R.string.cancle));
customDialog.show();
}
private void showRegisterView() {
int detectSatus = UserManager.getInstance().getUser().getDetectStatus();
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
mBind.recyclerView.setVisibility(View.GONE);
mBind.registerView.setVisibility(View.VISIBLE);
} else if (integer == 4) {
showInReviewDiaglog();
} else {
mBind.recyclerView.setVisibility(View.VISIBLE);
mBind.registerView.setVisibility(View.GONE);
}
}));
} else {
mBind.recyclerView.setVisibility(View.VISIBLE);
mBind.registerView.setVisibility(View.GONE);
}
mBind.registerView.setOnClickListener(v -> {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
});
}
private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n",
(dialog1, confirm) -> {
dialog1.dismiss();
});
dialog.setTitle("温馨提示")
.setOneButton(true)
.setCopyContent(mUserInfo.getWeChatGroup())
.setPositiveButton("好的");
dialog.show();
}
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint() && !isFirstLoad) {
showRegisterView();
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void swtichfragment(RefreshEvent event) {
mBind.recyclerView.setVisibility(View.VISIBLE);
mBind.registerView.setVisibility(View.GONE);
}
}
orderCenter/src/main/res/layout/fragment_commom_recycle.xml
......@@ -8,10 +8,52 @@
type="com.dayu.base.ui.presenter.BaseListPresenter" />
</data>
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5" />
android:orientation="vertical">
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5" />
<LinearLayout
android:id="@+id/registerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:src="@drawable/yu" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="平台不收保证金，实名注册后接单"
android:textColor="@color/common_text_color"
android:textSize="15dp" />
<TextView
android:layout_width="120dp"
android:layout_height="40dp"
android:background="@drawable/btn_blue_react_4"
android:gravity="center"
android:text="马上注册"
android:textColor="@color/white"
android:textSize="16dp" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
provider/src/main/java/com/dayu/provider/event/RefreshEvent.java 0 → 100644
package com.dayu.provider.event;
//取消sop设置
public class RefreshEvent {
}
saleCenter/src/main/java/com/bigfish/salecenter/model/ProductDetailBean.java
......@@ -79,6 +79,8 @@ public class ProductDetailBean implements Serializable {
private String updateTime;
private String updated;
private Object options;
public String materialUrl;
public String trainVideo;
public List<GoodsTask> goodsTasks;
public String getBdFormUrl() {
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/PosterShareActivity.java
......@@ -7,6 +7,7 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Paint;
import android.os.Environment;
import com.badoo.mobile.util.WeakHandler;
import com.bigfish.salecenter.R;
......@@ -101,7 +102,7 @@ public class PosterShareActivity extends BaseActivity<SImplePresenter, ActivityP
File file = BitmapUtils.saveBitmap2Local(bitmap, "poster"+
Constants.ENVIROMENT + mFrom + mUserId+ mId + ".png");
if (bitmap != null) {
CommonUtils.shareImg(PosterShareActivity.this, bitmap, SHARE_MEDIA.WEIXIN_CIRCLE, null);
CommonUtils.shareImg(PosterShareActivity.this, file, SHARE_MEDIA.WEIXIN_CIRCLE, null);
AddShareRecordData data = new AddShareRecordData(mUserId,mUserInfo.getAccountName(),
"朋友圈",mId,2);
addShareRecord(data);
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
package com.bigfish.salecenter.ui.fragment;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
......@@ -108,6 +110,24 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm
}
);
setVideoView();
mBind.infoDownload.setOnClickListener(v -> {
Uri uri = Uri.parse( mDetail.materialUrl);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
mActivity.startActivity(intent);
});
}
private void setVideoView() {
// String url = "http://dl.kf.ai/online/ka/spu/serviceDetailVideo/09ee6818825f705cf106b3c497d40af9.mp4";
String url = mDetail.trainVideo;
if (TextUtils.isEmpty(url)) {
mBind.llVideo.setVisibility(View.GONE);
} else {
mBind.llVideo.setVisibility(View.VISIBLE);
mBind.jzVideo.setUp(url, "");
CommonUtils.setVideoThumb(mActivity, mBind.jzVideo, url);
}
}
//点击分享按钮
......
saleCenter/src/main/res/layout/fragment_sale_instruction.xml
......@@ -13,6 +13,7 @@
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="60dp"
android:layout_above="@+id/btn_comment">
<android.support.v4.widget.NestedScrollView
......@@ -90,16 +91,50 @@
android:overScrollMode="never" />
</LinearLayout>
<LinearLayout style="@style/sale_linearlayout_detail">
<TextView
style="@style/sale_detail_text"
android:text="产品资料:" />
<TextView
android:id="@+id/infoDownload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看下载"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="18dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_video"
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_marginTop="6dp">
<TextView
style="@style/sale_detail_text"
android:text="培训视频:" />
<cn.jzvd.JzvdStd
android:id="@+id/jz_video"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<TextView
style="@style/sale_detail_text"
android:paddingTop="10dp"
android:visibility="gone"
android:text="地推具体任务：" />
<android.support.v7.widget.RecyclerView
android:id="@+id/tasks"
android:layout_marginTop="5dp"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="5dp" />
<LinearLayout
android:layout_width="match_parent"
......
saleCenter/src/main/res/layout/item_sale_product.xml
......@@ -97,7 +97,7 @@
<LinearLayout
android:id="@+id/btn_share"
android:layout_width="120dp"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:background="@drawable/btn_green_commom"
android:gravity="center">
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
......@@ -4,6 +4,7 @@ import com.dayu.base.api.protocol.AddressInfoBean;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants;
import com.dayu.usercenter.event.AddressData;
import com.dayu.usercenter.model.AddUserCardData;
import com.dayu.usercenter.model.ApplyLicenceData;
import com.dayu.usercenter.model.ApplyWithdrawData;
......@@ -383,5 +384,16 @@ public interface UserService2 {
@POST(Constants.API_7100 + "/engineerRelationCategory/registerInfo/batch/accountId/{accountId}")
Observable<BaseResponse<Boolean>> commitData(@Body ServiceSaveBean saveBean, @Path("accountId") int accountId);
/**
* 获取服务地址.
*/
@GET(Constants.API_7100 + "/engineerAddress/default/accountId/{accountId}")
Observable<BaseResponse<AddressData>> getAddressData(@Path("accountId") int accountId);
/**
* 保存服务地址.
*/
@POST(Constants.API_7100 + "/engineerAddress/saveDefault")
Observable<BaseResponse<Boolean>> saveAddress(@Body AddressData saveBean);
}
userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
......@@ -38,7 +38,24 @@ public class EngineerInfo extends BaseObservable implements Serializable {
private int lianmaiStatus;
private String nickName;
private int detectStatus;
private String incomeUrl;
private String kfUrl;
public String getIncomeUrl() {
return incomeUrl;
}
public void setIncomeUrl(String incomeUrl) {
this.incomeUrl = incomeUrl;
}
public String getKfUrl() {
return kfUrl;
}
public void setKfUrl(String kfUrl) {
this.kfUrl = kfUrl;
}
public int getDetectStatus() {
return detectStatus;
......
userCenter/src/main/java/com/dayu/usercenter/event/AddressData.java 0 → 100644
package com.dayu.usercenter.event;
public class AddressData {
private int accountId;
private String address;
private int cityId;
private String cityName;
private String createBy;
private String createTime;
private int defaultSelected;
private int districtId;
private String districtName;
private int id;
private String mobile;
private String modifyBy;
private String modifyTime;
private String name;
private int provinceId;
private String provinceName;
public AddressData(int accountId, int provinceId, String provinceName, int cityId, String cityName, int districtId, String districtName) {
this.accountId = accountId;
this.cityId = cityId;
this.cityName = cityName;
this.districtId = districtId;
this.districtName = districtName;
this.provinceId = provinceId;
this.provinceName = provinceName;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public int getCityId() {
return cityId;
}
public void setCityId(int cityId) {
this.cityId = cityId;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public int getDefaultSelected() {
return defaultSelected;
}
public void setDefaultSelected(int defaultSelected) {
this.defaultSelected = defaultSelected;
}
public int getDistrictId() {
return districtId;
}
public void setDistrictId(int districtId) {
this.districtId = districtId;
}
public String getDistrictName() {
return districtName;
}
public void setDistrictName(String districtName) {
this.districtName = districtName;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
public String getModifyTime() {
return modifyTime;
}
public void setModifyTime(String modifyTime) {
this.modifyTime = modifyTime;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getProvinceId() {
return provinceId;
}
public void setProvinceId(int provinceId) {
this.provinceId = provinceId;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/UserIncomeBean.java
......@@ -17,6 +17,33 @@ public class UserIncomeBean {
private double platformRewardPrice;
private double unWithdrawPrice;
private String withdrawUrl;
private String incomeUrl;
private String kfUrl;
private String totalPrice;
public String getTotalPrice() {
return totalPrice;
}
public void setTotalPrice(String totalPrice) {
this.totalPrice = totalPrice;
}
public String getKfUrl() {
return kfUrl;
}
public void setKfUrl(String kfUrl) {
this.kfUrl = kfUrl;
}
public String getIncomeUrl() {
return incomeUrl;
}
public void setIncomeUrl(String incomeUrl) {
this.incomeUrl = incomeUrl;
}
public String getWithdrawUrl() {
return withdrawUrl;
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/RegisterActivity.java
......@@ -23,6 +23,7 @@ import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils;
import com.dayu.provider.event.CertificationEvent;
import com.dayu.provider.event.RefreshEvent;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
......@@ -268,11 +269,11 @@ public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegi
return;
}
if (TextUtils.isEmpty(mBind.addressDetail.getText())) {
ToastUtils.showShortToast("请先填写详细地址");
return;
}
// if (TextUtils.isEmpty(mBind.addressDetail.getText())) {
// ToastUtils.showShortToast("请先填写详细地址");
// return;
//
// }
if (TextUtils.isEmpty(accountUrl) && TextUtils.isEmpty(accountPath)) {
ToastUtils.showShortToast("请先上传头像");
return;
......@@ -325,6 +326,7 @@ public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegi
ToastUtils.showShortToast(bool ? R.string.save_success : R.string.save_fail);
CommonUtils.hideSoftInput(mActivity);
EventBus.getDefault().post(new CertificationEvent(1));
EventBus.getDefault().post(new RefreshEvent());
finish();
}));
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ShareUserCardActivity.java
......@@ -76,9 +76,9 @@ public class ShareUserCardActivity extends BaseActivity<SImplePresenter, Activit
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> {
Bitmap bitmap = BitmapUtils.getBitmap(mBind.llPoster);
// File file = BitmapUtils.saveBitmap2Local(bitmap, "card"+System.currentTimeMillis()+mUserId+ ".png");
File file = BitmapUtils.saveBitmap2Local(bitmap, "card"+System.currentTimeMillis()+mUserId+ ".png");
if (bitmap != null) {
CommonUtils.shareImg(ShareUserCardActivity.this, bitmap, SHARE_MEDIA.WEIXIN_CIRCLE, null);
CommonUtils.shareImg(ShareUserCardActivity.this, file, SHARE_MEDIA.WEIXIN_CIRCLE, null);
addShareCardRecord();
}else {
showToast("保存失败");
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
package com.dayu.usercenter.ui.fragment;
import android.Manifest;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
......@@ -8,6 +9,7 @@ import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
import android.widget.Toast;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService;
......@@ -18,6 +20,7 @@ import com.dayu.common.Constants;
import com.dayu.event.Notice;
import com.dayu.event.UserInfo;
import com.dayu.provider.event.CertificationEvent;
import com.dayu.provider.event.RefreshEvent;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.adapter.ServiceWechatAdapter;
......@@ -26,6 +29,7 @@ import com.dayu.usercenter.data.protocol.EngineerInfo;
import com.dayu.usercenter.data.protocol.OrderRecord;
import com.dayu.usercenter.data.protocol.TodayAchievement;
import com.dayu.usercenter.databinding.FragmentHomeUserBinding;
import com.dayu.usercenter.event.AddressData;
import com.dayu.usercenter.event.ChangeNickEvent;
import com.dayu.usercenter.event.EditAddressEvent;
import com.dayu.usercenter.event.EditBankEvent;
......@@ -52,14 +56,21 @@ import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.WechatShareDialog;
import com.tbruyelle.rxpermissions2.RxPermissions;
import com.umeng.socialize.bean.SHARE_MEDIA;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.disposables.Disposable;
import com.dayu.base.api.protocol.TreeAddressBean;
import com.dayu.widgets.WheelDialog;
/**
* Created by luofan
* on 2017/11/20.
......@@ -76,6 +87,15 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
private double canWithdrawMoney;
private String userIdentity; //身份证号
private UserIncomeBean incomeData;
private List<TreeAddressBean> provinceList = new ArrayList<>();
private List<TreeAddressBean> cityList = new ArrayList<>();
private List<TreeAddressBean> areaList = new ArrayList<>();
private int provinceId;
private int cityId;
private int areaId;
private String provinceName;
private String cityName;
private String areaName;
public static HomeUserFragment newInstance() {
Bundle args = new Bundle();
......@@ -112,12 +132,8 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
});
getNotice();
mBind.transmitServer.setOnClickListener(v -> sendUserCard());
mBind.weChat.setText(mUserInfo.getWeChatGroup());
mBind.weChat.setOnClickListener(v -> {
ToastUtils.showShortToast("复制成功，请发送到微信聊天中打开");
ClipboardManager manager = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
manager.setPrimaryClip(ClipData.newPlainText(null, mBind.weChat.getText()));
});
initAddrListener();
getAddress();
}
......@@ -292,13 +308,25 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
@Override
public void setIncomData(UserIncomeBean data) {
incomeData = data;
mBind.tvCashArrive.setText("¥" + data.getWithdrawPrice());
mBind.tvCashArrive.setText("¥" + data.getTotalPrice());
mBind.tvSaleReward.setText("¥" + data.getSalesRewardPrice());
mBind.tvServiceIncome.setText("¥" + data.getServicePrice());
mBind.tvInvateReward.setText("¥" + data.getInviteRewardPrice());
mBind.tvPlatformReward.setText("¥" + data.getPlatformRewardPrice());
mBind.tvCanFetch.setText("¥" + data.getUnWithdrawPrice());
canWithdrawMoney = data.getUnWithdrawPrice();
mBind.inComeLl.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putString("title", "我的收入");
bundle.putString(Constants.URL, data.getIncomeUrl() + "&token=" + mUserInfo.getToken());
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
});
mBind.weChat.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putString("title", "接单交流群");
bundle.putString(Constants.URL, data.getKfUrl() + "&token=" + mUserInfo.getToken());
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
});
}
@Override
......@@ -453,6 +481,11 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
setUserNick(mUserInfo.getNickName());
}
@Subscribe
public void afterChangeNick(RefreshEvent event) {
getAddress();
}
private void setUserNick(String nickName) {
if (!TextUtils.isEmpty(nickName))
mBind.tvNick.setText("(" + nickName + ")");
......@@ -514,4 +547,159 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
.setPositiveButton("好的");
dialog.show();
}
private void initAddrListener() {
mBind.province.setOnClickListener(view -> {
if (provinceList.size() > 0) {
showAddrDialog(1, provinceList);
} else {
getTreeAddrData(-1, 1, true);
}
});
mBind.city.setOnClickListener(view -> {
if (cityList.size() > 0) {
showAddrDialog(2, cityList);
} else {
getTreeAddrData(provinceId, 2, true);
}
});
mBind.area.setOnClickListener(view -> {
if (areaList.size() > 0) {
showAddrDialog(3, areaList);
} else {
getTreeAddrData(cityId, 3, true);
}
});
}
/**
* 地址选择弹框
*
* @param type
* @param addressList
*/
private void showAddrDialog(int type, List<TreeAddressBean> addressList) {
List<String> addrs = new ArrayList<>();
for (int i = 0; i < addressList.size(); i++) {
addrs.add(addressList.get(i).getText());
}
WheelDialog.getInstance().show(mActivity, addrs, pos -> {
onAddrChoosed(type, pos);
});
}
//选择弹框内的地址后
private void onAddrChoosed(int type, int index) {
switch (type) {
case 1:
if (provinceList.get(index).getText().equals(provinceName))
return;
provinceId = Integer.parseInt(provinceList.get(index).getId());
provinceName = provinceList.get(index).getText();
getTreeAddrData(provinceId, 2, false);
cityList.clear();
areaList.clear();
// mBind.city.setVisibility(View.VISIBLE);
// mBind.area.setVisibility(View.GONE);
updateAddressView();
break;
case 2:
if (cityList.get(index).getText().equals(cityName))
return;
cityId = Integer.parseInt(cityList.get(index).getId());
cityName = cityList.get(index).getText();
getTreeAddrData(cityId, 3, false);
areaList.clear();
// mBind.area.setVisibility(View.VISIBLE);
updateAddressView();
break;
case 3:
if (areaList.get(index).getText().equals(areaName))
return;
areaId = Integer.parseInt(areaList.get(index).getId());
areaName = areaList.get(index).getText();
mBind.area.setText(areaName);
saveAddress();
// updateAddressView();
break;
}
}
//更新选择地址布局显示
private void updateAddressView() {
cityId = cityList.size() > 0 ? cityId : 0;
cityName = cityList.size() > 0 ? cityName : "";
areaId = areaList.size() > 0 ? areaId : 0;
areaName = areaList.size() > 0 ? areaName : "";
mBind.province.setText(provinceName);
mBind.city.setText(cityName);
mBind.area.setText(areaName);
}
/**
* 获取地址信息
*
* @param pId
* @param type 1.省 2.市 3.区
* @param showDialog 是否显示选择框
*/
private void getTreeAddrData(int pId, int type, boolean showDialog) {
if (Constants.treeAddressMap.containsKey(pId) && Constants.treeAddressMap.get(pId).size() > 0) {
dealAddrData(type, showDialog, Constants.treeAddressMap.get(pId));
} else {
if (showDialog)
showDialog();
Api.getService(APIService.class).getTreeAddress(pId).compose(Api.applySchedulers())
.safeSubscribe(mPresenter.baseObserver(datas -> {
dealAddrData(type, showDialog, datas);
Constants.treeAddressMap.put(pId, datas);
}));
}
}
//处理获取到地址信息数据
private void dealAddrData(int type, boolean showDialog, List<TreeAddressBean> datas) {
switch (type) {
case 1:
provinceList = datas;
break;
case 2:
cityList = datas;
mBind.city.setVisibility(View.VISIBLE);
break;
case 3:
areaList = datas;
mBind.area.setVisibility(View.VISIBLE);
break;
}
if (showDialog)
showAddrDialog(type, datas);
}
private void getAddress() {
Api.getService(UserService2.class).getAddressData(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
mBind.province.setText(provinceName = data.getProvinceName());
mBind.city.setText(cityName = data.getCityName());
mBind.area.setText(areaName = data.getDistrictName());
getTreeAddrData(data.getProvinceId(), 2, false);
getTreeAddrData(data.getCityId(), 3, false);
provinceId = data.getProvinceId();
cityId = data.getCityId();
areaId = data.getDistrictId();
}));
}
private void saveAddress() {
AddressData saveBean = new AddressData(
mUserId,
provinceId, provinceName,
cityId, cityName,
areaId, areaName
);
Api.getService(UserService2.class).saveAddress(saveBean).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(bool -> {
Toast.makeText(mActivity, "地址保存成功", Toast.LENGTH_SHORT).show();
}));
}
}
userCenter/src/main/res/layout/activity_register_verify.xml
......@@ -31,15 +31,11 @@
</RelativeLayout>
<ImageView style="@style/card_line" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="65dp"
android:paddingLeft="15dp"
android:paddingRight="15dp">
android:layout_marginBottom="65dp">
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
......@@ -52,96 +48,24 @@
android:orientation="vertical"
android:paddingTop="10dp">
<LinearLayout
<TextView
style="@style/sale_item_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingEnd="10dp"
android:text="真实姓名:"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<EditText
android:id="@+id/etName"
android:layout_width="100dp"
android:layout_height="30dp"
android:background="@drawable/bg_input_black_react"
android:drawablePadding="5dp"
android:paddingStart="15dp"
android:textColor="@color/default_text_color"
android:textSize="15dp"
tools:text="张三丰" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:gravity="right"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingEnd="10dp"
android:text="接单费用:"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Spinner
android:id="@+id/dayPrice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:inputType="number"
tools:text="100" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/icon_arrow_down_gray32" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
android:layout_height="30dp"
android:background="@color/top_tab_selected_bg"
android:gravity="center"
android:text="请设置您的可接单服务区域"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical">
<TextView
style="@style/sale_item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所在地区："
android:textColor="@color/default_text_color"
android:textSize="15dp" />
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:paddingStart="15dp"
android:paddingEnd="15dp">
<TextView
android:id="@+id/province"
......@@ -155,7 +79,8 @@
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:text="请选择省"
android:hint="请选择省"
android:textColorHint="@color/default_text_color"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
......@@ -170,7 +95,8 @@
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:text="@string/setlect_ciy_hint"
android:hint="@string/setlect_ciy_hint"
android:textColorHint="@color/default_text_color"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
......@@ -185,7 +111,8 @@
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:text="请选择区"
android:hint="请选择区"
android:textColorHint="@color/default_text_color"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
......@@ -194,6 +121,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:paddingTop="10dp">
<RelativeLayout
......@@ -233,21 +161,23 @@
android:textSize="15dp" />
</LinearLayout>
<TextView
style="@style/sale_item_text"
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@color/top_tab_selected_bg"
android:gravity="center"
android:text="请设置您的可服务的设备类型"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="10dp">
<TextView
style="@style/sale_item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingEnd="10dp"
android:text="服务技能:"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
android:paddingStart="15dp"
android:paddingTop="10dp"
android:paddingEnd="15dp">
<View
android:layout_width="1dp"
......@@ -265,6 +195,87 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:gravity="right"
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/top_tab_selected_bg"
android:gravity="center"
android:paddingEnd="10dp"
android:text="您期望的接单费用:"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<Spinner
android:id="@+id/dayPrice"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:inputType="number"
tools:text="100" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/icon_arrow_down_gray32" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingTop="10dp"
android:paddingEnd="10dp">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/top_tab_selected_bg"
android:gravity="center"
android:paddingEnd="10dp"
android:text="填写您的真实姓名:"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<EditText
android:id="@+id/etName"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawablePadding="5dp"
android:paddingStart="15dp"
android:textColor="@color/default_text_color"
android:textSize="15dp"
tools:text="张三丰" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
......
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -361,36 +361,104 @@
android:textSize="@dimen/sp_16"
android:visibility="gone" />
<TextView
style="@style/sale_item_text"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/personal_center_selector"
android:gravity="center"
android:text="我可以接单的服务区域"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:paddingStart="15dp"
android:paddingEnd="15dp">
<TextView
android:id="@+id/province"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:paddingTop="1dp"
android:text="请选择省"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<TextView
android:id="@+id/city"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:text="@string/setlect_ciy_hint"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
<TextView
android:id="@+id/area"
android:layout_width="0dp"
android:layout_height="30dp"
android:layout_gravity="right"
android:layout_weight="1"
android:background="@drawable/bg_input_black_react"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:paddingStart="2dp"
android:text="请选择区"
android:textColor="@color/default_text_color"
android:textSize="15dp" />
</LinearLayout>
<LinearLayout
style="@style/ll_user_bottom"
android:layout_marginTop="10dp">
<LinearLayout
style="@style/ll_user_bottom2"
android:onClick="@{()->presenter.dumpToCacheRecord()}">
android:id="@+id/tv_fetch"
style="@style/ll_user_bottom2">
<TextView
style="@style/tv_user_bottom1"
android:text="已到账收入" />
android:text="账户余额" />
<TextView
android:id="@+id/tv_cash_arrive"
android:id="@+id/tv_can_fetch"
style="@style/tv_user_bottom2"
android:text="0"
android:textColor="@color/cl_order_item_date" />
</LinearLayout>
<LinearLayout
android:id="@+id/tv_fetch"
android:id="@+id/inComeLl"
style="@style/ll_user_bottom2"
android:layout_marginLeft="10dp">
<TextView
style="@style/tv_user_bottom1"
android:text="账户余额" />
android:text="我的收入" />
<TextView
android:id="@+id/tv_can_fetch"
android:id="@+id/tv_cash_arrive"
style="@style/tv_user_bottom2"
android:text="0"
android:textColor="@color/cl_order_item_date" />
......@@ -400,6 +468,7 @@
<LinearLayout
style="@style/ll_user_bottom"
android:visibility="gone"
android:layout_marginTop="10dp">
<LinearLayout
......@@ -558,26 +627,17 @@
android:focusableInTouchMode="false"
android:visibility="gone" />
<LinearLayout
<TextView
android:id="@+id/weChat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="15dp"
android:visibility="gone"
android:paddingBottom="10dp">
<TextView
style="@style/tv_user_bottom1"
android:text="接单微信群:" />
<TextView
android:id="@+id/weChat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="11dp"
android:textColor="@color/blue"
android:textSize="14sp" />
</LinearLayout>
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/personal_center_selector"
android:gravity="center"
android:text="联系平台客服，加入接单交流群"
android:textColor="@color/default_text_color" />
<TextView
android:id="@+id/transmitServer"
......
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