Skip to content

W
workoffice
提交 f0068b42 authored 作者: lgd's avatar lgd
浏览文件
操作

1.工作台产品 

2.//TODO erp用户激活，忘记密码测试，搜索调试，产品下单，产品两个弹窗详情，bat，mes，消息，我的，刷新token
上级 00cd1667
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 980 行增加 和 31 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ f0068b42
......@@ -233,6 +233,46 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.InsideOrderSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.OutOrderSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.SaleOrderSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.SupplierOrderSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkProActivity"
android:configChanges="keyboardHidden|orientation"
android:label="产品"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/app/Config.java
浏览文件 @ f0068b42
......@@ -6,7 +6,6 @@ public interface Config {
String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";
String APPID = "wx15bd4f8f85329782";
String[] TABLIST = new String[]{"区域", "均价", "首付", "更多"};
String CHINA_AREA_DATA = "CHINA_AREA_DATA";//全国省市区数据
String BUILDING_AVERAGE_PRICE = "BUILDING_AVERAGE_PRICE";//楼盘均价
......
app/src/main/java/com/wd/workoffice/bean/listener/ProFilterClickListener.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.bean.listener;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public interface ProFilterClickListener {
public void clickStatus(String value);
public void clickProcess(String value);
public void clickOnSale(String value);
}
app/src/main/java/com/wd/workoffice/contract/WorkProContract.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.contract;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.StockBean;
import java.util.List;
import java.util.Map;
import flexible.xd.android_base.mvpBase.IBaseModel;
import flexible.xd.android_base.mvpBase.IBasePresenter;
import flexible.xd.android_base.mvpBase.IBaseView;
import io.reactivex.Observable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public interface WorkProContract {
interface Model extends IBaseModel {
Observable<BaseBean> getPro(Map<String, Object> param);
}
interface View extends IBaseView {
void getPro(List<ProductBean.RecordsBean> dataList);
}
interface Presenter extends IBasePresenter<View> {
void getPro(Map<String, Object> param);
}
}
app/src/main/java/com/wd/workoffice/model/WorkProModel.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.model;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.retrofit.RtfUtils;
import java.util.Map;
import io.reactivex.Observable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkProModel implements WorkProContract.Model {
@Override
public Observable<BaseBean> getPro(Map<String, Object> param) {
return RtfUtils.getRtf().getPro(param);
}
public static WorkProModel newInstance() {
return new WorkProModel();
}
}
app/src/main/java/com/wd/workoffice/presenter/WorkProPresenter.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.presenter;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.model.WorkProModel;
import com.wd.workoffice.retrofit.WorkObserver;
import java.util.Map;
import flexible.xd.android_base.mvpBase.BasePresenter;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkProPresenter extends BasePresenter<WorkProContract.View, WorkProContract.Model> implements WorkProContract.Presenter {
@Override
public void getPro(Map<String, Object> param) {
mView.showLoading();
mModel.getPro(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
mDisposable.add(d);
}
@Override
public void onFail(String errorMsg) {
mView.hideLoading();
mView.onError(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
mView.hideLoading();
if (data.getCode() != 0) {
mView.onError(data.getMessage());
return;
}
mView.getPro(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), ProductBean.RecordsBean.class));
}
});
}
@Override
public WorkProContract.Model bindModel() {
return WorkProModel.newInstance();
}
}
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ f0068b42
......@@ -238,7 +238,7 @@ public interface ApiService {
*
* @param outDeptId
* @param transitPartId 销售订单（客户id），外采购订单（供应商id）
*
* <p>
* processType 销售流程PROCESS_SALE
* 外采购流程PROCESS_PURCHAS
* @return
......@@ -267,6 +267,7 @@ public interface ApiService {
*/
@GET("/sys/user/userInfo")
Observable<BaseBean> userInfo();
/**
* 订单
*
......@@ -300,7 +301,6 @@ public interface ApiService {
Observable<BaseBean> getOutOrder(@QueryMap Map<String, Object> param);
/**
*
* 内部
*
* @param orderStatus app端订单筛选：
......@@ -330,4 +330,19 @@ public interface ApiService {
*/
@GET("/supplierOrder/current-user/page/list")
Observable<BaseBean> getSupplierOrder(@QueryMap Map<String, Object> param);
/**
* 产品列表
*
* @param processType
* @param ofKind 产品种类SM:自制成品OS:外购贴牌RM:原料
* @param statu 冻结标记0冻结1正常
* @param isExpectOut 是否上架true:上架false:未上架
* @param searchValue 模糊搜索（图号、名称）
* @return
*/
@GET("product/app/page/list")
Observable<BaseBean> getPro(@QueryMap Map<String, Object> param);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/OutOrderSearchActivity.java
浏览文件 @ f0068b42
......@@ -79,6 +79,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
@Override
protected void initEvent() {
if (TextUtils.equals(identity, "1")) {
saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -86,6 +87,16 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
saleSalePresenter.getInsideOrder(param);
}
}, rvData);
} else {
proAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
}
}, rvData);
}
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/SaleOrderSearchActivity.java
浏览文件 @ f0068b42
......@@ -80,6 +80,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@Override
protected void initEvent() {
if (TextUtils.equals(identity, "1")) {
saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -87,6 +88,16 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
saleSalePresenter.getInsideOrder(param);
}
}, rvData);
} else {
proAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
}
}, rvData);
}
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/SupplierOrderSearchActivity.java
浏览文件 @ f0068b42
......@@ -80,6 +80,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@Override
protected void initEvent() {
if (TextUtils.equals(identity, "1")) {
saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
......@@ -87,6 +88,15 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
saleSalePresenter.getInsideOrder(param);
}
}, rvData);
} else {
proAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
}
}, rvData);
}
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductInsideOrderActivity.java
浏览文件 @ f0068b42
......@@ -71,7 +71,7 @@ public class ProductInsideOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductOutOrderActivity.java
浏览文件 @ f0068b42
......@@ -7,11 +7,9 @@ import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProOutFragment;
import com.wd.workoffice.ui.fg.SaleOutFragment;
import java.util.ArrayList;
import java.util.List;
......@@ -75,7 +73,7 @@ public class ProductOutOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductSaleOrderActivity.java
浏览文件 @ f0068b42
......@@ -7,6 +7,7 @@ import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.SaleOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProSaleFragment;
......@@ -69,7 +70,7 @@ public class ProductSaleOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductSupplierOrderActivity.java
浏览文件 @ f0068b42
......@@ -7,6 +7,7 @@ import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.ProSupplierFragment;
......@@ -69,7 +70,7 @@ public class ProductSupplierOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleInsideOrderActivity.java
浏览文件 @ f0068b42
......@@ -10,7 +10,6 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleInsideFragment;
import com.wd.workoffice.ui.fg.SaleSaleFragment;
import java.util.ArrayList;
import java.util.List;
......@@ -70,7 +69,7 @@ public class SaleInsideOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleOutOrderActivity.java
浏览文件 @ f0068b42
......@@ -7,11 +7,9 @@ import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleOutFragment;
import com.wd.workoffice.ui.fg.SaleSaleFragment;
import java.util.ArrayList;
import java.util.List;
......@@ -73,7 +71,7 @@ public class SaleOutOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleSaleOrderActivity.java
浏览文件 @ f0068b42
......@@ -7,6 +7,7 @@ import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.SaleOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleSaleFragment;
......@@ -69,7 +70,7 @@ public class SaleSaleOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleSupplierOrderActivity.java
浏览文件 @ f0068b42
......@@ -7,6 +7,7 @@ import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleSupplierFragment;
......@@ -67,7 +68,7 @@ public class SaleSupplierOrderActivity extends WorkToolBarActivity {
@Override
protected int layoutId() {
return R.layout.activity_sale_sale;
return R.layout.activity_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProActivity.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.SaleOutFragment;
import com.wd.workoffice.ui.fg.WorkProFragment;
import java.util.ArrayList;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 工作台 - 产品
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkProActivity extends WorkToolBarActivity {
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
// private String tab[] = {"全部状态", "正常", "冻结"};
private String tab[] = {"外购产品", "自制产品", "原料"};
private String ofKind[] = {"OS", "SM", "RM"};
@Override
protected void initView() {
ButterKnife.bind(this);
tlTab.setupWithViewPager(vpData);
}
@Override
protected void initData() {
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) {
WorkProFragment saleFragment = new WorkProFragment();
Bundle bundle = new Bundle();
bundle.putString("ofKind", ofKind[i]);
saleFragment.setArguments(bundle);
data.add(saleFragment);
}
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.length; i++) {
tlTab.getTabAt(i).setText(tab[i]);
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_pro;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivity(OutOrderSearchActivity.class, "identity", "1", "", "");
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/FilterAdapter.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.ui.adapter;
import android.graphics.Color;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class FilterAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
public int choosePos = 0;
public FilterAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
public int getChoosePos() {
return choosePos;
}
public void setChoosePos(int choosePos) {
this.choosePos = choosePos;
}
@Override
protected void convert(BaseViewHolder helper, String item) {
if (helper.getAdapterPosition() == choosePos) {
helper.setBackgroundColor(R.id.tv_name, Color.parseColor("#ffeaf3fe"));
helper.setTextColor(R.id.tv_name, Color.parseColor("#2F89FC"));
} else {
helper.setTextColor(R.id.tv_name, helper.itemView.getContext().getResources().
getColor(R.color.flexible_text_color));
helper.setBackgroundColor(R.id.tv_name, Color.WHITE);
}
helper.setText(R.id.tv_name, item);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkProductAdapter.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> {
public WorkProductAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getSimpleCode());
helper.setText(R.id.tv_card, "品号:"+item.getSoleCode());
// helper.setText(R.id.tv_img_card, "图号:"+item.get());
helper.setText(R.id.tv_spec, "规格:"+item.getSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInternalPrice())));
helper.addOnClickListener(R.id.btn_modify);
helper.addOnClickListener(R.id.btn_on_sale);
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MainFragment.java
浏览文件 @ f0068b42
......@@ -24,6 +24,7 @@ import com.wd.workoffice.ui.activity.bat.sale.SaleInsideOrderActivity;
import com.wd.workoffice.ui.activity.bat.sale.SaleOutOrderActivity;
import com.wd.workoffice.ui.activity.bat.sale.SaleSaleOrderActivity;
import com.wd.workoffice.ui.activity.bat.sale.SaleSupplierOrderActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
import com.wd.workoffice.util.UserKeeper;
......@@ -235,7 +236,26 @@ public class MainFragment extends WorkBaseFg {
});
break;
case R.id.rv_work:
batLayoutAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (position) {
case 0:
startActivity(WorkProActivity.class);
break;
case 1:
break;
case 2:
break;
case 3:
break;
case 4:
break;
case 5:
break;
}
}
});
break;
case R.id.rv_approval:
break;
......
app/src/main/java/com/wd/workoffice/ui/fg/ProOutFragment.java
浏览文件 @ f0068b42
......@@ -9,7 +9,6 @@ import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProOutAdapter;
import com.wd.workoffice.ui.adapter.SaleOutAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -74,7 +73,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/ProSaleFragment.java
浏览文件 @ f0068b42
......@@ -9,7 +9,6 @@ import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProSaleAdapter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -74,7 +73,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/ProSupplierFragment.java
浏览文件 @ f0068b42
......@@ -9,7 +9,6 @@ import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -74,7 +73,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleInsideFragment.java
浏览文件 @ f0068b42
......@@ -9,7 +9,6 @@ import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -74,7 +73,7 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleOutFragment.java
浏览文件 @ f0068b42
......@@ -9,7 +9,6 @@ import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleOutAdapter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -74,7 +73,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java
浏览文件 @ f0068b42
......@@ -9,7 +9,6 @@ import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.ui.adapter.StoreClientAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -74,7 +73,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleSupplierFragment.java
浏览文件 @ f0068b42
......@@ -8,7 +8,6 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -74,7 +73,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
@Override
protected int layoutId() {
return R.layout.fg_sale_sale;
return R.layout.fg_order;
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkProFragment.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import android.text.TextUtils;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.listener.ProFilterClickListener;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.presenter.WorkProPresenter;
import com.wd.workoffice.ui.adapter.WorkProductAdapter;
import com.wd.workoffice.util.ProFilterData;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkProFragment extends WorkBaseFg implements WorkProContract.View {
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private String ofKind;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private WorkProPresenter workProPresenter;
private WorkProductAdapter workProductAdapter;
private List<ProductBean.RecordsBean> dataList;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
workProPresenter = new WorkProPresenter();
workProPresenter.onAttach(this);
ProFilterData filterData = new ProFilterData(ddmChoose, new ProFilterClickListener() {
@Override
public void clickStatus(String value) {
if (TextUtils.equals(value, "全部状态")) {
param.put("status", "");
} else if (TextUtils.equals(value, "正常")) {
param.put("status", "1");
} else {
param.put("status", "0");
}
page = 1;
param.put("current", page);
workProPresenter.getPro(param);
}
@Override
public void clickProcess(String value) {
if (TextUtils.equals(value, "全部状态")) {
param.put("status", "");
} else if (TextUtils.equals(value, "正常")) {
param.put("status", "1");
} else {
param.put("status", "0");
}
page = 1;
param.put("page", page);
workProPresenter.getPro(param);
}
@Override
public void clickOnSale(String value) {
if (TextUtils.equals(value, "全部")) {
param.put("isExpectOut", "");
} else if (TextUtils.equals(value, "已上架")) {
param.put("isExpectOut", true);
} else {
param.put("isExpectOut", false);
}
page = 1;
param.put("current", page);
workProPresenter.getPro(param);
}
});
rvData = filterData.getRvData();
srlRefresh = filterData.getSrlRefresh();
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
param.put("ofKind", ofKind);
dataList = new ArrayList<>();
workProductAdapter = new WorkProductAdapter(R.layout.item_work_product, dataList);
workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content,rvData);
workProPresenter.getPro(param);
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
ofKind = arguments.getString("ofKind");
}
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
workProPresenter.getPro(param);
});
workProductAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
workProPresenter.getPro(param);
}, rvData);
}
@Override
protected int layoutId() {
return R.layout.fg_work_pro;
}
@Override
public void getPro(List<ProductBean.RecordsBean> data) {
if (page == 1) {
dataList.clear();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
workProductAdapter.loadMoreComplete();
} else {
workProductAdapter.loadMoreComplete();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
}
if (data.size() == 0) {
workProductAdapter.loadMoreEnd();
} else {
page++;
}
}
}
app/src/main/java/com/wd/workoffice/util/ProFilterData.java 0 → 100644
浏览文件 @ f0068b42
package com.wd.workoffice.util;
import android.view.LayoutInflater;
import android.view.View;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.ProFilterClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class ProFilterData {
DropDownMenu menu;
private List<View> viewList;
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
private List<String> statusList = Arrays.asList("全部状态", "正常", "冻结");
private List<String> processList = Arrays.asList("全部流程", "外采购流程", "供应流程", "销售流程", "坩埚流程");
private List<String> onSaleList = Arrays.asList("全部", "已上架", "未上架");
ProFilterClickListener listener;
String[] TABLIST = new String[]{"全部状态", "全部流程", "是否上架"};
public ProFilterData(DropDownMenu menu, ProFilterClickListener listener) {
this.menu = menu;
this.listener = listener;
initView();
}
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(statusList, 1);
addTabView(processList, 1);
addTabView(onSaleList, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
private void addTabView(List<String> dataList, int type) {
View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
RecyclerView rvData = view.findViewById(R.id.rv_filter);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
FilterAdapter filterAdapter = new FilterAdapter(R.layout.item_filter, dataList);
filterAdapter.bindToRecyclerView(rvData);
viewList.add(view);
filterAdapter.setOnItemClickListener((adapter, v, position) -> {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
if (listener != null) {
switch (type) {
case 1:
listener.clickStatus(dataList.get(position));
break;
case 2:
listener.clickProcess(dataList.get(position));
break;
case 3:
listener.clickOnSale(dataList.get(position));
break;
}
}
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
});
}
public SmartRefreshLayout getSrlRefresh() {
return srlRefresh;
}
public void setSrlRefresh(SmartRefreshLayout srlRefresh) {
this.srlRefresh = srlRefresh;
}
public RecyclerView getRvData() {
return rvData;
}
public void setRvData(RecyclerView rvData) {
this.rvData = rvData;
}
}
app/src/main/res/drawable/selector_btn_color.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 圆角弧度-->
<corners android:radius="4dp" />
<!-- 填充的颜色 -->
<solid android:color="#ffebebeb" />
</shape>
</item>
<item android:state_pressed="true">
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 圆角弧度-->
<corners android:radius="4dp" />
<!-- 填充的颜色 -->
<solid android:color="#6032475C" />
</shape>
</item>
<item android:state_pressed="false">
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 圆角弧度-->
<corners android:radius="4dp" />
<!-- 填充的颜色 -->
<solid android:color="@color/mainTextColor" />
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_pro.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tl_tab"
android:layout_width="match_parent"
android:layout_height="48mm"
android:background="@android:color/white"
app:tabBackground="@android:color/white"
app:tabGravity="fill"
app:tabIndicatorColor="@color/mainTextColor"
app:tabIndicatorFullWidth="false"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/mainTextColor"
app:tabTextAppearance="@style/tabText"
app:tabTextColor="#75899B" />
<View style="@style/dividerX" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/vp_data"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/fg_work_pro.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.wd.workoffice.widget.DropDownMenu
android:id="@+id/ddm_choose"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:dddividerColor="@color/divider"
app:ddmaskColor="#4d000000"
app:ddmenuBackgroundColor="@color/white"
app:ddmenuMenuHeightPercent="0.5"
app:ddmenuSelectedIcon="@mipmap/main_top"
app:ddmenuTextSize="13sp"
app:ddmenuUnselectedIcon="@mipmap/main_down"
app:ddtextSelectedColor="@color/mainTextColor"
app:ddtextUnselectedColor="@color/main_icon_select"
app:ddunderlineColor="@color/white" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_filter.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="40mm"
android:gravity="center">
</TextView>
\ No newline at end of file
app/src/main/res/layout/item_work_product.xml 0 → 100644
浏览文件 @ f0068b42
<?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:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="图号TH82739857"
android:textColor="@color/black"
android:textSize="16sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8mm">
<TextView
android:id="@+id/tv_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_img_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4mm"
android:text="图号:"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4mm"
android:text="规格:"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="10mm">
<Button
android:id="@+id/btn_modify"
android:layout_width="wrap_content"
android:layout_height="25mm"
android:layout_marginRight="5mm"
android:background="@drawable/selector_btn_color"
android:text="修改价格"
android:textColor="@android:color/white"
android:textSize="13sp" />
<Button
android:id="@+id/btn_on_sale"
android:layout_width="wrap_content"
android:layout_height="25mm"
android:background="@drawable/selector_btn_color"
android:text="上架"
android:textColor="@android:color/white"
android:textSize="13sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/view_empty_content.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@android:color/white"
android:orientation="vertical"
android:layout_height="match_parent"
android:gravity="center">
<ImageView
android:layout_width="150mm"
android:layout_height="150mm"
android:src="@mipmap/empty_view" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂时没有数据"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:textColor="@color/flexible_text_sup"
android:text="请稍后再试试"/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/view_filter_pro.xml 0 → 100644
浏览文件 @ f0068b42
<?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="match_parent"
android:background="@android:color/white">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_filter"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/view_pro.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/srl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file
app/src/main/res/values/attrs.xml 0 → 100644
浏览文件 @ f0068b42
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="DropDownMenu">
<attr name="ddunderlineColor" format="color" />
<attr name="dddividerColor" format="color" />
<attr name="ddtextSelectedColor" format="color" />
<attr name="ddtextUnselectedColor" format="color" />
<attr name="ddmenuBackgroundColor" format="color" />
<attr name="ddmaskColor" format="color" />
<attr name="ddmenuTextSize" format="dimension" />
<attr name="ddmenuSelectedIcon" format="reference" />
<attr name="ddmenuUnselectedIcon" format="reference" />
<attr name="ddmenuMenuHeightPercent" format="float" />
</declare-styleable>
<declare-styleable name="AndroidTagView">
<attr name="vertical_interval" format="dimension" />
<attr name="horizontal_interval" format="dimension" />
<attr name="container_border_width" format="dimension" />
<attr name="container_border_radius" format="dimension" />
<attr name="container_border_color" format="color" />
<attr name="container_background_color" format="color" />
<attr name="container_enable_drag" format="boolean" />
<attr name="container_drag_sensitivity" format="float" />
<attr name="container_max_lines" format="integer" />
<attr name="container_gravity" format="enum">
<enum name="left" value="3" />
<enum name="center" value="17" />
<enum name="right" value="5" />
</attr>
<attr name="tag_border_width" format="dimension" />
<attr name="tag_corner_radius" format="dimension" />
<attr name="tag_horizontal_padding" format="dimension" />
<attr name="tag_vertical_padding" format="dimension" />
<attr name="tag_text_size" format="dimension" />
<attr name="tag_bd_distance" format="dimension" />
<attr name="tag_text_color" format="color" />
<attr name="tag_border_color" format="color" />
<attr name="tag_background_color" format="color" />
<attr name="tag_max_length" format="integer" />
<attr name="tag_clickable" format="boolean" />
<attr name="tag_selectable" format="boolean" />
<attr name="tag_theme" format="enum">
<enum name="none" value="-1" />
<enum name="random" value="0" />
<enum name="pure_cyan" value="1" />
<enum name="pure_teal" value="2" />
</attr>
<attr name="tag_text_direction" format="enum" >
<enum name="ltr" value="3" />
<enum name="rtl" value="4" />
</attr>
<attr name="tag_ripple_color" format="color" />
<attr name="tag_ripple_alpha" format="integer" />
<attr name="tag_ripple_duration" format="integer" />
<attr name="tag_enable_cross" format="boolean" />
<attr name="tag_cross_width" format="dimension" />
<attr name="tag_cross_color" format="color" />
<attr name="tag_cross_line_width" format="dimension" />
<attr name="tag_cross_area_padding" format="dimension" />
<attr name="tag_support_letters_rlt" format="boolean" />
<attr name="tag_background" format="reference" />
</declare-styleable>
</resources>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论