Skip to content

android / dayu

Go to a project
Commit 81caa6a4 by mReturn
Options

V2.5.5

parent b07e2cf6 master … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_250414_sop dev_xx_web v2.7.2 v2.7.1 v2.7.0 v2.6.9 v2.6.7 v2.6.6 v2.6.5 v2.6.4 v2.6.3 v2.6.2 v2.6.1 v2.6.0 v2.5.9 v2.5.7 dev20230405
Inline Side-by-side
Showing with 462 additions and 72 deletions
.idea/gradle.xml
......@@ -11,6 +11,8 @@
<option value="$PROJECT_DIR$/IDCardLib" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/baseSDK" />
<option value="$PROJECT_DIR$/camera" />
<option value="$PROJECT_DIR$/learnCenter" />
<option value="$PROJECT_DIR$/locationComponent" />
<option value="$PROJECT_DIR$/managercenter" />
<option value="$PROJECT_DIR$/messageCenter" />
......@@ -18,6 +20,7 @@
<option value="$PROJECT_DIR$/pickerview" />
<option value="$PROJECT_DIR$/provider" />
<option value="$PROJECT_DIR$/saleCenter" />
<option value="$PROJECT_DIR$/umeng" />
<option value="$PROJECT_DIR$/userCenter" />
<option value="$PROJECT_DIR$/wheelview" />
</set>
......
.idea/modules.xml
......@@ -5,7 +5,9 @@
<module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/camera/camera.iml" filepath="$PROJECT_DIR$/camera/camera.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" />
<module fileurl="file://$PROJECT_DIR$/learnCenter/learnCenter.iml" filepath="$PROJECT_DIR$/learnCenter/learnCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" />
<module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" />
<module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" />
......@@ -13,6 +15,7 @@
<module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
<module fileurl="file://$PROJECT_DIR$/provider/provider.iml" filepath="$PROJECT_DIR$/provider/provider.iml" />
<module fileurl="file://$PROJECT_DIR$/saleCenter/saleCenter.iml" filepath="$PROJECT_DIR$/saleCenter/saleCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/umeng/umeng.iml" filepath="$PROJECT_DIR$/umeng/umeng.iml" />
<module fileurl="file://$PROJECT_DIR$/userCenter/userCenter.iml" filepath="$PROJECT_DIR$/userCenter/userCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/wheelview/wheelview.iml" filepath="$PROJECT_DIR$/wheelview/wheelview.iml" />
</modules>
......
app/src/main/java/com/dayu/bigfish/MyApplication.java
......@@ -90,7 +90,6 @@ public class MyApplication extends BaseApplication {
initUM();
//初始化环信
HxManager.getInstance().init(mContext);
initTextSize();
}
......@@ -183,11 +182,15 @@ public class MyApplication extends BaseApplication {
/**
* 使其系统更改字体大小无效
*/
private void initTextSize() {
Resources res = getResources();
Configuration config = new Configuration();
config.setToDefaults();
res.updateConfiguration(config, res.getDisplayMetrics());
@Override
public Resources getResources() {
Resources res = super.getResources();
Configuration configuration = res.getConfiguration();
if (configuration.fontScale != 1.0f) {
configuration.fontScale = 1.0f;
res.updateConfiguration(configuration, res.getDisplayMetrics());
}
return res;
}
@Override
......
baseSDK/src/main/java/com/dayu/base/ui/activity/DataBindingActivity.java
package com.dayu.base.ui.activity;
import android.app.Activity;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Bundle;
......@@ -54,6 +56,16 @@ public abstract class DataBindingActivity<B extends ViewDataBinding> extends App
MobclickAgent.onPause(mActivity);
}
@Override
public Resources getResources() {
Resources res = super.getResources();
Configuration configuration = res.getConfiguration();
if (configuration.fontScale != 1.0f) {
configuration.fontScale = 1.0f;
res.updateConfiguration(configuration, res.getDisplayMetrics());
}
return res;
}
public abstract int getLayoutId();
......
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -54,34 +54,34 @@ public class Constants {
/**
* uat测试环境配置.
*/
public static String ENVIROMENT = "uat";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.95.223.6:3112";
public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
public static final boolean IS_DEBUG = true;
public static final boolean CAN_CHANGE_ENV = false; //是否显示切换开发环境菜单
// public static String ENVIROMENT = "uat";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.95.223.6:3112";
// public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// public static final boolean IS_DEBUG = true;
// public static final boolean CAN_CHANGE_ENV = false; //是否显示切换开发环境菜单
/**
* 正式环境.
*/
// public static String ENVIROMENT = "release";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static final boolean IS_DEBUG = false;
// public static final boolean CAN_CHANGE_ENV = false; //是否显示切换开发环境菜单
public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai";
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static final boolean IS_DEBUG = false;
public static final boolean CAN_CHANGE_ENV = false; //是否显示切换开发环境菜单
/**
* 统一配置.
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
......@@ -284,6 +284,11 @@ public class CommonUtils {
String description, UMShareListener callBack) {
UMWeb web = new UMWeb(url);
web.setTitle(title);
if (TextUtils.isEmpty(imgUrl)) {
web.setThumb(new UMImage(activity, R.drawable.icon_app_logo));
} else {
web.setThumb(new UMImage(activity, imgUrl));
}
web.setThumb(new UMImage(activity, imgUrl));
web.setDescription(description);
new ShareAction(activity).withMedia(web)
......
baseSDK/src/main/res/values/strings.xml
......@@ -914,7 +914,8 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="invate_person_count">邀请人数</string>
<string name="reward_total_money">奖励总额</string>
<string name="be_rewarded_count">获奖次数</string>
<string name="invate_new_reward">邀请新人有奖</string>
<string name="invate_new_reward">邀请师傅有奖</string>
<string name="invite_record">邀请记录</string>
<string name="user_platform_reward">平台奖励</string>
<string name="user_service_income">服务收入</string>
<string name="user_service_record">服务业绩</string>
......@@ -936,6 +937,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="user_bank_holer_hint">请输入开户人姓名</string>
<string name="user_addr_info">快递地址信息</string>
<string name="user_receiver_addr">收件地址:</string>
<string name="user_receiver_addr2">接单/收货地址:</string>
<string name="user_receiver_name">收件人姓名:</string>
<string name="user_receiver_phone">收件人手机号:</string>
<string name="edit_str">编辑</string>
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16
ext.target_sdk_version = 26
ext.version_code = 254
ext.verson_name = "2.5.4"
ext.version_code = 255
ext.verson_name = "2.5.5"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
learnCenter/src/main/java/com/dayu/learncenter/adapter/LearnAdapter.java
......@@ -11,6 +11,7 @@ import com.dayu.utils.CommonUtils;
import com.dayu.utils.LogUtils;
import com.dayu.widgets.JZMediaIjk;
import com.dayu.widgets.MyJzvdStd;
import com.umeng.analytics.MobclickAgent;
import cn.jzvd.JzvdStd;
......@@ -47,6 +48,7 @@ public class LearnAdapter extends CoreAdapter<CommonLearnBean, ItemCommonLearnBi
holder.jzVideo.setPlayCallBack(new MyJzvdStd.PlayCallBack() {
@Override
public void onstart() {
MobclickAgent.onEvent(mContext,"look_learningVideo");
if (item.getPlayStatus() == 2 && item.getProgressTimes() > 0) {
holder.jzVideo.seekToInAdvance = item.getProgressTimes();
}
......
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java
......@@ -24,6 +24,7 @@ import com.dayu.utils.ProgressUtil;
import com.dayu.widgets.JZMediaIjk;
import com.dayu.widgets.KeyboardStateObserver;
import com.dayu.widgets.MyJzvdStd;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
import java.util.List;
......@@ -84,6 +85,8 @@ public class CourseDetailActivity extends BaseActivity<SImplePresenter, Activity
private void pointVideo() {
showDialog();
int type = isPointed ? 2 : 1;
if (type == 1)
MobclickAgent.onEvent(mActivity, "like_learningClass");
Api.getService(LearnService.class).pointCourse(courseId, mUserId, type).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(success -> {
if (success) {
......@@ -219,6 +222,7 @@ public class CourseDetailActivity extends BaseActivity<SImplePresenter, Activity
//发送
mBind.btnSend.setOnClickListener(v -> {
MobclickAgent.onEvent(mActivity, "leaveMessage_learningClass");
String content = mBind.edtComment.getText().toString();
if (TextUtils.isEmpty(content)) return;
ProgressUtil.startLoad(mActivity);
......
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
......@@ -28,6 +28,7 @@ import com.dayu.widgets.TextDialog;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
import com.umeng.analytics.MobclickAgent;
import java.io.File;
import java.util.ArrayList;
......@@ -136,6 +137,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
protected void onConfimClick() {
if (canSubmit()) {
MobclickAgent.onEvent(mActivity,"upload_learningVideo");
Jzvd.goOnPlayOnPause();
PubCourseData pubData = new PubCourseData(mUserId,theme,desc,mUserInfo.getAccountName()
,CommonUtils.getVideoLength(videoPath));
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
......@@ -62,6 +62,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
mView.showDialog();
OrderApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
aBoolean -> {
MobclickAgent.onEvent(BaseApplication.getContext(),"get_serviceOrder");
mView.showToast(R.string.receive_order_success);
receiveOrderSuccess();
}, responeThrowable -> {
......
orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
......@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
......@@ -17,6 +18,7 @@ import com.dayu.utils.ProgressUtil;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate;
import com.dayu.utils.UtilsUserAccountMatcher;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......@@ -109,6 +111,7 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
OrderApiFactory.subcriceTime(orderId, doorTime, doorComment).subscribe(baseObserver(aBoolean -> {
mView.showToast(R.string.order_commite_success);
if (mState == SUBCRIBE_TIME) {
MobclickAgent.onEvent(BaseApplication.getContext(),"handle_serviceOrder");
mView.showToast(R.string.subcribe_time_success);
EventBus.getDefault().post(new RefreshTab(1));
mDisposable = Observable.timer(500, TimeUnit.MILLISECONDS).subscribe(aLong -> {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -226,6 +226,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
showDialog();
OrderApiFactory.receiveOrder(orderId, mUserId).subscribe(mPresenter.baseObserver(
aBoolean -> {
MobclickAgent.onEvent(mActivity,"get_serviceOrder");
EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showLongToast(R.string.take_oreder_success_tosee);
mBind.tvTakeOrder.setVisibility(View.GONE);
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/ProductInstructionFragment.java
......@@ -83,6 +83,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr
if (mDetail != null){
CommonUtils.shareProgram(mActivity,mDetail.getFirstUrl(),mDetail.getGoodsModel(),
mDetail.getBrief(),mUserId,mDetail.getId(),SHARE_MEDIA.WEIXIN,null);
MobclickAgent.onEvent(mActivity,"share_goods");
}
}
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleProductFragment.java
......@@ -185,6 +185,7 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
@Override
public void share(ProductListBean item) {
MobclickAgent.onEvent(mActivity,"share_goods");
CommonUtils.shareProgram(mActivity,item.getFirstUrl(),item.getGoodsModel(),
item.getBrief(),mUserId,item.getId(),SHARE_MEDIA.WEIXIN,null);
}
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
......@@ -10,6 +10,7 @@ import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.EditBankData;
import com.dayu.usercenter.model.bean.CommonRecordListBean;
import com.dayu.usercenter.model.bean.GlobelRateBean;
import com.dayu.usercenter.model.bean.InviteRecordBean;
import com.dayu.usercenter.model.bean.SaleArriveListBean;
import com.dayu.usercenter.model.bean.SaleRecordBean;
import com.dayu.usercenter.model.bean.SaleRecordListBean;
......@@ -250,5 +251,15 @@ public interface UserService2 {
@GET(Constants.API_7100 + "/account/dynamic")
Observable<BaseResponse<List<String>>> getServiceWechat();
/**
* 邀请记录
*
* @return
*/
@GET(Constants.API_7100 + "/inviters/records")
Observable<BaseResponse<BasePageBean<InviteRecordBean>>> getInviteRecord(@Query("inviterId") int id,
@Query("page") int page,
@Query("pageSize") int pageSize);
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/InviteRecordBean.java 0 → 100644
package com.dayu.usercenter.model.bean;
public class InviteRecordBean {
/**
* id : 2
* invitedId : 1473
* invitedName : 大的很
* inviterId : 640
* inviterName : 孙路路
* createTime : 2020-04-09 14:37:38
* mobile : 15033662222
* realName : 大的很
*/
private int id;
private int invitedId;
private String invitedName;
private int inviterId;
private String inviterName;
private String createTime;
private String mobile;
private String realName;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getInvitedId() {
return invitedId;
}
public void setInvitedId(int invitedId) {
this.invitedId = invitedId;
}
public String getInvitedName() {
return invitedName;
}
public void setInvitedName(String invitedName) {
this.invitedName = invitedName;
}
public int getInviterId() {
return inviterId;
}
public void setInviterId(int inviterId) {
this.inviterId = inviterId;
}
public String getInviterName() {
return inviterName;
}
public void setInviterName(String inviterName) {
this.inviterName = inviterName;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
......@@ -10,6 +10,7 @@ import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.ui.activity2.BusinessTypeActivity;
import com.dayu.usercenter.ui.activity2.CashRecordActivity;
import com.dayu.usercenter.ui.activity2.InvateNewActivity;
import com.dayu.usercenter.ui.activity2.InviteRecordActivity;
import com.dayu.usercenter.ui.activity2.UserInfoActivity;
import com.dayu.usercenter.ui.activity2.UserLicenceActivity;
import com.dayu.utils.CommonUtils;
......@@ -102,6 +103,9 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
bundle.putInt(Constants.TYPE,2);
mView.startActivity(InvateNewActivity.class,bundle);
}
public void toInviteRecord() {
mView.startActivity(InviteRecordActivity.class);
}
public void invateProvider() {
Bundle bundle = new Bundle();
......
userCenter/src/main/java/com/dayu/usercenter/presenter/pwlogin/PwLoginPresenter.java
......@@ -147,6 +147,7 @@ public class PwLoginPresenter extends PwLoginContract.Presenter {
LogUtils.e("HxAccount: "+info.getHxAccount());
if (info.getRoles() != null && info.getRoles().contains(2)){
info.setSiteId(-1);
info.setMobile(phoneNume.get());
UserManager.getInstance().saveUser(info);
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
}else {
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
......@@ -60,7 +60,8 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
}
public void login() {
if (code.get() != null)
if (code.get() != null && phoneNume.get() != null)
mPhone = phoneNume.get();
login(code.get());
}
......@@ -128,6 +129,7 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
public void dumpAndSave(UserInfo info) {
if (info.getRoles() != null && info.getRoles().contains(2)){
info.setSiteId(-1);
info.setMobile(phoneNume.get());
UserManager.getInstance().saveUser(info);
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
}else {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
......@@ -12,6 +12,7 @@ import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityCashRecordBinding;
import com.dayu.usercenter.model.bean.SaleArriveListBean;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
import java.util.List;
......@@ -33,6 +34,7 @@ public class CashRecordActivity extends BaseActivity<SImplePresenter,ActivityCas
@Override
public void initView() {
initUser();
MobclickAgent.onEvent(mActivity,"look_income");
mBind.receivingBack.setOnClickListener(view -> dumpBack());
mBind.refreshLayout.setEnableLoadMore(false);
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InvateNewActivity.java
......@@ -11,6 +11,7 @@ import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.databinding.ActivityInvateNewBinding;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.ToastUtils;
import com.umeng.analytics.MobclickAgent;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.UMShareListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -57,10 +58,12 @@ public class InvateNewActivity extends BaseActivity<SImplePresenter, ActivityInv
//分享按钮点击事件
private void setListener() {
mBind.tvForward.setOnClickListener(v -> {
if (mType == 2)
MobclickAgent.onEvent(mActivity,"invite_master");
String url = mType == 2 ? Constants.INVITE_NEW_SHARE_URL : Constants.INVITE_NEW_SHARE_URL_BUSINESS;
String title = getString(R.string.invite_new_share_title);
String desc = getString(mType == 2 ? R.string.invite_new_share_content : R.string.invite_new_share_content_business);
CommonUtils.shareWxUrl(this, url + mInviteCode, "", title, desc, new UMShareListener() {
CommonUtils.shareWxUrl(this, url + mInviteCode, Constants.AppLogoUrl, title, desc, new UMShareListener() {
@Override
public void onStart(SHARE_MEDIA share_media) {
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InviteRecordActivity.java 0 → 100644
package com.dayu.usercenter.ui.activity2;
import android.support.v7.widget.LinearLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityInviteRecordBinding;
import com.dayu.usercenter.model.bean.InviteRecordBean;
import com.dayu.usercenter.model.bean.SaleArriveListBean;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
import java.util.List;
public class InviteRecordActivity extends BaseActivity<SImplePresenter,ActivityInviteRecordBinding> {
BaseQuickAdapter<InviteRecordBean, BaseViewHolder> mAdapter;
List<InviteRecordBean> mDatas = new ArrayList<>();
int page = 1;
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_invite_record;
}
@Override
public void initView() {
initUser();
mBind.receivingBack.setOnClickListener(view -> dumpBack());
mBind.refreshLayout.setEnableLoadMore(false);
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
page = 1;
getDetailData();
});
mBind.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
getDetailData();
});
showDialog();
getDetailData();
}
private void getDetailData(){
Api.getService(UserService2.class).getInviteRecord(mUserId,page, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data ->{
mBind.refreshLayout.finishRefresh();
mBind.refreshLayout.finishLoadMore();
if (page == 1) {
mDatas.clear();
}
mDatas.addAll(data.getData());
setAdapter();
mBind.refreshLayout.setEnableLoadMore(page < data.getTotalPages());
page += 1;
}, responeThrowable -> {
mBind.refreshLayout.finishRefresh();
mBind.refreshLayout.finishLoadMore();
}));
}
private void setAdapter() {
if (mAdapter != null){
mAdapter.notifyDataSetChanged();
}else{
mAdapter = new BaseQuickAdapter<InviteRecordBean, BaseViewHolder>(R.layout.item_invite_record, mDatas) {
@Override
protected void convert(BaseViewHolder helper, InviteRecordBean item) {
helper.setText(R.id.tv_item1, item.getCreateTime());
helper.setText(R.id.tv_item2, item.getRealName());
helper.setText(R.id.tv_item3, item.getMobile());
}
};
mBind.rvCache.setLayoutManager(new LinearLayoutManager(mActivity));
mBind.rvCache.setAdapter(mAdapter);
}
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserLicenceActivity.java
......@@ -9,6 +9,7 @@ import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityUserLicenceBinding;
import com.dayu.usercenter.ui.fragment.UserLicenceFragment;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
......@@ -34,6 +35,7 @@ public class UserLicenceActivity extends BaseActivity<SImplePresenter,ActivityUs
@Override
public void initView() {
MobclickAgent.onEvent(mActivity,"look_certification");
mBind.receivingBack.setOnClickListener(v->dumpBack());
mFragments.add(UserLicenceFragment.newInstance(1));
......
userCenter/src/main/release/AndroidManifest.xml
......@@ -98,6 +98,9 @@
<activity
android:name=".ui.activity2.CashRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.InviteRecordActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
userCenter/src/main/res/layout/activity_invite_record.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_back"
style="@style/title">
<TextView
android:id="@+id/tv_title"
style="@style/text_title"
android:text="@string/invite_record" />
<ImageView
android:id="@+id/receiving_back"
style="@style/title_image_back"
/>
</RelativeLayout>
<ImageView style="@style/card_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:paddingLeft="1dp"
android:paddingRight="1dp"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.2"
android:background="@drawable/bg_order_step_title1"
android:gravity="center"
android:text="@string/invite_time" />
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_order_step_title2"
android:gravity="center"
android:text="@string/be_invated_person" />
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/bg_order_step_title1"
android:gravity="center"
android:text="@string/str_phone" />
</LinearLayout>
<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.support.v7.widget.RecyclerView
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:id="@+id/rv_cache"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/activity_user_info.xml
......@@ -241,7 +241,7 @@
<TextView
style="@style/user_info_text"
android:text="@string/user_receiver_addr" />
android:text="@string/user_receiver_addr2" />
<TextView
android:id="@+id/tv_addr_add"
......
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -233,30 +233,30 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
>
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/tv_user_bottom1"
android:layout_marginTop="0dp"
android:layout_marginLeft="25dp"
android:layout_marginTop="0dp"
android:text="@string/user_cash_arrive" />
<TextView
android:id="@+id/tv_cash_arrive"
style="@style/tv_user_bottom2"
android:textSize="26sp"
android:layout_marginTop="0dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="0dp"
android:text="0"
android:textColor="@color/cl_order_item_date" />
android:textColor="@color/cl_order_item_date"
android:textSize="26sp" />
</LinearLayout>
</RelativeLayout>
<LinearLayout style="@style/ll_user_bottom"
android:layout_marginTop="10dp"
>
<LinearLayout
style="@style/ll_user_bottom"
android:layout_marginTop="10dp">
<LinearLayout
style="@style/ll_user_bottom2"
......@@ -296,8 +296,7 @@
<LinearLayout
style="@style/ll_user_bottom2"
android:onClick="@{()->presenter.toCommonRecord(3)}"
>
android:onClick="@{()->presenter.toCommonRecord(3)}">
<TextView
style="@style/tv_user_bottom1"
......@@ -306,15 +305,14 @@
<TextView
android:id="@+id/tv_invate_reward"
style="@style/tv_user_bottom2"
android:textColor="@color/text_common_green"
android:text="0" />
android:text="0"
android:textColor="@color/text_common_green" />
</LinearLayout>
<LinearLayout
style="@style/ll_user_bottom2"
android:layout_marginLeft="10dp"
android:onClick="@{()->presenter.toCommonRecord(4)}"
>
android:onClick="@{()->presenter.toCommonRecord(4)}">
<TextView
style="@style/tv_user_bottom1"
......@@ -323,8 +321,8 @@
<TextView
android:id="@+id/tv_platform_reward"
style="@style/tv_user_bottom2"
android:textColor="@color/text_common_green"
android:text="0" />
android:text="0"
android:textColor="@color/text_common_green" />
</LinearLayout>
</LinearLayout>
......@@ -362,45 +360,63 @@
android:text="0" />
</LinearLayout>
</LinearLayout>
<TextView
style="@style/common_text_style"
android:textSize="15sp"
android:layout_width="match_parent"
android:text="@string/add_service_wechat"
android:paddingLeft="18dp"
/>
android:text="@string/add_service_wechat"
android:textSize="15sp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_wechat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="false"
android:focusableInTouchMode="false"
android:layout_height="wrap_content"/>
android:focusableInTouchMode="false" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:orientation="horizontal">
<TextView
android:id="@+id/apply_part"
android:layout_width="match_parent"
android:layout_height="49dp"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="45dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:onClick="@{()->presenter.dumpToInvate()}"
android:text="@string/invate_new_reward"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:background="@drawable/btn_blue_commom"
android:layout_margin="15dp"
android:onClick="@{()->presenter.dumpToInvate()}"
/>
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="match_parent"
android:layout_height="49dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="45dp"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="@string/invate_provider_title"
android:layout_marginLeft="15dp"
android:onClick="@{()->presenter.toInviteRecord()}"
android:text="@string/invite_record"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:background="@drawable/btn_dark_red"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/btn_dark_red"
android:gravity="center"
android:onClick="@{()->presenter.invateProvider()}"
/>
android:text="@string/invate_provider_title"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
......
userCenter/src/main/res/layout/item_invite_record.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_item1"
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_weight="1.2"
android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item1"
android:gravity="center"
android:maxLines="5"
android:paddingTop="5dp"
android:paddingBottom="5dp"
/>
<TextView
android:id="@+id/tv_item2"
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item2"
android:gravity="center"
android:maxLines="5"
android:paddingTop="5dp"
android:paddingBottom="5dp"
/>
<TextView
android:id="@+id/tv_item3"
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item1"
android:gravity="center"
android:maxLines="5"
android:paddingTop="5dp"
android:paddingBottom="5dp"
/>
</LinearLayout>
userCenter/src/main/res/values/strings.xml
......@@ -9,6 +9,7 @@
<string name="share_reward_money">分享奖金</string>
<string name="reward_money">奖励金额</string>
<string name="be_invated_person">被邀请人</string>
<string name="invite_time">邀请时间</string>
<string name="reward_company">奖励方</string>
<string name="reward_date">奖励日期</string>
<string name="deatail_addr_">详细地址:</string>
......
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