diff --git a/app/build.gradle b/app/build.gradle index f09edc1..0173504 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,8 +59,8 @@ android { buildTypes { debug { signingConfig signingConfigs.release -// buildConfigField "String", "DOMAIN", '"http://192.168.18.74:8080"' - buildConfigField "String", "DOMAIN", '"http://47.109.205.240:8080"' + buildConfigField "String", "DOMAIN", '"http://192.168.18.99:8080"' +// buildConfigField "String", "DOMAIN", '"http://47.109.205.240:8080"' jniDebuggable false zipAlignEnabled false } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4655e1..01a864a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -228,6 +228,11 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:exported="false" android:screenOrientation="portrait" /> + { funcAdapter.setOnItemClickListener((baseQuickAdapter, view, i) -> { if (i == 1) { IntentUtil.startActivity(mContext, LandActivity.class); + } else if (i == 2) { + IntentUtil.startActivity(mContext, InputGoodsListActivity.class); + } else if (i == 3) { + IntentUtil.startActivity(mContext, BusinessManagementActivity.class); } }); } diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/BusinessManagementActivity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/BusinessManagementActivity.java new file mode 100644 index 0000000..0931066 --- /dev/null +++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/BusinessManagementActivity.java @@ -0,0 +1,157 @@ +package com.tairui.gov_affairs_cloud.ui.nyscjyzt; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.rxjava.rxlife.RxLife; +import com.tairui.gov_affairs_cloud.R; +import com.tairui.gov_affairs_cloud.base.BaseActivity; +import com.tairui.gov_affairs_cloud.databinding.ActivityBusinessManagementListBinding; +import com.tairui.gov_affairs_cloud.entity.Api; +import com.tairui.gov_affairs_cloud.http.OnError; +import com.tairui.gov_affairs_cloud.ui.input.InputGoodsDetailActivity; +import com.tairui.gov_affairs_cloud.ui.nyscjyzt.entity.BusinessManagementEntity; +import com.tairui.gov_affairs_cloud.util.ArrayUtil; +import com.tairui.gov_affairs_cloud.util.IntentUtil; +import com.tairui.gov_affairs_cloud.util.SingleClickListener; +import com.tairui.gov_affairs_cloud.util.ToastUtil; +import com.tairui.gov_affairs_cloud.widget.RefreshRecyclerView; + +import android.os.Bundle; +import android.view.View; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import rxhttp.RxHttp; +import rxhttp.RxHttpNoBodyParam; + +/** + * 企业管理 + */ +public class BusinessManagementActivity extends BaseActivity { + private BusinessManagementAdapter adapter; + private int currentPageIndex = 1; + + @Override + protected Class getBindingClass() { + return ActivityBusinessManagementListBinding.class; + } + + @Override + protected void onQueryArguments() { + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.refreshRecycler.setRefreshRecyclerListener(new RefreshRecyclerView.RefreshRecyclerListener() { + @Override + public void onRefresh() { + currentPageIndex = 1; + requestData(false); + } + + @Override + public void onLoadmore() { + requestData(true); + } + + @Override + public void onBlankClick() { + binding.refreshRecycler.showLoading(); + currentPageIndex = 1; + requestData(false); + } + }); + adapter.setOnItemClickListener((baseQuickAdapter, view, i) -> { + IntentUtil.startActivity(mContext, InputGoodsDetailActivity.class); + }); + } + + @Override + protected void onFindView(Bundle savedInstanceState) { + binding.refreshRecycler.setLayoutManager(new LinearLayoutManager(mContext)); + adapter = new BusinessManagementAdapter(); + binding.refreshRecycler.setAdapter(adapter); + } + + @Override + protected void onApplyData() { + binding.refreshRecycler.showLoading(); + currentPageIndex = 1; + requestData(false); + } + + + private void requestData(boolean loadmore) { + RxHttpNoBodyParam http = RxHttp.get(Api.BUSINESS_MANAGEMENT_LIST); + http.add("pageNum", currentPageIndex) + .add("pageSize", Api.SIZE_PAGE) + .asResponse(BusinessManagementEntity.class) + .as(RxLife.asOnMain(this)) + .subscribe(data -> { + if (loadmore) { + binding.refreshRecycler.finishLoadMore(); + } + if (!ArrayUtil.isEmpty(data.getRecords())) { + if (loadmore) { + adapter.addData(data.getRecords()); + } else { + adapter.setNewData(data.getRecords()); + } + currentPageIndex += 1; + if (ArrayUtil.size(data.getRecords()) < Api.SIZE_PAGE) { + binding.refreshRecycler.setNoMoreData(true); + } else { + binding.refreshRecycler.setNoMoreData(false); + } + binding.refreshRecycler.showContent(); + } else { + binding.refreshRecycler.showError(); + binding.refreshRecycler.setNoMoreData(true); + } + }, (OnError) error -> { + binding.refreshRecycler.showError(); + binding.refreshRecycler.setNoMoreData(true); + ToastUtil.showLongToast(error.getErrorMsg()); + }); + } + + private class BusinessManagementAdapter extends BaseQuickAdapter { + + public BusinessManagementAdapter() { + super(R.layout.item_list_business_management); + } + + @Override + protected void convert(@NonNull BaseViewHolder holder, BusinessManagementEntity.RecordsEntity entity) { + holder.setText(R.id.tvName, entity.getBusinessName()); + //0-待提交 1-待审核 2-已通过 3-已驳回 + if (entity.getStatus().equals("2")) { + holder.setText(R.id.tvStatus, "已通过"); + holder.setBackgroundRes(R.id.tvStatus, R.drawable.bg_container_light_green_raduis_2); + holder.setTextColor(R.id.tvStatus, getResColor(R.color.color_txt_green)); + } else if (entity.getStatus().equals("1")) { + holder.setText(R.id.tvStatus, "待审核"); + holder.setBackgroundRes(R.id.tvStatus, R.drawable.bg_container_light_blue_raduis_2); + holder.setTextColor(R.id.tvStatus, getResColor(R.color.color_txt_blue)); + } else if (entity.getStatus().equals("3")) { + holder.setText(R.id.tvStatus, "已驳回"); + holder.setBackgroundRes(R.id.tvStatus, R.drawable.bg_container_light_orange_raduis_2); + holder.setTextColor(R.id.tvStatus, getResColor(R.color.color_txt_orange)); + } else if (entity.getStatus().equals("0")) { + holder.setText(R.id.tvStatus, "待提交"); + holder.setBackgroundRes(R.id.tvStatus, R.drawable.bg_container_light_gray_raduis_2); + holder.setTextColor(R.id.tvStatus, getResColor(R.color.color_tv_content)); + } + holder.setText(R.id.tvComType, entity.getComType()); + holder.setText(R.id.tvArea, entity.getArea() + "亩"); + holder.setText(R.id.tvScope, "经营品类：" + entity.getBusinessScope()); + holder.setText(R.id.tvPerson, entity.getContactPerson() + " " + entity.getPhone()); + holder.setText(R.id.tvAddress, entity.getRegAddress()); + } + } +} diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/entity/BusinessManagementEntity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/entity/BusinessManagementEntity.java new file mode 100644 index 0000000..b3b0e41 --- /dev/null +++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/entity/BusinessManagementEntity.java @@ -0,0 +1,582 @@ +package com.tairui.gov_affairs_cloud.ui.nyscjyzt.entity; + +import java.util.List; + +import com.google.gson.annotations.SerializedName; + +public class BusinessManagementEntity { + + @SerializedName("total") + private Integer total; + @SerializedName("size") + private Integer size; + @SerializedName("current") + private Integer current; + @SerializedName("optimizeCountSql") + private Boolean optimizeCountSql; + @SerializedName("searchCount") + private Boolean searchCount; + @SerializedName("maxLimit") + private Object maxLimit; + @SerializedName("countId") + private Object countId; + @SerializedName("pages") + private Integer pages; + @SerializedName("records") + private List records; + @SerializedName("orders") + private List orders; + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public Integer getCurrent() { + return current; + } + + public void setCurrent(Integer current) { + this.current = current; + } + + public Boolean isOptimizeCountSql() { + return optimizeCountSql; + } + + public void setOptimizeCountSql(Boolean optimizeCountSql) { + this.optimizeCountSql = optimizeCountSql; + } + + public Boolean isSearchCount() { + return searchCount; + } + + public void setSearchCount(Boolean searchCount) { + this.searchCount = searchCount; + } + + public Object getMaxLimit() { + return maxLimit; + } + + public void setMaxLimit(Object maxLimit) { + this.maxLimit = maxLimit; + } + + public Object getCountId() { + return countId; + } + + public void setCountId(Object countId) { + this.countId = countId; + } + + public Integer getPages() { + return pages; + } + + public void setPages(Integer pages) { + this.pages = pages; + } + + public List getRecords() { + return records; + } + + public void setRecords(List records) { + this.records = records; + } + + public List getOrders() { + return orders; + } + + public void setOrders(List orders) { + this.orders = orders; + } + + public static class RecordsEntity { + @SerializedName("id") + private String id; + @SerializedName("businessName") + private String businessName; + @SerializedName("area") + private String area; + @SerializedName("primaryProduct") + private String primaryProduct; + @SerializedName("contactPerson") + private String contactPerson; + @SerializedName("phone") + private String phone; + @SerializedName("villageCount") + private String villageCount; + @SerializedName("provinceCode") + private String provinceCode; + @SerializedName("cityCode") + private String cityCode; + @SerializedName("countyCode") + private String countyCode; + @SerializedName("townCode") + private String townCode; + @SerializedName("villageCode") + private String villageCode; + @SerializedName("landCount") + private String landCount; + @SerializedName("landNumber") + private String landNumber; + @SerializedName("landId") + private String landId; + @SerializedName("landName") + private String landName; + @SerializedName("gridCode") + private String gridCode; + @SerializedName("planCrop") + private String planCrop; + @SerializedName("cooperativePhoto") + private String cooperativePhoto; + @SerializedName("businessLicence") + private String businessLicence; + @SerializedName("comName") + private String comName; + @SerializedName("uscc") + private String uscc; + @SerializedName("legalRep") + private String legalRep; + @SerializedName("registrationStatus") + private String registrationStatus; + @SerializedName("comType") + private String comType; + @SerializedName("estDate") + private String estDate; + @SerializedName("regAuthority") + private String regAuthority; + @SerializedName("totalCapital") + private String totalCapital; + @SerializedName("approveDate") + private String approveDate; + @SerializedName("regAddress") + private String regAddress; + @SerializedName("businessDate") + private String businessDate; + @SerializedName("businessScope") + private String businessScope; + @SerializedName("liabilities") + private String liabilities; + @SerializedName("profit") + private String profit; + @SerializedName("cashFlow") + private String cashFlow; + @SerializedName("creditEvaluation") + private Integer creditEvaluation; + @SerializedName("supportedFarmers") + private Integer supportedFarmers; + @SerializedName("socialImpact") + private Integer socialImpact; + @SerializedName("techApplication") + private Integer techApplication; + @SerializedName("productQuality") + private Integer productQuality; + @SerializedName("reason") + private String reason; + @SerializedName("status") + private String status; + @SerializedName("address") + private String address; + @SerializedName("createTime") + private String createTime; + @SerializedName("createUser") + private String createUser; + @SerializedName("updateTime") + private String updateTime; + @SerializedName("updateUser") + private String updateUser; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBusinessName() { + return businessName; + } + + public void setBusinessName(String businessName) { + this.businessName = businessName; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPrimaryProduct() { + return primaryProduct; + } + + public void setPrimaryProduct(String primaryProduct) { + this.primaryProduct = primaryProduct; + } + + public String getContactPerson() { + return contactPerson; + } + + public void setContactPerson(String contactPerson) { + this.contactPerson = contactPerson; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getVillageCount() { + return villageCount; + } + + public void setVillageCount(String villageCount) { + this.villageCount = villageCount; + } + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getCountyCode() { + return countyCode; + } + + public void setCountyCode(String countyCode) { + this.countyCode = countyCode; + } + + public String getTownCode() { + return townCode; + } + + public void setTownCode(String townCode) { + this.townCode = townCode; + } + + public String getVillageCode() { + return villageCode; + } + + public void setVillageCode(String villageCode) { + this.villageCode = villageCode; + } + + public String getLandCount() { + return landCount; + } + + public void setLandCount(String landCount) { + this.landCount = landCount; + } + + public String getLandNumber() { + return landNumber; + } + + public void setLandNumber(String landNumber) { + this.landNumber = landNumber; + } + + public String getLandId() { + return landId; + } + + public void setLandId(String landId) { + this.landId = landId; + } + + public String getLandName() { + return landName; + } + + public void setLandName(String landName) { + this.landName = landName; + } + + public String getGridCode() { + return gridCode; + } + + public void setGridCode(String gridCode) { + this.gridCode = gridCode; + } + + public String getPlanCrop() { + return planCrop; + } + + public void setPlanCrop(String planCrop) { + this.planCrop = planCrop; + } + + public String getCooperativePhoto() { + return cooperativePhoto; + } + + public void setCooperativePhoto(String cooperativePhoto) { + this.cooperativePhoto = cooperativePhoto; + } + + public String getBusinessLicence() { + return businessLicence; + } + + public void setBusinessLicence(String businessLicence) { + this.businessLicence = businessLicence; + } + + public String getComName() { + return comName; + } + + public void setComName(String comName) { + this.comName = comName; + } + + public String getUscc() { + return uscc; + } + + public void setUscc(String uscc) { + this.uscc = uscc; + } + + public String getLegalRep() { + return legalRep; + } + + public void setLegalRep(String legalRep) { + this.legalRep = legalRep; + } + + public String getRegistrationStatus() { + return registrationStatus; + } + + public void setRegistrationStatus(String registrationStatus) { + this.registrationStatus = registrationStatus; + } + + public String getComType() { + return comType; + } + + public void setComType(String comType) { + this.comType = comType; + } + + public String getEstDate() { + return estDate; + } + + public void setEstDate(String estDate) { + this.estDate = estDate; + } + + public String getRegAuthority() { + return regAuthority; + } + + public void setRegAuthority(String regAuthority) { + this.regAuthority = regAuthority; + } + + public String getTotalCapital() { + return totalCapital; + } + + public void setTotalCapital(String totalCapital) { + this.totalCapital = totalCapital; + } + + public String getApproveDate() { + return approveDate; + } + + public void setApproveDate(String approveDate) { + this.approveDate = approveDate; + } + + public String getRegAddress() { + return regAddress; + } + + public void setRegAddress(String regAddress) { + this.regAddress = regAddress; + } + + public String getBusinessDate() { + return businessDate; + } + + public void setBusinessDate(String businessDate) { + this.businessDate = businessDate; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getLiabilities() { + return liabilities; + } + + public void setLiabilities(String liabilities) { + this.liabilities = liabilities; + } + + public String getProfit() { + return profit; + } + + public void setProfit(String profit) { + this.profit = profit; + } + + public String getCashFlow() { + return cashFlow; + } + + public void setCashFlow(String cashFlow) { + this.cashFlow = cashFlow; + } + + public Integer getCreditEvaluation() { + return creditEvaluation; + } + + public void setCreditEvaluation(Integer creditEvaluation) { + this.creditEvaluation = creditEvaluation; + } + + public Integer getSupportedFarmers() { + return supportedFarmers; + } + + public void setSupportedFarmers(Integer supportedFarmers) { + this.supportedFarmers = supportedFarmers; + } + + public Integer getSocialImpact() { + return socialImpact; + } + + public void setSocialImpact(Integer socialImpact) { + this.socialImpact = socialImpact; + } + + public Integer getTechApplication() { + return techApplication; + } + + public void setTechApplication(Integer techApplication) { + this.techApplication = techApplication; + } + + public Integer getProductQuality() { + return productQuality; + } + + public void setProductQuality(Integer productQuality) { + this.productQuality = productQuality; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + } +} diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/workspace/WorkSpaceFragment.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/workspace/WorkSpaceFragment.java index 5c26467..f16922c 100644 --- a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/workspace/WorkSpaceFragment.java +++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/workspace/WorkSpaceFragment.java @@ -16,6 +16,7 @@ import com.tairui.gov_affairs_cloud.ui.land.InspectionListActivity; import com.tairui.gov_affairs_cloud.ui.land.LandActivity; import com.tairui.gov_affairs_cloud.ui.land.LandResouceInfoActivity; import com.tairui.gov_affairs_cloud.ui.land.PlantPlanActivity; +import com.tairui.gov_affairs_cloud.ui.nyscjyzt.BusinessManagementActivity; import com.tairui.gov_affairs_cloud.ui.workspace.entity.WorkSpaceEntity; import com.tairui.gov_affairs_cloud.util.IntentUtil; @@ -81,6 +82,8 @@ public class WorkSpaceFragment extends BaseFragment { IntentUtil.startActivity(mContext, InputGoodsListActivity.class); } else if (_id == 11) { IntentUtil.startActivity(mContext, UtilizationControlActivity.class); + } else if (_id == 15) { + IntentUtil.startActivity(mContext, BusinessManagementActivity.class); } }); } @@ -198,7 +201,7 @@ public class WorkSpaceFragment extends BaseFragment { itemFunc = new WorkSpaceEntity.FuncsEntity(); itemFunc.setId(15); - itemFunc.setName("农企合作社"); + itemFunc.setName("企业管理"); itemFunc.setIcon(R.mipmap.ic_workspace_func_15); funcs.add(itemFunc); diff --git a/app/src/main/res/layout/activity_business_management_list.xml b/app/src/main/res/layout/activity_business_management_list.xml new file mode 100644 index 0000000..3ed0e30 --- /dev/null +++ b/app/src/main/res/layout/activity_business_management_list.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_list_business_management.xml b/app/src/main/res/layout/item_list_business_management.xml new file mode 100644 index 0000000..a9f9579 --- /dev/null +++ b/app/src/main/res/layout/item_list_business_management.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + +