diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 247f956..4a1ba84 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,6 +76,24 @@
+
+
+
+
+
+
+
+
+
mInstitutionList;
+ private BaseQuickAdapter mInstitutionAdapter;
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_testing_organization;
+ }
+
+ @Override
+ protected void initView() {
+ title = (TitleBar) findViewById(R.id.title);
+ etKeyword = (EditText) findViewById(R.id.et_keyword);
+ ivSearch = (AppCompatImageView) findViewById(R.id.iv_search);
+ llCounty = (ShapeLinearLayout) findViewById(R.id.ll_county);
+ tvCounty = (AppCompatTextView) findViewById(R.id.tv_county);
+ llTown = (ShapeLinearLayout) findViewById(R.id.ll_town);
+ tvTown = (AppCompatTextView) findViewById(R.id.tv_town);
+ llVillage = (ShapeLinearLayout) findViewById(R.id.ll_village);
+ tvVillage = (AppCompatTextView) findViewById(R.id.tv_village);
+ statusLayout = (StatusLayout) findViewById(R.id.statusLayout);
+ refreshLayout = (SmartRefreshLayout) findViewById(R.id.refreshLayout);
+ rvInstitution = (RecyclerView) findViewById(R.id.rv_institution);
+ }
+
+ @Override
+ protected void initData() {
+ mInstitutionList = new ArrayList<>();
+ mInstitutionList.add("耿马县农科所");
+ mInstitutionList.add("临沧市农产品质量检测中心");
+
+ mInstitutionAdapter = new BaseQuickAdapter(R.layout.item_testing_organization, mInstitutionList) {
+
+ @Override
+ protected void convert(@NotNull BaseViewHolder holder, String item) {
+
+ }
+ };
+ rvInstitution.setLayoutManager(new LinearLayoutManager(getContext()));
+ rvInstitution.setAdapter(mInstitutionAdapter);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityManageActivity.java b/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityManageActivity.java
index 180a7d4..0cfdd7b 100644
--- a/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityManageActivity.java
+++ b/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityManageActivity.java
@@ -13,6 +13,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.hjq.bar.TitleBar;
import com.yinhetairui.digitalagriculture.R;
+import com.yinhetairui.digitalagriculture.aop.SingleClick;
import com.yinhetairui.digitalagriculture.app.AppActivity;
import com.yinhetairui.digitalagriculture.ui.dto.CommonFuncDto;
@@ -49,6 +50,8 @@ public final class TraceabilityManageActivity extends AppActivity {
rvManage = (RecyclerView) findViewById(R.id.rv_manage);
tvMore = (AppCompatTextView) findViewById(R.id.tv_more);
rvInstitution = (RecyclerView) findViewById(R.id.rv_institution);
+
+ setOnClickListener(tvMore);
}
@Override
@@ -91,7 +94,7 @@ public final class TraceabilityManageActivity extends AppActivity {
break;
case 3: //检测机构
-
+ startActivity(TestingOrganizationActivity.class);
break;
case 4: //溯源查询
@@ -110,4 +113,10 @@ public final class TraceabilityManageActivity extends AppActivity {
rvInstitution.setLayoutManager(new LinearLayoutManager(getContext()));
rvInstitution.setAdapter(mInstitutionAdapter);
}
+
+ @SingleClick
+ @Override
+ public void onClick(View view) {
+ startActivity(TestingOrganizationActivity.class);
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityTestingActivity.java b/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityTestingActivity.java
index 22d905f..a7a5719 100644
--- a/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityTestingActivity.java
+++ b/app/src/main/java/com/yinhetairui/digitalagriculture/ui/traceabilityManage/TraceabilityTestingActivity.java
@@ -1,9 +1,13 @@
package com.yinhetairui.digitalagriculture.ui.traceabilityManage;
+import android.view.View;
+
+import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.hjq.bar.TitleBar;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
@@ -59,5 +63,19 @@ public final class TraceabilityTestingActivity extends AppActivity {
};
rvList.setLayoutManager(new LinearLayoutManager(getContext()));
rvList.setAdapter(mAdapter);
+
+ mAdapter.setOnItemClickListener(new OnItemClickListener() {
+ @Override
+ public void onItemClick(@NonNull @NotNull BaseQuickAdapter adapter, @NonNull @NotNull View view, int position) {
+ switch (position) {
+ case 0:
+ startActivity(DetectionInfoActivity.class);
+ break;
+ default:
+ startActivity(DetectionDetailActivity.class);
+ break;
+ }
+ }
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_detection_detail.xml b/app/src/main/res/layout/activity_detection_detail.xml
new file mode 100644
index 0000000..b6da2de
--- /dev/null
+++ b/app/src/main/res/layout/activity_detection_detail.xml
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_detection_info.xml b/app/src/main/res/layout/activity_detection_info.xml
new file mode 100644
index 0000000..3289360
--- /dev/null
+++ b/app/src/main/res/layout/activity_detection_info.xml
@@ -0,0 +1,315 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_land_manage.xml b/app/src/main/res/layout/activity_land_manage.xml
new file mode 100644
index 0000000..8a3fb0c
--- /dev/null
+++ b/app/src/main/res/layout/activity_land_manage.xml
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_testing_organization.xml b/app/src/main/res/layout/activity_testing_organization.xml
new file mode 100644
index 0000000..32366be
--- /dev/null
+++ b/app/src/main/res/layout/activity_testing_organization.xml
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_testing_organization.xml b/app/src/main/res/layout/item_testing_organization.xml
index b8c0642..7208107 100644
--- a/app/src/main/res/layout/item_testing_organization.xml
+++ b/app/src/main/res/layout/item_testing_organization.xml
@@ -8,6 +8,7 @@
android:paddingHorizontal="@dimen/dp_6"
android:paddingVertical="@dimen/dp_10"
app:shape_radius="@dimen/dp_10"
+ app:shape_solidColor="@color/white"
app:shape_strokeColor="@color/common_line_color"
app:shape_strokeSize="@dimen/dp_1"
app:shape_type="rectangle">