From 69660c0bd70e7fb671d0e09a4f2970a236fdca78 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 28 Jul 2021 12:28:04 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=A3=80=E6=B5=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=89=B2=E5=80=BC=E6=B7=BB=E5=8A=A0=20=20model=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=85=B7=E7=B1=BB=E7=A7=BB=E8=87=B4?= =?UTF-8?q?common=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-check/build.gradle | 1 + .../module/check/model/CheckItemInfo.java | 52 +++++++++++++++++++ .../mogo/module/check/view/CheckActivity.java | 11 +++- .../mogo/module/check/view/CheckAdapter.java | 13 +++++ .../src/main/res/layout/activity_check.xml | 3 +- .../res/values-xhdpi-2560x1600/dimens.xml | 5 ++ .../src/main/res/values/colors.xml | 4 ++ .../view/LinearLayoutCommonManager.java} | 10 ++-- .../common/view}/SpacesItemDecoration.java | 2 +- .../v2x/fragment/V2XEventPanelFragment.kt | 2 +- .../fragment/V2XScenarioHistoryFragment.java | 3 +- .../v2x/fragment/V2XShareEventsFragment.java | 8 +-- .../v2x/fragment/V2XSurroundingFragment.java | 6 --- 13 files changed, 98 insertions(+), 22 deletions(-) create mode 100644 modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java create mode 100644 modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml create mode 100644 modules/mogo-module-check/src/main/res/values/colors.xml rename modules/{mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java => mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java} (64%) rename modules/{mogo-module-v2x/src/main/java/com/mogo/module/v2x => mogo-module-common/src/main/java/com/mogo/module/common/view}/SpacesItemDecoration.java (93%) diff --git a/modules/mogo-module-check/build.gradle b/modules/mogo-module-check/build.gradle index 5fba501da7..9ef58bae7c 100644 --- a/modules/mogo-module-check/build.gradle +++ b/modules/mogo-module-check/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation rootProject.ext.dependencies.coroutinescore implementation rootProject.ext.dependencies.kotlinstdlibjdk7 implementation 'com.google.android.material:material:1.2.1' + implementation project(':modules:mogo-module-common') annotationProcessor rootProject.ext.dependencies.aroutercompiler diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java new file mode 100644 index 0000000000..54121a2492 --- /dev/null +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java @@ -0,0 +1,52 @@ +package com.mogo.module.check.model; + +import com.mogo.commons.data.BaseData; + +import java.io.Serializable; +import java.util.ArrayList; + +/** + * @author liujing + * @description 描述 + * @since: 7/28/21 + */ +public class CheckItemInfo implements Serializable { + private TypeEnum type; + private String title; + private ArrayList itemList; + + public TypeEnum getType() { + return type; + } + + public void setType(TypeEnum type) { + this.type = type; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public ArrayList getItemList() { + return itemList; + } + + public void setItemList(ArrayList itemList) { + this.itemList = itemList; + } +} + +class ItemInfo implements Serializable { + private String checkDescription; + private String checkResult; +} + +interface TypeEnum { + String TITLE_TYPE = "title_type"; + String LIST_TYPE = "list_type"; + String IMAGE_TYPE = "image_type"; +} diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java index 1c17f6f01f..83da54695c 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java @@ -9,6 +9,10 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.check.R; +import com.mogo.module.check.model.CheckItemInfo; +import com.mogo.module.common.view.SpacesItemDecoration; + +import java.util.ArrayList; /** * @author liujing @@ -18,6 +22,8 @@ import com.mogo.module.check.R; public class CheckActivity extends AppCompatActivity { private RecyclerView mRecyclerView; + private ArrayList dataArrayList = new ArrayList(); + private CheckItemInfo mCheckItemInfo = new CheckItemInfo(); @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -32,11 +38,12 @@ public class CheckActivity extends AppCompatActivity { /** * 列表View初始化 */ - public void initView(){ + public void initView() { mRecyclerView = findViewById(R.id.check_list); - mRecyclerView.setAdapter(new CheckAdapter()); + mRecyclerView.setAdapter(new CheckAdapter(getApplication().getBaseContext(), dataArrayList)); CheckLinearLayout linearLayoutManager = new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false); + mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.check_item_space_vr))); mRecyclerView.setLayoutManager(linearLayoutManager); } diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java index cf91294a94..b9d946cd67 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java @@ -1,16 +1,29 @@ package com.mogo.module.check.view; +import android.content.Context; +import android.view.LayoutInflater; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; + /** * @author liujing * @description 检测界面单元格 * @since: 7/27/21 */ public class CheckAdapter extends RecyclerView.Adapter { + + LayoutInflater mLayoutInflater; + ArrayList dataArrayList; + + public CheckAdapter(@NonNull Context context, @NonNull ArrayList checkArray){ + mLayoutInflater = LayoutInflater.from(context); + dataArrayList = checkArray; + } + @NonNull @Override public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { diff --git a/modules/mogo-module-check/src/main/res/layout/activity_check.xml b/modules/mogo-module-check/src/main/res/layout/activity_check.xml index a9455d0364..f1189cb361 100644 --- a/modules/mogo-module-check/src/main/res/layout/activity_check.xml +++ b/modules/mogo-module-check/src/main/res/layout/activity_check.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".view.CheckActivity"> + tools:context=".view.CheckActivity" + android:background="@color/blue_back_color"> + + 30px + + \ No newline at end of file diff --git a/modules/mogo-module-check/src/main/res/values/colors.xml b/modules/mogo-module-check/src/main/res/values/colors.xml new file mode 100644 index 0000000000..7ed68be079 --- /dev/null +++ b/modules/mogo-module-check/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #1A1F40 + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java similarity index 64% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java index 408255e1bc..5029ba62a0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java @@ -1,4 +1,4 @@ -package com.mogo.module.v2x.fragment; +package com.mogo.module.common.view; import android.content.Context; import android.util.AttributeSet; @@ -7,16 +7,16 @@ import android.util.Log; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -class V2XLinearLayoutManager extends LinearLayoutManager { - public V2XLinearLayoutManager(Context context) { +public class LinearLayoutCommonManager extends LinearLayoutManager { + public LinearLayoutCommonManager(Context context) { super(context); } - public V2XLinearLayoutManager(Context context, int orientation, boolean reverseLayout) { + public LinearLayoutCommonManager(Context context, int orientation, boolean reverseLayout) { super(context, orientation, reverseLayout); } - public V2XLinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + public LinearLayoutCommonManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java similarity index 93% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java index f0e2739521..909ec058dd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.mogo.module.v2x; +package com.mogo.module.common.view; import android.graphics.Rect; import android.view.View; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 783a7772f3..b476b070a1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -26,7 +26,7 @@ import com.mogo.module.common.entity.MarkerExploreWay import com.mogo.module.common.entity.MarkerPoiTypeEnum import com.mogo.module.common.MogoApisHandler import com.mogo.module.v2x.R -import com.mogo.module.v2x.SpacesItemDecoration +import com.mogo.module.common.view.SpacesItemDecoration import com.mogo.module.v2x.V2XConst.MODULE_NAME import com.mogo.module.v2x.V2XServiceManager import com.mogo.module.v2x.adapter.V2XEventPagerAdapter diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 50584e8dde..c922ca3394 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -6,7 +6,6 @@ import android.view.View; import android.widget.LinearLayout; import androidx.annotation.NonNull; -import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -14,7 +13,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.v2x.R; -import com.mogo.module.v2x.SpacesItemDecoration; +import com.mogo.module.common.view.SpacesItemDecoration; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.adapter.V2XScenarioHistoryAdapter; import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index b9bf2b244c..36358890b3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -8,13 +8,13 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.voice.AIAssist; +import com.mogo.module.common.view.LinearLayoutCommonManager; import com.mogo.module.v2x.R; -import com.mogo.module.v2x.SpacesItemDecoration; +import com.mogo.module.common.view.SpacesItemDecoration; import com.mogo.module.v2x.adapter.V2XShareEventAdapter; import com.mogo.module.v2x.entity.panel.V2XShareEventDescription; import com.mogo.module.v2x.entity.panel.V2XShareEventItem; @@ -68,8 +68,8 @@ public class V2XShareEventsFragment extends MvpFragment