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

merge

Browse Source
This commit is contained in:
unknown
2020-03-14 14:34:46 +08:00
parent 75e5a5f916 7524c3b42d
commit 2e8df41d65
105 changed files with 335 additions and 3143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
View File

@@ -3,6 +3,8 @@ package com.mogo.module.apps;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
@@ -12,6 +14,9 @@ import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.module.apps.adapter.AppIndicatorAdapter;
import com.mogo.module.apps.adapter.base.RecycleViewHolder;
import com.mogo.module.apps.model.NavigatorApp;
import com.mogo.module.apps.model.NavigatorApps;
import com.mogo.module.apps.utils.CardScaleTransformer;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.service.MogoServicePaths;
@@ -24,6 +29,7 @@ import com.mogo.utils.logger.Logger;
import com.yarolegovich.discretescrollview.DiscreteScrollView;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -33,14 +39,15 @@ import java.util.Map;
* 描述
*/
public class AppNavigatorFragment extends MvpFragment<AppNavigatorView, AppNavigatorPresenter>
implements AppNavigatorView, DiscreteScrollView.OnItemChangedListener<RecyclerView.ViewHolder>,
DiscreteScrollView.ScrollStateChangeListener<RecyclerView.ViewHolder>,
implements AppNavigatorView, DiscreteScrollView.OnItemChangedListener<RecycleViewHolder>,
DiscreteScrollView.ScrollStateChangeListener<RecycleViewHolder>,
IMogoCardChangedListener {
private static final String TAG = "AppNavigatorFragment";
private View mApps;
private IMogoFragmentManager mMogoFragmentManager;
List<NavigatorApp> apps;
/**
* 搜索莫模块
@@ -67,6 +74,9 @@ public class AppNavigatorFragment extends MvpFragment<AppNavigatorView, AppNavig
mApps = findViewById(R.id.module_apps_id_apps);
scroller = findViewById(R.id.module_apps_id_scroller);
scroller.setRatio(330/523F);
//scroller.setRatio(176/279F);
scroller.setSlideOnFling(true);
scroller.addOnItemChangedListener(this);
scroller.addScrollStateChangeListener(this);
@@ -74,23 +84,10 @@ public class AppNavigatorFragment extends MvpFragment<AppNavigatorView, AppNavig
scroller.setItemTransformer(new CardScaleTransformer.Builder()
.setMinScale(0.84f)
.build());
//
//
//LinearLayoutManager linearLayoutManager =
// new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false);
//
//scroller.setLayoutManager(linearLayoutManager);
ArrayList<Integer> integers = new ArrayList<>(10);
apps = NavigatorApps.getApps();
integers.add(R.drawable.module_apps_ic_online_car);
integers.add(R.drawable.module_apps_ic_interest);
integers.add(R.drawable.module_apps_ic_news);
integers.add(R.drawable.module_apps_ic_media_center);
integers.add(R.drawable.module_apps_ic_chat);
integers.add(R.drawable.module_apps_ic_tanlu);
AppIndicatorAdapter appIndicatorAdapter = new AppIndicatorAdapter(getContext(), integers);
AppIndicatorAdapter appIndicatorAdapter = new AppIndicatorAdapter(getContext(), apps);
scroller.setAdapter(appIndicatorAdapter);
scroller.scrollToPosition(Integer.MAX_VALUE / 2 - 1);
//mNavigation.setOnClickListener( view -> {
@@ -178,27 +175,45 @@ public class AppNavigatorFragment extends MvpFragment<AppNavigatorView, AppNavig
}
@Override
public void onCurrentItemChanged(@Nullable RecyclerView.ViewHolder viewHolder, int i) {
public void onCurrentItemChanged(@Nullable RecycleViewHolder viewHolder, int i) {
Logger.d(TAG, "onCurrentItemChanged--position--" + i % CARD_SIZE);
int currentPosition = i % CARD_SIZE - 2;
if (currentPosition < 0) {
currentPosition += CARD_SIZE;
}
this.currentPosition=currentPosition;
AppServiceHandler.getMogoCardManager().invoke(currentPosition, "");
}
AppServiceHandler.getMogoCardManager().switch2(apps.get(i % CARD_SIZE).mModuleType);
@Override public void onScrollStart(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
//holder.showText();
//ImageView view = viewHolder.getView(R.id.module_apps_id_app_icon);
//view.setImageResource(apps.get(currentPosition).getmIconId());
//
//TextView tvTitle = viewHolder.getView(R.id.module_apps_id_app_name);
//tvTitle.setTextColor(getResources().getColor(R.color.white));
}
@Override public void onScrollEnd(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
@Override public void onScrollStart(@NonNull RecycleViewHolder viewHolder, int i) {
int currentPosition = i % CARD_SIZE - 2;
//
//ImageView view = viewHolder.getView(R.id.module_apps_id_app_icon);
//
//
//view.setImageResource(apps.get(currentPosition).mUncheckedIconId);
//TextView tvTitle = viewHolder.getView(R.id.module_apps_id_app_name);
//tvTitle.setTextColor(getResources().getColor(R.color.white_80));
}
@Override public void onScrollEnd(@NonNull RecycleViewHolder viewHolder, int i) {
}
@Override
public void onScroll(float v, int i, int i1, @Nullable RecyclerView.ViewHolder viewHolder,
@Nullable RecyclerView.ViewHolder t1) {
public void onScroll(float v, int i, int i1, @Nullable RecycleViewHolder viewHolder,
@Nullable RecycleViewHolder t1) {
}

12
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java
View File

@@ -6,17 +6,18 @@ import android.widget.ImageView;
import com.mogo.module.apps.R;
import com.mogo.module.apps.adapter.base.RecycleBaseAdapter;
import com.mogo.module.apps.adapter.base.RecycleViewHolder;
import com.mogo.module.apps.model.NavigatorApp;
import java.util.List;
/**
* @author zyz
* 2020-03-09.
*/
public class AppIndicatorAdapter extends RecycleBaseAdapter<Integer> {
public class AppIndicatorAdapter extends RecycleBaseAdapter<NavigatorApp> {
/**
*
*/
public AppIndicatorAdapter(Context context, List<Integer> list
public AppIndicatorAdapter(Context context, List<NavigatorApp> list
) {
super(context, list, R.layout.module_apps_item_app_indicator);
}
@@ -25,10 +26,9 @@ public class AppIndicatorAdapter extends RecycleBaseAdapter<Integer> {
return Integer.MAX_VALUE;
}
@Override public void onBindViewHolder(RecycleViewHolder holder, Integer integer) {
@Override public void onBindViewHolder(RecycleViewHolder holder, NavigatorApp integer) {
ImageView ivIndicator = holder.getView(R.id.module_apps_id_app_icon);
ivIndicator.setImageResource(integer);
holder.setText(R.id.module_apps_id_app_name,names[holder.getLayoutPosition()%6] );
ivIndicator.setImageResource(integer.getmIconId());
holder.setText(R.id.module_apps_id_app_name,integer.getmName() );
}
private String[] names=new String[]{"在线车辆","新鲜事","首页","媒体中心","车聊聊","探路"};
}

BIN
modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_media_center.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

10
modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml
View File

@@ -9,7 +9,7 @@
<com.yarolegovich.discretescrollview.DiscreteScrollView
android:id="@+id/module_apps_id_scroller"
android:layout_width="@dimen/dp_523"
android:layout_width="@dimen/apps_id_scroller_width"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_height="@dimen/module_apps_navigation_icon_container_height"
@@ -21,7 +21,7 @@
<ImageView
android:id="@+id/module_apps_id_apps"
android:layout_width="@dimen/module_apps_navigation_icon_width"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginTop="@dimen/apps_margin_top"
android:layout_height="@dimen/module_apps_navigation_icon_height"
app:layout_constraintLeft_toRightOf="@id/module_apps_id_scroller"
app:layout_constraintTop_toTopOf="@id/module_apps_id_scroller"
@@ -31,15 +31,15 @@
<TextView
android:layout_width="wrap_content"
android:gravity="center"
android:layout_marginLeft="@dimen/dp_37"
android:layout_marginLeft="@dimen/apps_margin_left"
app:layout_constraintLeft_toRightOf="@id/module_apps_id_scroller"
app:layout_constraintTop_toBottomOf="@id/module_apps_id_apps"
android:layout_height="wrap_content"
android:text="全部应用"
android:maxLines="1"
android:layout_marginTop="24px"
android:layout_marginTop="@dimen/dp_24"
android:textColor="#FFFFFFFF"
android:textSize="26.25px"
android:textSize="@dimen/dp_26"
/>

11
modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml
View File

@@ -5,13 +5,18 @@
<dimen name="module_apps_indicator_width">16px</dimen>
<dimen name="module_apps_indicator_interval">2.3px</dimen>
<dimen name="module_apps_indicator_marginBottom">54.9px</dimen>
<dimen name="module_apps_navigation_icon_width">64px</dimen>
<dimen name="module_apps_navigation_icon_height">64px</dimen>
<dimen name="module_apps_navigation_icon_marginLeft">31.6px</dimen>
<dimen name="module_apps_navigation_icon_width">50px</dimen>
<dimen name="module_apps_navigation_icon_height">50px</dimen>
<dimen name="module_apps_navigation_icon_marginLeft">22px</dimen>
<dimen name="module_apps_navigation_icon_paddingBottom">33px</dimen>
<dimen name="module_apps_app_name_marginTop">24px</dimen>
<dimen name="module_apps_app_name_textSize">18px</dimen>
<dimen name="module_apps_page_paddingLeft">112px</dimen>
<dimen name="module_apps_page_paddingRight">112px</dimen>
<dimen name="apps_id_scroller_width">279px</dimen>
<dimen name="module_apps_page_item_verticalSpacing">89px</dimen>
<dimen name="module_apps_navigation_icon_container_height">95px</dimen>
<dimen name="apps_margin_top">9.5px</dimen>
<dimen name="apps_margin_left">18px</dimen>
</resources>

3
modules/mogo-module-apps/src/main/res/values/dimens.xml
View File

@@ -15,4 +15,7 @@
<dimen name="module_apps_page_paddingRight">220px</dimen>
<dimen name="module_apps_page_item_verticalSpacing">154px</dimen>
<dimen name="module_apps_navigation_icon_container_height">174px</dimen>
<dimen name="apps_id_scroller_width">523px</dimen>
<dimen name="apps_margin_top">18px</dimen>
<dimen name="apps_margin_left">37px</dimen>
</resources>