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/AndroidManifest.xml b/modules/mogo-module-check/src/main/AndroidManifest.xml index 6c0604d0ac..b3fa0b1693 100644 --- a/modules/mogo-module-check/src/main/AndroidManifest.xml +++ b/modules/mogo-module-check/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckActivity.java deleted file mode 100644 index 904cc1df8f..0000000000 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckActivity.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mogo.module.check; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.os.PersistableBundle; -import android.widget.Button; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - -/** - * @author liujing - * @description 检测页面 - * @since: 7/27/21 - */ -public class CheckActivity extends AppCompatActivity { - - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_check); - - findViewById(R.id.btnBack).setOnClickListener(v -> { - finish(); - }); - } - - public static void start(Context context) { - Intent starter = new Intent(context, CheckActivity.class); - context.startActivity(starter); - } - -} diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckProvider.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckProvider.java index 0fe268eb56..dade9feb9b 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckProvider.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckProvider.java @@ -3,6 +3,7 @@ package com.mogo.module.check; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.module.check.view.CheckActivity; import com.mogo.service.check.ICheckProvider; import com.mogo.service.MogoServicePaths; import com.mogo.utils.logger.Logger; 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 new file mode 100644 index 0000000000..83da54695c --- /dev/null +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java @@ -0,0 +1,55 @@ +package com.mogo.module.check.view; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import androidx.annotation.Nullable; +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 + * @description 检测页面 + * @since: 7/27/21 + */ +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) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_check); + initView(); + findViewById(R.id.btnBack).setOnClickListener(v -> { + finish(); + }); + } + + /** + * 列表View初始化 + */ + public void initView() { + mRecyclerView = findViewById(R.id.check_list); + 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); + } + + public static void start(Context context) { + Intent starter = new Intent(context, CheckActivity.class); + context.startActivity(starter); + } + +} 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 new file mode 100644 index 0000000000..b9d946cd67 --- /dev/null +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java @@ -0,0 +1,42 @@ +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) { + return null; + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + + } + + @Override + public int getItemCount() { + return 0; + } +} diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java new file mode 100644 index 0000000000..f29ced75ee --- /dev/null +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java @@ -0,0 +1,36 @@ +package com.mogo.module.check.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.util.Log; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +/** + * @author liujing + * @description 描述 + * @since: 7/27/21 + */ +class CheckLinearLayout extends LinearLayoutManager { + public CheckLinearLayout(Context context) { + super(context); + } + + public CheckLinearLayout(Context context, int orientation, boolean reverseLayout) { + super(context, orientation, reverseLayout); + } + + public CheckLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { + try { + super.onLayoutChildren(recycler, state); + } catch (IndexOutOfBoundsException e) { + Log.d("CheckLinearLayout", "崩溃信息--" + e.toString()); + } + } +} 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 cfb1ecd8c8..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,19 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".CheckActivity"> + tools:context=".view.CheckActivity" + android:background="@color/blue_back_color"> + +