diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fd4679c..6b506a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -138,6 +138,13 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="false"
android:screenOrientation="portrait" />
+
+
+
{
+ @Override
+ protected Class getBindingClass() {
+ return ActivityPublicBrandBinding.class;
+ }
+
+ @Override
+ protected void initStatusBar() {
+ ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar()
+ .statusBarDarkFont(true).init();
+ }
+}
diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/adapter/HomeAdapter.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/adapter/HomeAdapter.java
index 6417ff0..3706048 100644
--- a/app/src/main/java/com/tairui/industrial_operation/ui/home/adapter/HomeAdapter.java
+++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/adapter/HomeAdapter.java
@@ -3,10 +3,10 @@ package com.tairui.industrial_operation.ui.home.adapter;
import java.util.List;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
-import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.tairui.industrial_operation.R;
import com.tairui.industrial_operation.base.entity.BaseHolderEntity;
+import com.tairui.industrial_operation.ui.brand.PublicBrandActivity;
import com.tairui.industrial_operation.ui.home.entity.HomeGoodsEntity;
import com.tairui.industrial_operation.ui.smart_farm.SmartFarmActivity;
import com.tairui.industrial_operation.util.DensityUtils;
@@ -20,7 +20,6 @@ import com.zhpan.indicator.enums.IndicatorStyle;
import android.graphics.Color;
import android.util.Log;
-import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -82,12 +81,11 @@ public class HomeAdapter extends BaseMultiItemQuickAdapter) entity.getData());
funcRecycler.setAdapter(funcAdapter);
- funcAdapter.setOnItemClickListener(new OnItemClickListener() {
- @Override
- public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
- if (i == 0) {
- IntentUtil.startActivity(mContext, SmartFarmActivity.class);
- }
+ funcAdapter.setOnItemClickListener((baseQuickAdapter, view, i) -> {
+ if (i == 0) {
+ IntentUtil.startActivity(mContext, SmartFarmActivity.class);
+ } else if (i == 3) {
+ IntentUtil.startActivity(mContext, PublicBrandActivity.class);
}
});
break;
diff --git a/app/src/main/res/drawable/bg_gradient_public_brand.xml b/app/src/main/res/drawable/bg_gradient_public_brand.xml
new file mode 100644
index 0000000..1ed8217
--- /dev/null
+++ b/app/src/main/res/drawable/bg_gradient_public_brand.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_public_brand.xml b/app/src/main/res/layout/activity_public_brand.xml
new file mode 100644
index 0000000..81a6964
--- /dev/null
+++ b/app/src/main/res/layout/activity_public_brand.xml
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_arrow_right_gray.png b/app/src/main/res/mipmap-xxhdpi/ic_arrow_right_gray.png
new file mode 100644
index 0000000..180d9f6
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_arrow_right_gray.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cpdj.png b/app/src/main/res/mipmap-xxhdpi/ic_cpdj.png
new file mode 100644
index 0000000..2d3dbdd
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_cpdj.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_ppdj.png b/app/src/main/res/mipmap-xxhdpi/ic_ppdj.png
new file mode 100644
index 0000000..5d6a02a
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_ppdj.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sqjl.png b/app/src/main/res/mipmap-xxhdpi/ic_sqjl.png
new file mode 100644
index 0000000..c5909a3
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_sqjl.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sqsq.png b/app/src/main/res/mipmap-xxhdpi/ic_sqsq.png
new file mode 100644
index 0000000..7b9a311
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_sqsq.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_public_brand_1.png b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_1.png
new file mode 100644
index 0000000..da0059d
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_public_brand_2.png b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_2.png
new file mode 100644
index 0000000..0691b50
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_2.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_public_brand_3.png b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_3.png
new file mode 100644
index 0000000..4f4fd75
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_3.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_public_brand_4.png b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_4.png
new file mode 100644
index 0000000..22a4d50
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_4.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_public_brand_5.png b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_5.png
new file mode 100644
index 0000000..1ef2afd
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_5.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/pic_public_brand_6.png b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_6.png
new file mode 100644
index 0000000..f202e2f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pic_public_brand_6.png differ