Skip to content

android / dayu

Go to a project
Commit 16d0953d by mReturn
Options

fix bug

parent 27d9bf05 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 v2.5.5 v2.5.4 v2.5.3 v2.5.2 v2.5.0 v2.4.6 v2.4.5 dev20230405
Inline Side-by-side
Showing with 141 additions and 730 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -169,10 +169,12 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
// mBind.tabFour.setOnClickListener(o -> showHideFragment(3, mPosition));
mBind.tabSale.setOnClickListener(o -> showHideFragment(0, mPosition));
mBind.tabSecond.setOnClickListener(o -> {
showHideFragment(1, mPosition);
int detectSatus = UserManager.getInstance().getUser().getDetectStatus();
if (detectSatus == 2 || detectSatus == 3) {
showCertificationDialog();
if (mPosition != 1){
showHideFragment(1, mPosition);
int detectSatus = UserManager.getInstance().getUser().getDetectStatus();
if (detectSatus == 2 || detectSatus == 3) {
showCertificationDialog();
}
}
});
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
......@@ -83,6 +83,13 @@ public class CommonUtils {
return money + context.getString(R.string.money);
}
/**
* 获取带汉字描述的价格(取整)
*/
public static String getIntMoneyStr(Context context, double money) {
return Double.valueOf(money).intValue() + context.getString(R.string.money);
}
//计算并设置时间
public static String getTimeDesc(Context context, String time) {
if (TextUtils.isEmpty(time)) {
......@@ -126,20 +133,21 @@ public class CommonUtils {
/**
* List转String
*
* @param list
* @param <T>
* @return
*/
public static<T> String list2String(List<T> list){
public static <T> String list2String(List<T> list) {
StringBuilder sb = new StringBuilder();
String resultString = "";
if (list != null){
for(int i=0;i<list.size();i++){
if(i<list.size()-1){
if (list != null) {
for (int i = 0; i < list.size(); i++) {
if (i < list.size() - 1) {
sb.append(list.get(i));
sb.append(",");
}else{
} else {
sb.append(list.get(i));
}
}
......@@ -150,15 +158,16 @@ public class CommonUtils {
/**
* string转list并且过滤掉空字符串
*
* @param str
* @return
*/
public static List<String> string2ListF(String str){
public static List<String> string2ListF(String str) {
List<String> list = new ArrayList<>();
if (!TextUtils.isEmpty(str)){
String [] strArr = str.split(",");
for (int i=0;i<strArr.length;i++){
if (!TextUtils.isEmpty(strArr[i])){
if (!TextUtils.isEmpty(str)) {
String[] strArr = str.split(",");
for (int i = 0; i < strArr.length; i++) {
if (!TextUtils.isEmpty(strArr[i])) {
list.add(strArr[i]);
}
}
......@@ -175,7 +184,7 @@ public class CommonUtils {
// 1待付款2待商家确认3取消订单4待发货5待收货6已收货验收7退货申请8换货申请9退货待返货10换货待返货
// 11拒绝退货12拒绝换货13退货已返货14换货已返货15已退货16订单完成
String[] status = context.getResources().getStringArray(R.array.sale_order_status);
if (status.length >= state && state>=0) {
if (status.length >= state && state >= 0) {
return status[state - 1];
} else {
return "unkonwn";
......@@ -201,13 +210,13 @@ public class CommonUtils {
* 微信（朋友圈）分享链接（包含标题内容）
*/
public static void shareWxUrl(Activity activity, String url, String imgUrl, String title,
String description, UMShareListener callBack) {
String description, UMShareListener callBack) {
UMWeb web = new UMWeb(url);
web.setTitle(title);
web.setThumb(new UMImage(activity, imgUrl));
web.setDescription(description);
new ShareAction(activity).withMedia(web)
.setDisplayList(SHARE_MEDIA.WEIXIN,SHARE_MEDIA.WEIXIN_CIRCLE)
.setDisplayList(SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE)
.setCallback(callBack).open();
// .setPlatform(SHARE_MEDIA.WEIXIN_CIRCLE)
// .setCallback(callBack).share();
......@@ -219,8 +228,8 @@ public class CommonUtils {
* 分享商品-微信小程序
**/
public static void shareProgram(Activity activity, String imgUrl, String title, String description,
int uid,int gid, SHARE_MEDIA platform, UMShareListener callBack) {
MobclickAgent.onEvent(activity,"share");
int uid, int gid, SHARE_MEDIA platform, UMShareListener callBack) {
MobclickAgent.onEvent(activity, "share");
//兼容低版本的网页链接
String mUrl = "http://www.kf.ai/";
UMMin umMin = new UMMin(mUrl);
......@@ -231,10 +240,11 @@ public class CommonUtils {
// 小程序消息描述
umMin.setDescription(description);
//小程序页面路径
umMin.setPath(Constants.PROGRAM_PATH.replace("uid",uid+"").replace("gid",gid+""));
umMin.setPath(Constants.PROGRAM_PATH.replace("uid", uid + "").replace("gid", gid + ""));
// 小程序原始id,在微信平台查询
umMin.setUserName("gh_0e5cd0cdbf46");
// Config.setMiniPreView(); //设置预览版
if ("uat".equals(Constants.ENVIROMENT))
Config.setMiniPreView(); //设置预览版
// Config.setMiniTest(); //设置测试版
new ShareAction(activity)
.withMedia(umMin)
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
......@@ -34,6 +34,8 @@ public interface MultipleProcessContract {
void setPayType(int type);
void setOrderSource(int source);
void setPayStatus(Boolean blooean);
void showSelectPayerDialog(OnCloseListener listener);
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
......@@ -130,11 +130,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
llPaywayNotice = view.findViewById(R.id.ll_payway_notice);
mNoPay.setOnClickListener(v -> {
// mPayType = 3;
// clearData();
// mRlPay.setVisibility(View.GONE);
// llScanPay.setVisibility(View.GONE);
// setPayWayBackGround(mNoPay);
if (payTypeSetted) {
// ToastUtils.showShortToast(getString(R.string.can_not_repet_get_money));
} else {
mPayType = 3;
clearData();
mRlPay.setVisibility(View.GONE);
llScanPay.setVisibility(View.GONE);
setPayWayBackGround(mNoPay);
}
});
mWechatPay.setOnClickListener(v -> {
if (payTypeSetted) {
......@@ -425,7 +429,6 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
@Override
public void setPayType(int type) {
payTypeSetted = true;
mPayType = type;
switch (type){
case 1:
......@@ -454,6 +457,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
}
@Override
public void setOrderSource(int source) {
if (source == 1 || source == 5){
payTypeSetted = false;
}else {
payTypeSetted = false;
}
}
@Override
public void setPayStatus(Boolean blooean) {
mWechatStatus = blooean;
}
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -193,6 +193,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.llBottom.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE);
}
}else {
holder.rlItemEnd.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.VISIBLE);
}
time = item.getConfirmDoorTime();
break;
......@@ -437,7 +440,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (order.getSpus().size() == 1) {
Spu spu = order.getSpus().get(0);
if (spu.getGoodNum() == 1) {
mPresenter.getServerList(spu.getId(), order.getKaCompanyId());
if (order.getKaCompanyId() == null){
mPresenter.getServerList(spu.getId(), -1);
}else{
mPresenter.getServerList(spu.getId(), order.getKaCompanyId());
}
} else {
intent = new Intent(mContext, ServerListActivity.class);
bundle.putInt(Constants.ID, order.getSpus().get(0).getId());
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -440,6 +440,7 @@
</RelativeLayout>
<TextView
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
......@@ -449,6 +450,7 @@
android:textSize="14sp" />
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
......@@ -469,9 +471,10 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:text="@{item.repairType == 1?@string/payer_baonei:@string/payer_baowai}"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<!--android:text="@{item.repairType == 1?@string/payer_baonei:@string/payer_baowai}"-->
</LinearLayout>
<TextView
......@@ -531,7 +534,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:text='@{item.price+"元"}'
android:textColor="@color/cl_order_item_date"
android:textColor="@color/common_red"
android:textSize="14sp" />
</LinearLayout>
......
saleCenter/src/main/java/com/bigfish/salecenter/adapter/SaleOrderAdapter.java
......@@ -24,8 +24,8 @@ public class SaleOrderAdapter extends CoreAdapter<OrdersBean,ItemSaleOrderBindin
super.onBind(holder, item, position);
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getGoodsFirstUrl(),R.drawable.icon_img_default);
holder.tvBrandModel.setText(item.getGoodsModel());
holder.tvPrice.setText(CommonUtils.getMoneyStr(mContext,item.getPrice()));
holder.tvCommision.setText(CommonUtils.getMoneyStr(mContext,item.getSalesPrice()));
holder.tvPrice.setText(CommonUtils.getIntMoneyStr(mContext,item.getPrice()));
holder.tvCommision.setText(CommonUtils.getIntMoneyStr(mContext,item.getSalesPrice()));
holder.tvStatus.setText(CommonUtils.getOrderStauts(mContext,item.getStatus()));
holder.tvStatus.setTextColor(CommonUtils.getOrderStautsColor(mContext,item.getStatus()));
holder.tvDate.setText(item.getCreateTime());
......
saleCenter/src/main/java/com/bigfish/salecenter/adapter/SaleProductAdapter.java
......@@ -27,8 +27,8 @@ public class SaleProductAdapter extends CoreAdapter<ProductListBean,ItemSaleProd
super.onBind(holder, item, position);
holder.tvBrandModel.setText(item.getGoodsModel());
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getFirstUrl(),R.drawable.icon_img_default);
holder.tvSinglePrice.setText(CommonUtils.getMoneyStr(mContext,item.getPrice()));
holder.tvCommision.setText(CommonUtils.getMoneyStr(mContext,item.getSalesPrice()));
holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext,item.getPrice()));
holder.tvCommision.setText(CommonUtils.getIntMoneyStr(mContext,item.getSalesPrice()));
if (item.getCollectionStatus() == 1){
holder.btnCollect.setText(R.string.un_collect);
}else {
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/SaleOrderDetailActivity.java
......@@ -68,10 +68,10 @@ public class SaleOrderDetailActivity extends BaseActivity<SImplePresenter, Activ
mBind.tvModel.setText(data.getGoodsModel());
mBind.tvSellerCompany.setText(data.getProviderName());
mBind.tvCompanyPn.setText(data.getGoodsPn());
mBind.tvSinglePrice.setText(CommonUtils.getMoneyStr(this,data.getGoodsPrice()));
mBind.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(this,data.getGoodsPrice()));
mBind.tvOrderCount.setText(data.getNum()+"");
mBind.tvOrderMoney.setText(CommonUtils.getMoneyStr(this,data.getPrice()));
mBind.tvBonus.setText(CommonUtils.getMoneyStr(this,data.getSalesPrice()));
mBind.tvOrderMoney.setText(CommonUtils.getIntMoneyStr(this,data.getPrice()));
mBind.tvBonus.setText(CommonUtils.getIntMoneyStr(this,data.getSalesPrice()));
setStepAdapter(data.getOrderGoodsRecordVOS());
}
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/ProductInstructionFragment.java
......@@ -91,7 +91,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr
mBind.tvModel.setText(mDetail.getGoodsModel());
mBind.tvCompany.setText(mDetail.getProviderName());
mBind.tvCompanyPn.setText(mDetail.getPn());
mBind.tvSinglePrice.setText(CommonUtils.getMoneyStr(mActivity, mDetail.getPrice()));
mBind.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mActivity, mDetail.getPrice()));
mBind.tvDesc.setText(mDetail.getBrief());
}
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
......@@ -110,7 +110,7 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm
//设置基本信息
private void initDataView() {
mBind.tvBonus.setText(CommonUtils.getMoneyStr(mActivity, mDetail.getSalesPrice())+"/台");
mBind.tvBonus.setText(CommonUtils.getIntMoneyStr(mActivity, mDetail.getSalesPrice())+"/台");
mBind.tvFace.setText(mDetail.getCustomerPortrait());
for (int i = 0; i < mDetail.getGoodsCategorys().size(); i++) {
sceneList.add(mDetail.getGoodsCategorys().get(i).getCategoryName());
......
saleCenter/src/main/res/layout/activity_order_detail.xml
......@@ -212,7 +212,7 @@
<TextView
android:id="@+id/tv_bonus"
style="@style/sale_detail_text2"
android:textColor="@color/text_common_green" />
android:textColor="@color/common_red" />
</LinearLayout>
<TextView
......
saleCenter/src/main/res/layout/fragment_product_instruction.xml
......@@ -71,8 +71,8 @@
<TextView
android:id="@+id/tv_single_price"
android:textColor="@color/cl_order_item_date"
style="@style/sale_detail_text2" />
style="@style/sale_detail_text2"
android:textColor="@color/text_common_blue" />
</LinearLayout>
<LinearLayout style="@style/sale_linearlayout_detail">
......@@ -87,23 +87,21 @@
android:maxLines="50" />
</LinearLayout>
<LinearLayout style="@style/sale_linearlayout_detail">
<TextView
style="@style/sale_detail_text"
android:layout_marginTop="10dp"
android:text="@string/goods_video" />
<TextView
style="@style/sale_detail_text"
android:text="@string/goods_video" />
<LinearLayout
android:id="@+id/ll_video"
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_marginTop="6dp">
<LinearLayout
android:id="@+id/ll_video"
<cn.jzvd.JzvdStd
android:id="@+id/jz_video"
android:layout_width="match_parent"
android:layout_height="150dp">
<cn.jzvd.JzvdStd
android:id="@+id/jz_video"
android:layout_width="match_parent"
android:layout_height="150dp" />
</LinearLayout>
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
......
saleCenter/src/main/res/layout/fragment_sale_instruction.xml
......@@ -36,7 +36,8 @@
<TextView
android:id="@+id/tv_bonus"
style="@style/sale_detail_text2"
android:textColor="@color/cl_order_item_date" />
android:textStyle="bold"
android:textColor="@color/common_red" />
</LinearLayout>
<LinearLayout style="@style/sale_linearlayout_detail">
......
saleCenter/src/main/res/layout/item_sale_order.xml
......@@ -56,14 +56,14 @@
<TextView
style="@style/sale_item_text"
android:text="@string/sale_order_price"
android:textSize="12sp" />
/>
<TextView
android:id="@+id/tv_price"
style="@style/sale_item_text2"
android:text="00"
android:textColor="@color/bg_button"
android:textSize="12sp" />
/>
</LinearLayout>
......@@ -76,14 +76,14 @@
<TextView
style="@style/sale_item_text"
android:text="@string/commision_str"
android:textSize="12sp" />
/>
<TextView
android:id="@+id/tv_commision"
style="@style/sale_item_text2"
android:text="00"
android:textColor="@color/common_red"
android:textSize="12sp" />
/>
</LinearLayout>
</RelativeLayout>
......
saleCenter/src/main/res/layout/item_sale_product.xml
......@@ -55,14 +55,14 @@
<TextView
style="@style/sale_item_text"
android:text="@string/sale_single_price"
android:textSize="12sp" />
/>
<TextView
android:id="@+id/tv_single_price"
style="@style/sale_item_text2"
android:text="00"
android:textColor="@color/bg_button"
android:textSize="12sp" />
/>
</LinearLayout>
......@@ -75,14 +75,14 @@
<TextView
style="@style/sale_item_text"
android:text="@string/commision_str"
android:textSize="12sp" />
/>
<TextView
android:id="@+id/tv_commision"
style="@style/sale_item_text2"
android:text="00"
android:textColor="@color/common_red"
android:textSize="12sp" />
/>
</LinearLayout>
</RelativeLayout>
......
userCenter/src/main/debug/AndroidManifest.xml
......@@ -79,9 +79,6 @@
android:name=".ui.activity2.UserLicenceActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.SaleRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.CommonRecordActivity"
android:screenOrientation="portrait" />
<activity
......
userCenter/src/main/java/com/dayu/usercenter/presenter/facecertification/FaceCertificaitonContract.java
......@@ -14,6 +14,7 @@ import java.util.List;
public interface FaceCertificaitonContract {
interface View extends BaseView {
void imgFileNull(); //活体检测图片处理结果为空值
}
abstract class Presenter extends BasePresenter<View> {
......
userCenter/src/main/java/com/dayu/usercenter/presenter/facecertification/FaceCertificaitonPresenter.java
......@@ -16,6 +16,7 @@ import com.dayu.utils.UserManager;
import org.json.JSONObject;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -46,27 +47,31 @@ public class FaceCertificaitonPresenter extends FaceCertificaitonContract.Presen
@Override
public void commitePhoto(List<File> list, String delta) {
mDelta = delta;
MultipartBody.Part[] part = packPhoto(list);
if (part != null){
List<File> tempList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
if (list.get(i) != null) {
tempList.add(list.get(i));
}
}
if (tempList.size()>4) {
MultipartBody.Part[] part = packPhoto(tempList);
BaseApiFactory.uploadPhoto(part, "nowatermark").subscribe(baseObserver(this::verifyIdentity));
}else {
} else {
mView.imgFileNull();
ToastUtils.showShortToast("验证失败");
}
}
private MultipartBody.Part[] packPhoto(List<File> files) {
if (files != null && files.size() > 0) {
MultipartBody.Part[] part = new MultipartBody.Part[files.size()];
for (int i = 0; i < files.size(); i++) {
RequestBody requestFile =
RequestBody.create(MediaType.parse("multipart/form-data"), files.get(i));
MultipartBody.Part body =
MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile);
part[i] = body;
}
return part;
MultipartBody.Part[] part = new MultipartBody.Part[files.size()];
for (int i = 0; i < files.size(); i++) {
RequestBody requestFile =
RequestBody.create(MediaType.parse("multipart/form-data"), files.get(i));
MultipartBody.Part body =
MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile);
part[i] = body;
}
return null;
return part;
}
@Override
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
package com.dayu.usercenter.presenter.homeuser;
import android.content.Intent;
import android.databinding.ObservableField;
import android.os.Bundle;
......@@ -11,8 +10,6 @@ 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.SaleRecordActivity;
import com.dayu.usercenter.ui.activity2.CommonRecordActivity;
import com.dayu.usercenter.ui.activity2.UserInfoActivity;
import com.dayu.usercenter.ui.activity2.UserLicenceActivity;
......@@ -84,7 +81,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
@Override
public void dumpToSaleRecord() {
mView.startActivity(SaleRecordActivity.class);
toCommonRecord(1);
}
@Override
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/FaceCertificationActivity.java
......@@ -19,6 +19,7 @@ import com.megvii.idcardlib.LivenessActivity;
import com.megvii.idcardlib.util.ConUtil;
import com.megvii.licensemanager.Manager;
import com.megvii.livenessdetection.LivenessLicenseManager;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONException;
import org.json.JSONObject;
......@@ -123,6 +124,10 @@ public class FaceCertificationActivity extends BaseActivity<FaceCertificaitonPre
list.add(ConUtil.saveJPG(mActivity, image_action1, "image_action1"));
list.add(ConUtil.saveJPG(mActivity, image_action2, "image_action2"));
list.add(ConUtil.saveJPG(mActivity, image_action3, "image_action3"));
if (image_best == null || image_env == null || image_action1 == null
|| image_action2 == null || image_action3 == null) {
MobclickAgent.onEvent(this, "face_img_null");
}
mPresenter.commitePhoto(list, delta);
} else {
checkID(resID);
......@@ -148,4 +153,9 @@ public class FaceCertificationActivity extends BaseActivity<FaceCertificaitonPre
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public void imgFileNull() {
MobclickAgent.onEvent(this, "face_img_save_null");
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
......@@ -23,7 +23,7 @@ import java.util.List;
* on 2020/2/15
**/
public class CommonRecordActivity extends BaseActivity<SImplePresenter,ActivityCommonRecordBinding> {
int mType; // 2.服务业绩 3.邀请奖励 4.平台奖励
int mType; //1.销售奖励 2.服务业绩 3.邀请奖励 4.平台奖励
int page = 1;
BaseQuickAdapter<CommonRecordListBean, BaseViewHolder> mAdapter;
List<CommonRecordListBean> mDatas = new ArrayList<>();
......@@ -65,6 +65,13 @@ public class CommonRecordActivity extends BaseActivity<SImplePresenter,ActivityC
private void initTopView() {
switch (mType){
case 1:
mBind.tvTitle.setText(R.string.user_sale_record);
mBind.tvCountDesc.setText(R.string.record_done_sale);
mBind.tvTableTitle1.setText(R.string.reward_money);
mBind.tvTableTitle2.setText(R.string.reward_company);
mBind.tvTableTitle3.setText(R.string.reward_date);
break;
case 3:
mBind.tvTitle.setText(R.string.user_invate_reward);
mBind.tvIncomeDesc.setText(R.string.reward_total_money);
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SaleRecordActivity.java deleted 100644 → 0
package com.dayu.usercenter.ui.activity2;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager;
import android.util.Log;
import android.widget.Button;
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.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivitySaleRecordBinding;
import com.dayu.usercenter.event.RefreshSaleRecordEvent;
import com.dayu.usercenter.model.bean.SaleRecordListBean;
import com.dayu.usercenter.ui.MyValueFormatter;
import com.dayu.usercenter.ui.fragment.SaleRecordArriveFragment;
import com.dayu.usercenter.ui.fragment.SaleRecordDetailFragment;
import com.dayu.usercenter.ui.fragment.SaleRecordRuleFragment;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
/**
* Created by mReturn
* on 2020/2/15
**/
public class SaleRecordActivity extends BaseActivity<SImplePresenter, ActivitySaleRecordBinding> {
private FragmentManager mFragmentManger;
private ArrayList<Fragment> mFragments = new ArrayList<>();
private int mPosition;
@Override
public int getLayoutId() {
return R.layout.activity_sale_record;
}
@Override
public void setPresenter() {
}
@Override
public void initView() {
initUser();
EventBus.getDefault().register(this);
mBind.receivingBack.setOnClickListener(v -> dumpBack());
showDialog();
initData();
mFragments.add(new SaleRecordDetailFragment());
mFragments.add(new SaleRecordArriveFragment());
mFragments.add(new SaleRecordRuleFragment());
initBtn();
addFragment();
}
private void initData() {
Api.getService(UserService2.class).getSaleRecordInfo(mUserId, 1).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
mBind.tvIncome.setText(data.getTotalRewardPrice() + "");
mBind.tvCount.setText(data.getOrderNum() + "");
}));
}
//初始化tab
public void initBtn() {
mBind.btnDetail.setSelected(true);
mBind.btnDetail.setTextColor(getResources().getColor(R.color.white));
mBind.btnDetail.setOnClickListener((view) -> onTabClick(mBind.btnDetail, 0));
mBind.btnRecord.setOnClickListener((view) -> onTabClick(mBind.btnRecord, 1));
mBind.btnRule.setOnClickListener((view) -> onTabClick(mBind.btnRule, 2));
}
private void onTabClick(Button btn, int showPos) {
reSelected();
btn.setSelected(true);
btn.setTextColor(getResources().getColor(R.color.white));
showHideFragment(showPos, mPosition);
}
public void addFragment() {
mFragmentManger = getSupportFragmentManager();
FragmentTransaction transaction = mFragmentManger.beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
for (int i = 0; i < mFragments.size(); i++) {
Fragment fragment = mFragments.get(i);
transaction.add(R.id.fl_container, fragment);
transaction.hide(fragment);
}
mPosition = 0;
transaction.show(mFragments.get(mPosition));
transaction.commit();
}
//重置
private void reSelected() {
mBind.btnDetail.setSelected(false);
mBind.btnRecord.setSelected(false);
mBind.btnRule.setSelected(false);
mBind.btnDetail.setTextColor(getResources().getColor(R.color.cl_home_button));
mBind.btnRecord.setTextColor(getResources().getColor(R.color.cl_home_button));
mBind.btnRule.setTextColor(getResources().getColor(R.color.cl_home_button));
}
//切换页面
private void showHideFragment(int showPosition, int hidePosition) {
if (showPosition == hidePosition) return;
mFragmentManger.beginTransaction()
.show(mFragments.get(showPosition))
.hide(mFragments.get(hidePosition))
.commit();
mPosition = showPosition;
}
@Override
protected void onDestroy() {
super.onDestroy();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refreshData(RefreshSaleRecordEvent event){
initData();
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/TestRecordActivity.java
......@@ -5,7 +5,6 @@ import android.util.Log;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivitySaleRecordBinding;
import com.dayu.usercenter.databinding.ActivityTestRecordBinding;
import com.dayu.usercenter.ui.MyValueFormatter;
import com.github.mikephil.charting.components.XAxis;
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordArriveFragment.java deleted 100644 → 0
package com.dayu.usercenter.ui.fragment;
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.fragment.BaseFragment;
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.FragmentSaleRecordArriveBinding;
import com.dayu.usercenter.databinding.FragmentSaleRecordDetailBinding;
import com.dayu.usercenter.event.RefreshSaleRecordEvent;
import com.dayu.usercenter.model.bean.SaleArriveListBean;
import com.dayu.usercenter.model.bean.SaleRecordListBean;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
public class SaleRecordArriveFragment extends BaseFragment<SImplePresenter,FragmentSaleRecordArriveBinding> {
BaseQuickAdapter<SaleArriveListBean, BaseViewHolder> mAdapter;
List<SaleArriveListBean> mDatas = new ArrayList<>();
int page = 1;
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.fragment_sale_record_arrive;
}
@Override
public void initView() {
initUser();
mBind.refreshLayout.setEnableLoadMore(false);
// mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
// page = 1;
// getDetailData();
// EventBus.getDefault().post(new RefreshSaleRecordEvent());
// });
// mBind.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
// getDetailData();
// });
// showDialog();
// getDetailData();
}
private void getDetailData(){
Api.getService(UserService2.class).getSaleArriveList(mUserId,1, 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<SaleArriveListBean, BaseViewHolder>(R.layout.item_record_arrive, mDatas) {
@Override
protected void convert(BaseViewHolder helper, SaleArriveListBean item) {
helper.setText(R.id.tv_item1, item.getCreateTime());
helper.setText(R.id.tv_item2, item.getPrice()+"");
}
};
mBind.rvRecord.setLayoutManager(new LinearLayoutManager(mActivity));
mBind.rvRecord.setAdapter(mAdapter);
}
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordDetailFragment.java deleted 100644 → 0
package com.dayu.usercenter.ui.fragment;
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.fragment.BaseFragment;
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.FragmentSaleRecordDetailBinding;
import com.dayu.usercenter.event.RefreshSaleRecordEvent;
import com.dayu.usercenter.event.RefreshUserRecordEvent;
import com.dayu.usercenter.model.bean.SaleRecordListBean;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
public class SaleRecordDetailFragment extends BaseFragment<SImplePresenter,FragmentSaleRecordDetailBinding> {
BaseQuickAdapter<SaleRecordListBean, BaseViewHolder> mAdapter;
List<SaleRecordListBean> mDatas = new ArrayList<>();
int page = 1;
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.fragment_sale_record_detail;
}
@Override
public void initView() {
initUser();
mBind.refreshLayout.setEnableLoadMore(false);
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
page = 1;
getDetailData();
EventBus.getDefault().post(new RefreshSaleRecordEvent());
});
mBind.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
getDetailData();
});
showDialog();
getDetailData();
}
private void getDetailData(){
Api.getService(UserService2.class).getSaleRecordList(mUserId,1,1, 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<SaleRecordListBean, BaseViewHolder>(R.layout.item_record_common, mDatas) {
@Override
protected void convert(BaseViewHolder helper, SaleRecordListBean item) {
helper.setText(R.id.tv_item1, item.getRewardPrice() + "");
helper.setText(R.id.tv_item2, item.getProviderName());
helper.setText(R.id.tv_item3, item.getCreateTime());
}
};
mBind.rvRecord.setLayoutManager(new LinearLayoutManager(mActivity));
mBind.rvRecord.setAdapter(mAdapter);
}
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordRuleFragment.java deleted 100644 → 0
package com.dayu.usercenter.ui.fragment;
import android.text.Html;
import com.dayu.base.api.Api;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.FragmentSaleRecordDetailBinding;
import com.dayu.usercenter.databinding.FragmentSaleRecordRuleBinding;
public class SaleRecordRuleFragment extends BaseFragment<SImplePresenter,FragmentSaleRecordRuleBinding> {
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.fragment_sale_record_rule;
}
@Override
public void initView() {
setRule4("","");
getRatioData();
}
private void getRatioData() {
//佣金比率
Api.getService(UserService2.class).getGlobelRate(1).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data->{
setRule4(data.getEngineerSalesCommissionRate()+"%",data.getUserRebateRate()+"%");
}));
}
private void setRule4(String ratio1,String ratio2) {
String str = getString(R.string.sale_record_rule4_1)+"<font color='#3e96e2'>"+ratio1+
"</font>"+getString(R.string.sale_record_rule4_1_2);
// +"<font color='#3e96e2'>"+ratio2+
// "</font>"+getString(R.string.sale_record_rule4_3);
mBind.tvRule4.setText(Html.fromHtml(str));
}
}
userCenter/src/main/release/AndroidManifest.xml
......@@ -82,9 +82,6 @@
android:name=".ui.activity2.UserLicenceActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.SaleRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.CommonRecordActivity"
android:screenOrientation="portrait" />
<activity
......
userCenter/src/main/res/layout/activity_invate_new.xml
......@@ -64,8 +64,7 @@
android:id="@+id/tv_code"
style="@style/common_text_style"
android:layout_gravity="center_horizontal"
android:textSize="20sp"
android:textStyle="bold"
android:textSize="50sp"
android:textColor="@color/color_orange"
android:text=""
android:layout_marginTop="15dp"
......
userCenter/src/main/res/layout/activity_sale_record.xml deleted 100644 → 0
<?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:paddingLeft="1dp"
android:paddingRight="1dp"
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/user_sale_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="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="130dp"
android:layout_height="110dp"
android:background="@color/cl_white"
android:src="@drawable/icon_money_bag2" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/tv_income"
style="@style/sale_item_text"
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:text="0.0"
android:textColor="@color/text_common_green"
android:textSize="18sp" />
<TextView
style="@style/sale_item_text"
android:text="@string/record_reward_total"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_count"
style="@style/sale_item_text"
android:layout_marginTop="5dp"
android:text="0"
android:textColor="@color/text_common_blue"
android:textSize="18sp" />
<TextView
style="@style/sale_item_text"
android:text="@string/record_done_sale"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cl_white"
android:layout_marginTop="10dp"
android:gravity="center">
<Button
android:id="@+id/btn_detail"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="35dp"
android:background="@drawable/detail_center_selector"
android:gravity="center"
android:text="@string/reward_detail" />
<Button
android:visibility="gone"
android:id="@+id/btn_record"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="35dp"
android:background="@drawable/detail_center_selector"
android:gravity="center"
android:text="@string/arrive_record" />
<Button
android:id="@+id/btn_rule"
android:layout_width="0dp"
android:layout_height="35dp"
android:layout_weight="1"
android:background="@drawable/detail_end_selector"
android:gravity="center"
android:text="@string/reward_rule" />
</LinearLayout>
<FrameLayout
android:id="@+id/fl_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="2dp"
android:layout_weight="1" />
</LinearLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -260,7 +260,7 @@
<LinearLayout
style="@style/ll_user_bottom2"
android:onClick="@{()->presenter.dumpToSaleRecord()}">
android:onClick="@{()->presenter.toCommonRecord(1)}">
<TextView
style="@style/tv_user_bottom1"
......
userCenter/src/main/res/layout/fragment_sale_record_arrive.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="2dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="1dp"
android:paddingRight="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:background="@drawable/bg_order_step_title1"
android:gravity="center"
android:text="@string/arrive_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_title3"
android:gravity="center"
android:text="@string/arrive_money" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_record"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never" />
</LinearLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/fragment_sale_record_detail.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="2dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="1dp"
android:paddingRight="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:orientation="horizontal">
<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/reward_money" />
<TextView
style="@style/sale_item_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@drawable/bg_order_step_title2"
android:gravity="center"
android:text="@string/reward_company" />
<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/reward_date" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_record"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never" />
</LinearLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/fragment_sale_record_rule.xml deleted 100644 → 0
<?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:paddingLeft="10dp"
android:paddingRight="10dp"
android:layout_marginTop="20dp"
android:orientation="vertical">
<TextView
android:textSize="18sp"
android:textStyle="bold"
android:layout_gravity="center_horizontal"
style="@style/sale_item_text"
android:text="@string/reward_rule" />
<TextView
android:visibility="gone"
style="@style/sale_item_text"
android:maxLines="15"
android:layout_marginTop="10dp"
android:text="@string/sale_record_rule1" />
<TextView
style="@style/sale_item_text"
android:maxLines="15"
android:layout_marginTop="10dp"
android:text="@string/sale_record_rule2" />
<TextView
android:visibility="gone"
style="@style/sale_item_text"
android:maxLines="15"
android:layout_marginTop="10dp"
android:text="@string/sale_record_rule3" />
<TextView
android:id="@+id/tv_rule4"
style="@style/sale_item_text"
android:maxLines="15"
android:layout_marginTop="10dp"
/>
</LinearLayout>
</layout>
\ No newline at end of file
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