Skip to content

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

1.产品搜索 

2.//TODO erp用户激活，忘记密码测试，搜索调试，产品下单，产品两个弹窗详情，bat，mes，消息，我的，刷新token
上级 0ea88127
显示空白字符变更
内嵌 并排
正在显示 包含 278 行增加 和 22 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 675a2d76
......@@ -265,6 +265,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkProSearchActivity"
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"
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/InsideOrderSearchActivity.java
浏览文件 @ 675a2d76
......@@ -3,7 +3,6 @@ package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
......@@ -53,6 +52,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -68,11 +68,10 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
@Override
protected void initData() {
identity = getIntent().getStringExtra("identity");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
orderList = new ArrayList<>();
orderAdapter = new SaleInsideAdapter(R.layout.item_sale_inside, orderList);
orderAdapter.bindToRecyclerView(rvData);
orderAdapter.setEmptyView(R.layout.view_empty_order,rvData);
orderAdapter.setEmptyView(R.layout.view_empty_order, rvData);
param = WorkUtils.pageKey();
param.put("current", page);
param.put("identity", identity);
......@@ -91,7 +90,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
@Override
protected int layoutId() {
return R.layout.activity_order_serarch;
return R.layout.activity_order_search;
}
......@@ -102,6 +101,8 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
toast("请输入搜索关键字");
return;
}
page=1;
param.put("current", page);
param.put("searchValue", key);
saleSalePresenter.getInsideOrder(param);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/OutOrderSearchActivity.java
浏览文件 @ 675a2d76
......@@ -3,7 +3,6 @@ package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
......@@ -12,7 +11,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.SaleInsideAdapter;
import com.wd.workoffice.ui.adapter.SaleOutAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -56,6 +54,8 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -70,9 +70,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
@Override
protected void initData() {
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
identity = getIntent().getStringExtra("identity");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
orderList = new ArrayList<>();
if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleOutAdapter(R.layout.item_sale_out, orderList);
......@@ -113,7 +111,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
@Override
protected int layoutId() {
return R.layout.activity_order_serarch;
return R.layout.activity_order_search;
}
......@@ -124,6 +122,8 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
toast("请输入搜索关键字");
return;
}
page=1;
param.put("current", page);
param.put("searchValue", key);
saleSalePresenter.getOutOrder(param);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/SaleOrderSearchActivity.java
浏览文件 @ 675a2d76
......@@ -3,7 +3,6 @@ package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
......@@ -11,9 +10,7 @@ import com.wd.workoffice.app.WorkBaseActivity;
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.ProSaleAdapter;
import com.wd.workoffice.ui.adapter.SaleOutAdapter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -57,6 +54,8 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -71,9 +70,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@Override
protected void initData() {
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
identity = getIntent().getStringExtra("identity");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
orderList = new ArrayList<>();
if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleSaleAdapter(R.layout.item_sale, orderList);
......@@ -114,7 +111,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@Override
protected int layoutId() {
return R.layout.activity_order_serarch;
return R.layout.activity_order_search;
}
......@@ -125,6 +122,8 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
toast("请输入搜索关键字");
return;
}
page=1;
param.put("current", page);
param.put("searchValue", key);
saleSalePresenter.getOrder(param);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/SupplierOrderSearchActivity.java
浏览文件 @ 675a2d76
......@@ -3,7 +3,6 @@ package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
......@@ -11,9 +10,7 @@ import com.wd.workoffice.app.WorkBaseActivity;
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.ProSupplierAdapter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -57,6 +54,8 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -71,9 +70,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@Override
protected void initData() {
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
identity = getIntent().getStringExtra("identity");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
orderList = new ArrayList<>();
if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleSupplierAdapter(R.layout.item_sale_supplier, orderList);
......@@ -113,7 +110,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@Override
protected int layoutId() {
return R.layout.activity_order_serarch;
return R.layout.activity_order_search;
}
......@@ -124,6 +121,8 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
toast("请输入搜索关键字");
return;
}
page=1;
param.put("current", page);
param.put("searchValue", key);
saleSalePresenter.getSupplierOrder(param);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProActivity.java
浏览文件 @ 675a2d76
......@@ -80,7 +80,7 @@ public class WorkProActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivity(OutOrderSearchActivity.class, "identity", "1", "", "");
startActivity(WorkProSearchActivity.class);
break;
}
return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProSearchActivity.java 0 → 100644
浏览文件 @ 675a2d76
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TableLayout;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.google.android.material.tabs.TabLayout;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.presenter.WorkProPresenter;
import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
import com.wd.workoffice.ui.adapter.WorkProductAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 销售订单搜索
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkProSearchActivity extends WorkBaseActivity implements WorkProContract.View {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.iv_search)
TextView ivSearch;
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private Map<String, Object> param;
private WorkProPresenter workProPresenter;
private WorkProductAdapter workProductAdapter;
private List<ProductBean.RecordsBean> dataList;
private int page = 1;
private String ofKind="OS";
private String tab[] = {"外购产品", "自制产品", "原料"};
private String ofKindArrays[] = {"OS", "SM", "RM"};
@Override
protected void initView() {
ButterKnife.bind(this);
workProPresenter = new WorkProPresenter();
workProPresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
for (int i = 0; i < tab.length; i++) {
TabLayout.Tab newTab = tlTab.newTab();
tlTab.addTab(newTab.setText(tab[i]));
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@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
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);
tlTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
page=1;
ofKind=ofKindArrays[tab.getPosition()];
param.put("ofKind", ofKind);
param.put("current", page);
workProPresenter.getPro(param);
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_pro_search;
}
@OnClick(R.id.iv_search)
public void onViewClicked() {
String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字");
return;
}
page=1;
param.put("current", page);
param.put("searchValue", key);
workProPresenter.getPro(param);
}
@Override
public void getPro(List<ProductBean.RecordsBean> data) {
toast("加载完成");
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/ui/fg/WorkProFragment.java
浏览文件 @ 675a2d76
......@@ -143,6 +143,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
workProductAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
workProductAdapter.loadMoreComplete();
dataList.addAll(data);
......
app/src/main/res/layout/activity_order_serarch.xml → app/src/main/res/layout/activity_order_search.xml
浏览文件 @ 675a2d76
......@@ -32,6 +32,7 @@
android:layout_weight="1"
android:layout_marginVertical="3mm"
android:paddingHorizontal="3mm"
android:hint="输入订单号"
android:textSize="14sp"
android:background="@drawable/shape_client_search" />
......
app/src/main/res/layout/activity_pro_search.xml 0 → 100644
浏览文件 @ 675a2d76
<?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"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:contentInsetEnd="0mm"
app:contentInsetEndWithActions="0mm"
app:contentInsetLeft="0mm"
app:contentInsetRight="0mm"
app:contentInsetStart="0mm"
app:contentInsetStartWithNavigation="0mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingVertical="5mm">
<EditText
android:id="@+id/et_key"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginVertical="3mm"
android:paddingHorizontal="3mm"
android:hint="输入品号、品名、产品名称"
android:textSize="14sp"
android:background="@drawable/shape_client_search" />
<TextView
android:id="@+id/iv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingHorizontal="8mm"
android:text="搜索"
/>
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
<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" />
<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>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论