diff --git a/app/build.gradle b/app/build.gradle
index 1695115..71fe15a 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.99: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 01a864a..6d3bb01 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -233,6 +233,21 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="false"
android:screenOrientation="portrait" />
+
+
+
{
}
private void goMain() {
- // KpLog.getInstance().doSaveEventLog(mContext, true);
- //KpLog.getInstance().onAppStart(mContext);
-
if (null != binding.txtTimerSplash) {
setGone(binding.txtTimerSplash, true);
- countTimer = new CountTimer(3 * 1000, INTERVAL);
+ countTimer = new CountTimer(1 * 1000, INTERVAL);
WeakReference weakTimerCountDowner = new WeakReference<>(countTimer);
if (null != weakTimerCountDowner.get()) {
weakTimerCountDowner.get().start();
diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/login/LoginActivity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/login/LoginActivity.java
index 37c68b7..8f8f740 100644
--- a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/login/LoginActivity.java
@@ -89,6 +89,7 @@ public class LoginActivity extends BaseActivity {
}
} else {
username = binding.inputUserName.getText().toString().trim();
+ userpass = binding.inputUserPass.getText().toString().trim();
if (username.equals("a")) {
username = "admin";
userpass = "admin123";
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
index 0931066..9dba404 100644
--- 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
@@ -8,7 +8,6 @@ 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;
@@ -67,7 +66,7 @@ public class BusinessManagementActivity extends BaseActivity {
- IntentUtil.startActivity(mContext, InputGoodsDetailActivity.class);
+ IntentUtil.startActivity(mContext, BusinessManagementDetailActivity.class);
});
}
@@ -85,7 +84,6 @@ public class BusinessManagementActivity extends BaseActivity {
+
+ @Override
+ protected Class getBindingClass() {
+ return ActivityBusinessManagementDetailBinding.class;
+ }
+
+ @Override
+ protected void onQueryArguments() {
+ }
+
+ @Override
+ protected void onBindListener() {
+ binding.btnBack.setOnClickListener(new SingleClickListener() {
+ @Override
+ protected void onSingleClick(View v) {
+ finish();
+ }
+ });
+ }
+
+}
diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/FarmerManagementActivity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/FarmerManagementActivity.java
new file mode 100644
index 0000000..fb0b13c
--- /dev/null
+++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/FarmerManagementActivity.java
@@ -0,0 +1,73 @@
+package com.tairui.gov_affairs_cloud.ui.nyscjyzt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.tairui.gov_affairs_cloud.R;
+import com.tairui.gov_affairs_cloud.base.BaseActivity;
+import com.tairui.gov_affairs_cloud.databinding.ActivityFarmerManagementListBinding;
+import com.tairui.gov_affairs_cloud.util.IntentUtil;
+import com.tairui.gov_affairs_cloud.util.SingleClickListener;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+/**
+ * 企业管理
+ */
+public class FarmerManagementActivity extends BaseActivity {
+ private FarmerManagementAdapter adapter;
+
+ @Override
+ protected Class getBindingClass() {
+ return ActivityFarmerManagementListBinding.class;
+ }
+
+ @Override
+ protected void onQueryArguments() {
+ }
+
+ @Override
+ protected void onFindView(Bundle savedInstanceState) {
+ binding.refreshRecycler.setLayoutManager(new LinearLayoutManager(mContext));
+ adapter = new FarmerManagementAdapter();
+ binding.refreshRecycler.setAdapter(adapter);
+ binding.refreshRecycler.setNoMoreData(true);
+ binding.refreshRecycler.setEnableRefresh(false);
+ binding.refreshRecycler.showContent();
+ List data = new ArrayList<>();
+ data.add("李国强");
+ data.add("章胡琬");
+ adapter.setNewData(data);
+ }
+
+ @Override
+ protected void onBindListener() {
+ binding.btnBack.setOnClickListener(new SingleClickListener() {
+ @Override
+ protected void onSingleClick(View v) {
+ finish();
+ }
+ });
+ adapter.setOnItemClickListener((baseQuickAdapter, view, i) -> {
+ IntentUtil.startActivity(mContext, FarmerManagementDetailActivity.class);
+ });
+ }
+
+ private class FarmerManagementAdapter extends BaseQuickAdapter {
+
+ public FarmerManagementAdapter() {
+ super(R.layout.item_list_farmer_managerment);
+ }
+
+ @Override
+ protected void convert(@NonNull BaseViewHolder holder, String entity) {
+ holder.setText(R.id.tvName, entity);
+ }
+
+ }
+}
diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/FarmerManagementDetailActivity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/FarmerManagementDetailActivity.java
new file mode 100644
index 0000000..44fc9e2
--- /dev/null
+++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/nyscjyzt/FarmerManagementDetailActivity.java
@@ -0,0 +1,33 @@
+package com.tairui.gov_affairs_cloud.ui.nyscjyzt;
+
+import com.tairui.gov_affairs_cloud.base.BaseActivity;
+import com.tairui.gov_affairs_cloud.databinding.ActivityFarmerManagementDetailBinding;
+import com.tairui.gov_affairs_cloud.util.SingleClickListener;
+
+import android.view.View;
+
+/**
+ * 企业管理
+ */
+public class FarmerManagementDetailActivity extends BaseActivity {
+
+ @Override
+ protected Class getBindingClass() {
+ return ActivityFarmerManagementDetailBinding.class;
+ }
+
+ @Override
+ protected void onQueryArguments() {
+ }
+
+ @Override
+ protected void onBindListener() {
+ binding.btnBack.setOnClickListener(new SingleClickListener() {
+ @Override
+ protected void onSingleClick(View v) {
+ finish();
+ }
+ });
+ }
+
+}
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 f16922c..3763131 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
@@ -17,6 +17,7 @@ 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.nyscjyzt.FarmerManagementActivity;
import com.tairui.gov_affairs_cloud.ui.workspace.entity.WorkSpaceEntity;
import com.tairui.gov_affairs_cloud.util.IntentUtil;
@@ -84,6 +85,8 @@ public class WorkSpaceFragment extends BaseFragment {
IntentUtil.startActivity(mContext, UtilizationControlActivity.class);
} else if (_id == 15) {
IntentUtil.startActivity(mContext, BusinessManagementActivity.class);
+ } else if (_id == 19) {
+ IntentUtil.startActivity(mContext, FarmerManagementActivity.class);
}
});
}
diff --git a/app/src/main/res/layout/activity_business_management_detail.xml b/app/src/main/res/layout/activity_business_management_detail.xml
new file mode 100644
index 0000000..3f8f69b
--- /dev/null
+++ b/app/src/main/res/layout/activity_business_management_detail.xml
@@ -0,0 +1,354 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_farmer_management_detail.xml b/app/src/main/res/layout/activity_farmer_management_detail.xml
new file mode 100644
index 0000000..8f37668
--- /dev/null
+++ b/app/src/main/res/layout/activity_farmer_management_detail.xml
@@ -0,0 +1,364 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_farmer_management_list.xml b/app/src/main/res/layout/activity_farmer_management_list.xml
new file mode 100644
index 0000000..2e4002e
--- /dev/null
+++ b/app/src/main/res/layout/activity_farmer_management_list.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_farmer_managerment.xml b/app/src/main/res/layout/item_list_farmer_managerment.xml
new file mode 100644
index 0000000..3528eac
--- /dev/null
+++ b/app/src/main/res/layout/item_list_farmer_managerment.xml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_phone_green.png b/app/src/main/res/mipmap-xxhdpi/ic_phone_green.png
new file mode 100644
index 0000000..328e3b7
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_phone_green.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_type_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_type_blue.png
new file mode 100644
index 0000000..a030a56
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_type_blue.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_1.png b/app/src/main/res/mipmap-xxhdpi/pic_1.png
new file mode 100644
index 0000000..e9c1691
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_2.png b/app/src/main/res/mipmap-xxhdpi/pic_2.png
new file mode 100644
index 0000000..3866980
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_2.png differ