yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'vb' into feature/feature_hengyang_base

Browse Source
This commit is contained in:
liujing
2021-07-28 12:28:32 +08:00
parent e11c7d6b6e 69660c0bd7
commit 0f8c366373
17 changed files with 222 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mogo-module-check/build.gradle
View File

@@ -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

2
modules/mogo-module-check/src/main/AndroidManifest.xml
View File

@@ -4,7 +4,7 @@
<application>
<activity
android:name=".CheckActivity"
android:name=".view.CheckActivity"
android:launchMode="singleTask"
android:screenOrientation="landscape" />
</application>

35
modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckActivity.java
View File

@@ -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);
}
}

1
modules/mogo-module-check/src/main/java/com/mogo/module/check/CheckProvider.java
View File

@@ -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;

52
modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java Normal file
View File

@@ -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<ItemInfo> 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<ItemInfo> getItemList() {
return itemList;
}
public void setItemList(ArrayList<ItemInfo> 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";
}

55
modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java Normal file
View File

@@ -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);
}
}

42
modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java Normal file
View File

@@ -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<RecyclerView.ViewHolder> {
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;
}
}

36
modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java Normal file
View File

@@ -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());
}
}
}

24
modules/mogo-module-check/src/main/res/layout/activity_check.xml
View File

@@ -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">
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/check_list"
android:text="检测页面"
android:textSize="28dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btnBack"
@@ -14,14 +26,4 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="检测页面"
android:textSize="28dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="check_item_space_vr">30px</dimen>
</resources>

4
modules/mogo-module-check/src/main/res/values/colors.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="blue_back_color">#1A1F40</color>
</resources>

10
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java
View File

@@ -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);
}

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java
View File

@@ -1,4 +1,4 @@
package com.mogo.module.v2x;
package com.mogo.module.common.view;
import android.graphics.Rect;
import android.view.View;

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
View File

@@ -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

3
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
View File

@@ -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;

8
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
View File

@@ -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<V2XShareEventsFragment,
recyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.share_item_padding)));
adapter = new V2XShareEventAdapter(getActivity(), dataArrayList, this);
recyclerView.setAdapter(adapter);
V2XLinearLayoutManager linearLayoutManager =
new V2XLinearLayoutManager(getActivity(), V2XLinearLayoutManager.VERTICAL, false);
LinearLayoutCommonManager linearLayoutManager =
new LinearLayoutCommonManager(getActivity(), LinearLayoutCommonManager.VERTICAL, false);
recyclerView.setLayoutManager(linearLayoutManager);
loadingView = mRootView.findViewById(R.id.network_loading_imageview);
}

6
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
View File

@@ -15,14 +15,12 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.LinearInterpolator;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
@@ -34,15 +32,11 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.anim.OnMarkerAnimationListener;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerPoiTypeEnum;
import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.SpacesItemDecoration;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
import com.mogo.module.v2x.adapter.V2XSurroundingAdapter;
import com.mogo.module.v2x.adapter.V2XSurroundingDetailAdapter;
import com.mogo.module.v2x.entity.panel.BackRefreshInfo;
import com.mogo.module.v2x.entity.panel.SurroundingConstruction;
import com.mogo.module.v2x.listener.SurroundingItemClickListener;