Skip to content

android / dayu

Go to a project
Commit 58cb8af5 by wukun
Options

20230528新需求

parent b78bddf3
Inline Side-by-side
Showing with 508 additions and 82 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -45,21 +45,21 @@ public class Constants {
/**
* dev环境配置.
*/
// public static String ENVIROMENT = "debug";
// public static String PHOTO = "dev";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.94.101.239:3112";
// public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
// public static boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 239; //小绿人商家id
// public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
public static String ENVIROMENT = "debug";
public static String PHOTO = "dev";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/**
......@@ -85,21 +85,21 @@ public class Constants {
/**
* 正式环境.
*/
public static String ENVIROMENT = "release";
public static String PHOTO = "online";
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 boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id
public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
// public static String ENVIROMENT = "release";
// public static String PHOTO = "online";
// 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 boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/**
......
baseSDK/src/main/java/com/dayu/utils/CustomLinerLayoutManager.java 0 → 100644
package com.dayu.utils;
import android.content.Context;
import android.graphics.PointF;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearSmoothScroller;
import androidx.recyclerview.widget.RecyclerView;
public class CustomLinerLayoutManager extends LinearLayoutManager {
private float speedPerPixel = 0.001f;//滚动速率 越小越快 越大越慢
private Context context;
public CustomLinerLayoutManager(Context context) {
super(context);
this.context = context;
}
public CustomLinerLayoutManager(Context context, int orientation, boolean reverseLayout) {
super(context, orientation, reverseLayout);
}
public CustomLinerLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
public void setSpeedPerPixel(float speedPerPixel) {
this.speedPerPixel = speedPerPixel;
}
@Override
public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state, int position) {
RecyclerView.SmoothScroller smoothScroller = new CenterSmoothScroller(recyclerView.getContext());
smoothScroller.setTargetPosition(position);
startSmoothScroll(smoothScroller);
}
private class CenterSmoothScroller extends LinearSmoothScroller {
CenterSmoothScroller(Context context) {
super(context);
}
@Nullable
@Override //滑动到目标索引
public PointF computeScrollVectorForPosition(int targetPosition) {
return CustomLinerLayoutManager.this.computeScrollVectorForPosition(targetPosition);
}
@Override // 滑动位置
public int calculateDtToFit(int viewStart, int viewEnd, int boxStart, int boxEnd, int snapPreference) {
return (boxStart + (boxEnd - boxStart) / 2) - (viewStart + (viewEnd - viewStart) / 2);
}
protected float calculateSpeedPerPixel(DisplayMetrics displayMetrics) {// 控制滑动速度的
return speedPerPixel;
}
@Override
protected int getVerticalSnapPreference() {
return SNAP_TO_START;
}
}
}
baseSDK/src/main/java/com/dayu/widgets/AutoPollRecyclerView.java 0 → 100644
package com.dayu.widgets;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import java.lang.ref.WeakReference;
public class AutoPollRecyclerView extends RecyclerView {
private static final long TIME_AUTO_POLL = 16;
AutoPollTask autoPollTask;
private boolean running; //标示是否正在自动轮询
private boolean canRun;//标示是否可以自动轮询,可在不需要的是否置false
public AutoPollRecyclerView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
autoPollTask = new AutoPollTask(this);
}
static class AutoPollTask implements Runnable {
private final WeakReference<AutoPollRecyclerView> mReference;
//使用弱引用持有外部类引用->防止内存泄漏
public AutoPollTask(AutoPollRecyclerView reference) {
this.mReference = new WeakReference<AutoPollRecyclerView>(reference);
}
@Override
public void run() {
AutoPollRecyclerView recyclerView = mReference.get();
if (recyclerView != null && recyclerView.running && recyclerView.canRun) {
recyclerView.scrollBy(2, 2);
recyclerView.postDelayed(recyclerView.autoPollTask, recyclerView.TIME_AUTO_POLL);
}
}
}
//开启:如果正在运行,先停止->再开启
public void start() {
if (running)
stop();
canRun = true;
running = true;
postDelayed(autoPollTask, TIME_AUTO_POLL);
}
public void stop() {
running = false;
removeCallbacks(autoPollTask);
}
@Override
public boolean onTouchEvent(MotionEvent e) {
switch (e.getAction()) {
case MotionEvent.ACTION_DOWN:
if (running)
stop();
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_OUTSIDE:
if (canRun)
start();
break;
}
//return false，注释掉onTouchEvent()方法里面的stop和start方法，则列表自动滚动且不可触摸
return super.onTouchEvent(e);}
}
baseSDK/src/main/res/values/strings.xml
......@@ -810,8 +810,8 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<!--sale-->
<string name="sale_title">销售推荐</string>
<string name="tab_sale">销售</string>
<string name="sale_title">商机有奖</string>
<string name="tab_sale">商机</string>
<string name="sale_products">商品目录</string>
<string name="sale_collect">重点收藏</string>
<string name="in_sale">销售中</string>
......@@ -1043,9 +1043,10 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="about_us_detial">我们是一家专注于智能硬件产品【销售-安装-运维服务】的互联网平台，公司总部位于北京中关村，国内各大城市都设有分支机构。我们基于移动互联网、云计算、大数据和人工智能技术，在帮助各种智能硬件设备厂商开展服务业务。目前大鱼服务网已覆盖全国369个城市和2800多个区县级市场，已入驻2000多家品牌厂商/系统集成商/代理服务商，注册师傅超过50000人。</string>
<string name="tab_business">商家</string>
<string name="no_applay">未申请</string>
<string name="tab_business_title">合作商家</string>
<string name="no_applay">未合作商家</string>
<string name="applaying">申请中</string>
<string name="certified">已认证</string>
<string name="certified">已合作商家</string>
</resources>
saleCenter/src/main/java/com/bigfish/salecenter/adapter/BdCheckAdapter.java
......@@ -24,11 +24,11 @@ public class BdCheckAdapter extends CoreAdapter<SaleProduct, ItemSaleCheckBindin
@Override
protected void onBind(ItemSaleCheckBinding holder, SaleProduct item, int position) {
super.onBind(holder, item, position);
holder.tvBrandModel.setText(item.getGoodsModel());
holder.tvBrandModel.setText(item.getCustomerCompany());
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getGoodsFirstUrl(), R.drawable.icon_img_default);
holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext, item.getBdPrice()));
holder.tvCommision.setText(CommonUtils.getIntMoneyStr(mContext, item.getSalesPrice()));
holder.businessName.setText(item.getProviderName());
holder.businessName.setText(item.getSubmitTime());
}
public void initPresenter(SaleProductPresent presenter) {
......
saleCenter/src/main/java/com/bigfish/salecenter/adapter/BdDoneAdapter.java
......@@ -24,18 +24,18 @@ public class BdDoneAdapter extends CoreAdapter<SaleProduct, ItemSaleDoneBinding>
@Override
protected void onBind(ItemSaleDoneBinding holder, SaleProduct item, int position) {
super.onBind(holder, item, position);
holder.tvBrandModel.setText(item.getGoodsModel());
holder.tvBrandModel.setText(item.getCustomerCompany());
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getGoodsFirstUrl(), R.drawable.icon_img_default);
holder.businessName.setText(item.getProviderName());
holder.time.setText(item.getCreateTime());
if (item.getStatus() == 4) {
holder.aduiteTv.setText("审核结果：");
holder.tvSinglePrice.setText("不合格");
holder.tvResult.setText("[不合格]");
} else {
holder.aduiteTv.setText("地推奖励：");
holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext, item.getBdPrice()));
holder.tvResult.setText("[已奖励]");
}
holder.aduiteTv.setText("商机奖金：");
holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext, item.getBdPrice()));
}
public void initPresenter(SaleProductPresent presenter) {
......
saleCenter/src/main/java/com/bigfish/salecenter/adapter/BdOrderAdapter.java
......@@ -26,12 +26,15 @@ public class BdOrderAdapter extends CoreAdapter<SaleProduct, ItemSaleProductBind
@Override
protected void onBind(ItemSaleProductBinding holder, SaleProduct item, int position) {
super.onBind(holder, item, position);
holder.tvBrandModel.setText(item.getGoodsModel());
holder.tvBrandModel.setText(item.getCustomerCompany());
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getGoodsFirstUrl(), R.drawable.icon_img_default);
holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext, item.getBdPrice()));
holder.tvCommision.setText(CommonUtils.getIntMoneyStr(mContext, item.getSalesPrice()));
holder.btnShare.setVisibility(View.GONE);
holder.collectIcon.setVisibility(View.GONE);
holder.award.setVisibility(View.VISIBLE);
holder.llCommision.setVisibility(View.GONE);
holder.rlSinglePrice.setVisibility(View.VISIBLE);
}
public void initPresenter(SaleProductPresent presenter) {
......
saleCenter/src/main/java/com/bigfish/salecenter/adapter/RewardRecordAdapter.java 0 → 100644
package com.bigfish.salecenter.adapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.presenter.saleproduct.SaleProductPresent;
import java.util.ArrayList;
public class RewardRecordAdapter extends RecyclerView.Adapter<RewardRecordAdapter.Holder> {
private ArrayList<String> list = new ArrayList<>();
public RewardRecordAdapter() {
}
@NonNull
@Override
public Holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_sale_reward, parent, false);
return new Holder(view);
}
@Override
public void onBindViewHolder(@NonNull Holder holder, int position) {
if (list.size()>0){
int i = position % list.size();
holder.textView.setText(list.get(i));
}
}
@Override
public int getItemCount() {
return Integer.MAX_VALUE;
}
public void initPresenter(SaleProductPresent presenter) {
try {
ArrayList<String> rewardList = presenter.rewardList;
list.clear();
list.addAll(rewardList);
notifyDataSetChanged();
} catch (Exception e) {
e.printStackTrace();
}
}
class Holder extends RecyclerView.ViewHolder {
private final TextView textView;
Holder(View itemView) {
super(itemView);
textView = itemView.findViewById(R.id.tv_content);
}
}
}
saleCenter/src/main/java/com/bigfish/salecenter/api/SaleService.java
......@@ -6,6 +6,7 @@ import com.bigfish.salecenter.model.CollectProductData;
import com.bigfish.salecenter.model.OrdersBean;
import com.bigfish.salecenter.model.ProductDetailBean;
import com.bigfish.salecenter.model.ProductListBean;
import com.bigfish.salecenter.model.RewardRecordBean;
import com.bigfish.salecenter.model.SalTabNumBean;
import com.bigfish.salecenter.model.SaleOrderDetailsBean;
import com.bigfish.salecenter.model.SaleProduct;
......@@ -55,6 +56,15 @@ public interface SaleService {
@Query("pageSize") int pageSize);
/**
* 奖励记录
*
* @param engineerId
* @return
*/
@GET(API_8600 + "/bdOrder/rewardRecordTop/engineerId/{engineerId}")
Observable<BaseResponse<RewardRecordBean>> getrewardRecord(@Path("engineerId") int engineerId);
/**
* 收藏列表
*
* @param engineerId
......
saleCenter/src/main/java/com/bigfish/salecenter/model/RewardRecordBean.java 0 → 100644
package com.bigfish.salecenter.model;
import java.util.ArrayList;
public class RewardRecordBean {
private ArrayList<String> list;
private String url;
public ArrayList getList() {
return list;
}
public void setList(ArrayList list) {
this.list = list;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
}
saleCenter/src/main/java/com/bigfish/salecenter/model/SaleProduct.java
......@@ -44,6 +44,14 @@ public class SaleProduct implements Serializable {
private String submitTime;
private List<BdOrderTasks> bdOrderTasks;
public String getSubmitTime() {
return submitTime;
}
public void setSubmitTime(String submitTime) {
this.submitTime = submitTime;
}
public int getStatus() {
return status;
}
......@@ -116,6 +124,14 @@ public class SaleProduct implements Serializable {
this.providerName = providerName;
}
public String getCustomerCompany() {
return customerCompany;
}
public void setCustomerCompany(String customerCompany) {
this.customerCompany = customerCompany;
}
public static class BdOrderTasks implements Serializable {
private int bdOrderId;
......
saleCenter/src/main/java/com/bigfish/salecenter/presenter/saleproduct/SaleProductPresent.java
......@@ -15,6 +15,8 @@ import com.dayu.utils.UserManager;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import io.reactivex.Observable;
/**
......@@ -27,6 +29,8 @@ public class SaleProductPresent extends SaleProductContract.Presenter {
public int type;
public int status;
public String keyStr; //搜索关键字
public ObservableField<String> url = new ObservableField<>(); //搜索关键字
public ArrayList<String> rewardList = new ArrayList<>(); //搜索关键字
private ObservableField<Object> datas = new ObservableField<>();
@Override
......@@ -65,6 +69,14 @@ public class SaleProductPresent extends SaleProductContract.Presenter {
//商品列表
private void getProducts(int status) {
Api.getService(SaleService.class).getrewardRecord(mUserId).compose(Api.applySchedulers())
.subscribe(baseObserver(
products -> {
rewardList.clear();
rewardList.addAll(products.getList());
url.set(products.getUrl());
}, responeThrowable -> datas.set(Constants.FAILED)
));
Api.getService(SaleService.class).getProducts(mUserId, keyStr, status, mPage, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(baseObserver(
products -> {
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
......@@ -106,7 +106,7 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm
mBind.getAward.setOnClickListener(v -> {
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, mDetail.getBdFormUrl() + "&accountId=" + UserManager.getInstance().getUser().getAccountId() + "&token=" + UserManager.getInstance().getUser().getToken());
bundle.putString("title", "申请奖励");
bundle.putString("title", "贡献商机有奖");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
}
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleProductFragment.java
package com.bigfish.salecenter.ui.fragment;
import android.content.Intent;
import android.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import androidx.databinding.Observable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.adapter.BdCheckAdapter;
import com.bigfish.salecenter.adapter.BdDoneAdapter;
import com.bigfish.salecenter.adapter.BdOrderAdapter;
import com.bigfish.salecenter.adapter.RewardRecordAdapter;
import com.bigfish.salecenter.adapter.SaleProductAdapter;
import com.bigfish.salecenter.databinding.FragmentCommonSaleBinding;
import com.bigfish.salecenter.event.CollectChangedEvent;
......@@ -98,21 +103,42 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
((SaleProductAdapter) mAdapter).initPresenter(mPresenter);
mAdapter.setViewType(R.layout.item_sale_product);
mBind.edtSeacher.setHint(mActivity.getString(R.string.input_sale_product));
RewardRecordAdapter rewardRecordAdapter = new RewardRecordAdapter();
LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mBind.rvReward.setLayoutManager(layoutManager);
mBind.rvReward.setAdapter(rewardRecordAdapter);
rewardRecordAdapter.initPresenter(mPresenter);
mPresenter.url.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
@Override
public void onPropertyChanged(Observable observable, int i) {
rewardRecordAdapter.initPresenter(mPresenter);
mBind.rvReward.start();
}
});
mBind.llBussiness.setVisibility(View.VISIBLE);
AnimationDrawable animation = (AnimationDrawable) mBind.ivBfcom.getBackground();
animation.start();
} else if (type == 2) {
mAdapter = new BdOrderAdapter(true, type);
((BdOrderAdapter) mAdapter).initPresenter(mPresenter);
mAdapter.setViewType(R.layout.item_sale_product);
mBind.edtSeacher.setHint("查找订单");
mBind.llBussiness.setVisibility(View.GONE);
} else if (type == 3) {
mAdapter = new BdCheckAdapter(true, type);
((BdCheckAdapter) mAdapter).initPresenter(mPresenter);
mAdapter.setViewType(R.layout.item_sale_check);
mBind.edtSeacher.setHint("查找订单");
mBind.llBussiness.setVisibility(View.GONE);
} else if (type == 4) {
mAdapter = new BdDoneAdapter(true, type);
((BdDoneAdapter) mAdapter).initPresenter(mPresenter);
mAdapter.setViewType(R.layout.item_sale_done);
mBind.edtSeacher.setHint("查找订单");
mBind.llBussiness.setVisibility(View.GONE);
}
mBind.recyclerView.setAdapter(mAdapter);
......@@ -123,6 +149,23 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
showDialog(item);
}
});
mBind.llBfcom.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
if (TextUtils.isEmpty(mPresenter.url.get())){
return;
}
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, mPresenter.url.get() + "&token=" + UserManager.getInstance().getUser().getToken());
bundle.putString("title", "贡献商机有奖");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
} catch (Exception e) {
e.printStackTrace();
}
}
});
}
//搜索
......@@ -171,7 +214,7 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
} else {
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, ((SaleProduct) item).getBdFormUrl() + "&token=" + UserManager.getInstance().getUser().getToken());
bundle.putString("title", "申请奖励");
bundle.putString("title", "贡献商机有奖");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
}
......@@ -305,4 +348,19 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
}
}
@Override
public void onStart() {
super.onStart();
if (mBind.rvReward != null){
mBind.rvReward.start();
}
}
@Override
public void onStop() {
super.onStop();
if (mBind.rvReward != null){
mBind.rvReward.stop();
}
}
}
saleCenter/src/main/res/drawable-hdpi/iicon_collect.png
saleCenter/src/main/res/drawable-hdpi/iicon_collect.png

1.05 KB | W: | H:

saleCenter/src/main/res/drawable-hdpi/iicon_collect.png

1.88 KB | W: | H:

saleCenter/src/main/res/drawable-hdpi/iicon_collect.png
saleCenter/src/main/res/drawable-hdpi/iicon_collect.png
saleCenter/src/main/res/drawable-hdpi/iicon_collect.png
saleCenter/src/main/res/drawable-hdpi/iicon_collect.png
  • 2-up
  • Swipe
  • Onion skin
saleCenter/src/main/res/drawable/bfcom_anim.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item android:drawable="@drawable/bfcom_click1" android:duration="500"/>
<item android:drawable="@drawable/bfcom_click2" android:duration="500"/>
</animation-list>
\ No newline at end of file
saleCenter/src/main/res/layout/fragment_common_sale.xml
......@@ -69,7 +69,48 @@
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="0dp"
android:layout_weight="1"/>
<LinearLayout
android:id="@+id/ll_bussiness"
android:layout_width="match_parent"
android:layout_height="75dp"
android:background="@color/white">
<com.dayu.widgets.AutoPollRecyclerView
android:id="@+id/rv_reward"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"/>
<LinearLayout
android:id="@+id/ll_bfcom"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/btn_blue_commom">
<TextView
android:layout_width="110dp"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:gravity="center"
android:text="贡献商机拿奖金"
android:textSize="14dp"
android:paddingTop="5dp"
android:textColor="@color/cl_white" />
<ImageView
android:id="@+id/iv_bfcom"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="@drawable/bfcom_anim"
android:layout_gravity="center_horizontal"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
saleCenter/src/main/res/layout/fragment_product_instruction.xml
......@@ -119,7 +119,7 @@
android:layout_width="0dp"
android:layout_height="43dp"
android:layout_weight="1"
android:background="@drawable/btn_blue_commom"
android:background="@drawable/btn_green_commom"
android:gravity="center"
android:text="转发推荐"
android:textColor="@color/white" />
......@@ -130,9 +130,9 @@
android:layout_height="43dp"
android:layout_marginLeft="15dp"
android:layout_weight="1.6"
android:background="@drawable/btn_green_commom"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="申请奖励"
android:text="贡献商机拿奖金"
android:textColor="@color/white" />
</LinearLayout>
......
saleCenter/src/main/res/layout/fragment_sale_instruction.xml
......@@ -31,7 +31,8 @@
<TextView
style="@style/sale_detail_text"
android:text="地推奖励：" />
android:text="地推奖励："
android:visibility="gone"/>
<TextView
android:id="@+id/bd_price"
......@@ -39,7 +40,8 @@
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@color/common_red"
android:textStyle="bold" />
android:textStyle="bold"
android:visibility="gone"/>
<TextView
style="@style/sale_detail_text"
......@@ -235,7 +237,7 @@
android:layout_width="0dp"
android:layout_height="43dp"
android:layout_weight="1"
android:background="@drawable/btn_blue_commom"
android:background="@drawable/btn_green_commom"
android:gravity="center"
android:text="转发推荐"
android:textColor="@color/cl_white" />
......@@ -246,9 +248,9 @@
android:layout_height="43dp"
android:layout_marginLeft="15dp"
android:layout_weight="1.6"
android:background="@drawable/btn_green_commom"
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="申请奖励"
android:text="贡献商机拿奖金"
android:textColor="@color/cl_white" />
</LinearLayout>
......
saleCenter/src/main/res/layout/item_sale_check.xml
......@@ -47,7 +47,7 @@
<TextView
style="@style/sale_item_text"
android:textSize="@dimen/dp_12"
android:text="商机奖励：" />
android:text="商机奖金：" />
<TextView
android:id="@+id/tv_single_price"
......@@ -63,7 +63,8 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginStart="30dp"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="invisible">
<TextView
style="@style/sale_item_text"
......@@ -88,12 +89,14 @@
<TextView
style="@style/sale_item_text"
android:text="商家名称：" />
android:text="提交时间："
android:textSize="@dimen/dp_12"/>
<TextView
android:id="@+id/businessName"
style="@style/sale_item_text2"
android:text="00" />
android:text="00"
android:textSize="@dimen/dp_10"/>
</LinearLayout>
......
saleCenter/src/main/res/layout/item_sale_done.xml
......@@ -36,7 +36,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="10dp">
android:paddingTop="10dp"
android:visibility="gone">
<TextView
style="@style/sale_item_text"
......@@ -49,6 +50,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -56,15 +59,23 @@
android:paddingTop="10dp">
<TextView
android:id="@+id/aduiteTv"
style="@style/sale_item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核时间：" />
android:text="地推奖励：" />
<TextView
android:id="@+id/time"
android:id="@+id/tv_single_price"
style="@style/sale_item_text2"
android:text="00" />
android:text="00"
android:textColor="@color/common_red" />
<TextView
android:id="@+id/tv_result"
style="@style/sale_item_text2"
android:text="00"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_10"/>
</LinearLayout>
......@@ -75,18 +86,19 @@
android:paddingTop="10dp">
<TextView
android:id="@+id/aduiteTv"
style="@style/sale_item_text"
android:text="地推奖励：" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核时间："
android:textSize="@dimen/dp_12"/>
<TextView
android:id="@+id/tv_single_price"
android:id="@+id/time"
style="@style/sale_item_text2"
android:text="00"
android:textColor="@color/common_red" />
android:textSize="@dimen/dp_10"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
saleCenter/src/main/res/layout/item_sale_product.xml
......@@ -43,10 +43,12 @@
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_single_price"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp">
android:layout_marginRight="5dp"
android:visibility="invisible">
<LinearLayout
android:layout_width="wrap_content"
......@@ -57,7 +59,7 @@
<TextView
style="@style/sale_item_text"
android:textSize="@dimen/dp_12"
android:text="商机奖励：" />
android:text="商机奖金：" />
<TextView
android:id="@+id/tv_single_price"
......@@ -68,10 +70,19 @@
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_commision"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:orientation="horizontal">
<TextView
......@@ -87,18 +98,12 @@
android:textColor="@color/common_red" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/btn_share"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@drawable/btn_green_commom"
android:gravity="center">
......@@ -115,15 +120,16 @@
android:id="@+id/award"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:layout_gravity="right"
android:layout_marginStart="10dp"
android:background="@drawable/btn_blue_react_4"
android:gravity="center"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="申请商机奖励"
android:textColor="@color/white" />
android:text="贡献商机拿奖金"
android:textColor="@color/white"
android:visibility="gone"/>
</RelativeLayout>
......
saleCenter/src/main/res/layout/item_sale_reward.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="10dp"
android:gravity="center|left"
android:textColor="@color/common_red"/>
</LinearLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/activity_user_licence.xml
......@@ -14,7 +14,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/text_title"
android:text="@string/tab_business" />
android:text="@string/tab_business_title" />
<ImageView
android:visibility="gone"
......
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