diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/Animation.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/Animation.java
similarity index 58%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/Animation.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/Animation.java
index a91503d370..3c0981fe05 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/Animation.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/Animation.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.utils.animation;
+package com.mogo.module.common.animation;
interface Animation {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/AnimationManager.java
similarity index 93%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/AnimationManager.java
index 94a760dd65..b0732a7d97 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/AnimationManager.java
@@ -1,13 +1,12 @@
-package com.mogo.module.v2x.utils.animation;
+package com.mogo.module.common.animation;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.view.View;
-import android.widget.ImageView;
import android.widget.ProgressBar;
-public class V2XAnimationManager implements Animation {
+public class AnimationManager implements Animation {
private static final String TAG = "V2XAnimationManager";
private ProgressBar targetImageView;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/AnimationResources.java
similarity index 94%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/AnimationResources.java
index fc6970f275..8919d777e6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/AnimationResources.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/AnimationResources.java
@@ -1,7 +1,7 @@
-package com.mogo.module.v2x.utils.animation;
+package com.mogo.module.common.animation;
-import com.mogo.module.v2x.R;
+import com.mogo.module.common.R;
public class AnimationResources {
public static final int loadingRes[] = {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/DelegateDrawable.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/DelegateDrawable.java
similarity index 91%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/DelegateDrawable.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/DelegateDrawable.java
index 0959e58281..b9ed974cf5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/DelegateDrawable.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/DelegateDrawable.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.utils.animation;
+package com.mogo.module.common.animation;
import android.graphics.drawable.AnimationDrawable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/NetworkLoadingView.java
similarity index 62%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/view/NetworkLoadingView.java
index 99a6cbbad7..7a8fad2cf0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/NetworkLoadingView.java
@@ -1,37 +1,36 @@
-package com.mogo.module.v2x.view;
+package com.mogo.module.common.view;
import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
-import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.Nullable;
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.utils.animation.AnimationResources;
-import com.mogo.module.v2x.utils.animation.V2XAnimationManager;
+import com.mogo.module.common.R;
+import com.mogo.module.common.animation.AnimationResources;
+import com.mogo.module.common.animation.AnimationManager;
-public class V2XNetworkLoadingView extends RelativeLayout {
+public class NetworkLoadingView extends RelativeLayout {
private ProgressBar loadView;
private TextView textView;
- private V2XAnimationManager v2XAnimationManager;
+ private AnimationManager mAnimationManager;
public Button refresButton;
private String loadingText = "正在获取信息…";
- public V2XNetworkLoadingView(Context context) {
+ public NetworkLoadingView(Context context) {
super(context);
}
- public V2XNetworkLoadingView(Context context, @Nullable AttributeSet attrs) {
+ public NetworkLoadingView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
- LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this);
+ LayoutInflater.from(context).inflate(R.layout.network_loading_item, this);
initView();
/*
添加动画图片资源
@@ -39,12 +38,12 @@ public class V2XNetworkLoadingView extends RelativeLayout {
setLoadingImage(AnimationResources.loadingRes);
}
- public V2XNetworkLoadingView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ public NetworkLoadingView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public void initView() {
- v2XAnimationManager = new V2XAnimationManager();
+ mAnimationManager = new AnimationManager();
loadView = findViewById(R.id.loading_imageview);
textView = findViewById(R.id.loading_text);
refresButton = findViewById(R.id.refresh_button);
@@ -57,12 +56,12 @@ public class V2XNetworkLoadingView extends RelativeLayout {
}
public void setLoadingImage(int[] resources) {
- v2XAnimationManager.animationWithTarget(loadView, resources, 100);
+ mAnimationManager.animationWithTarget(loadView, resources, 100);
}
public void start() {
- if (v2XAnimationManager != null) {
- v2XAnimationManager.start();
+ if (mAnimationManager != null) {
+ mAnimationManager.start();
this.setVisibility(View.VISIBLE);
}
if (refresButton != null) {
@@ -74,15 +73,15 @@ public class V2XNetworkLoadingView extends RelativeLayout {
}
public void stop() {
- if (v2XAnimationManager != null) {
- v2XAnimationManager.stop();
+ if (mAnimationManager != null) {
+ mAnimationManager.stop();
this.setVisibility(GONE);
}
}
public void stopWithError(String errormsg, int showRefreshButton) {
- if (v2XAnimationManager != null) {
- v2XAnimationManager.soptWithError();
+ if (mAnimationManager != null) {
+ mAnimationManager.soptWithError();
}
if (textView != null) {
textView.setText(errormsg);
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml b/modules/mogo-module-common/src/main/res/drawable/module_dw_common_corner_bkg_light.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml
rename to modules/mogo-module-common/src/main/res/drawable/module_dw_common_corner_bkg_light.xml
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-common/src/main/res/layout/network_loading_item.xml
similarity index 97%
rename from modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
rename to modules/mogo-module-common/src/main/res/layout/network_loading_item.xml
index 063ab8f34e..e16c269062 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-common/src/main/res/layout/network_loading_item.xml
@@ -45,7 +45,7 @@
android:layout_centerHorizontal="true"
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/dp_40"
- android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+ android:background="@drawable/module_dw_common_corner_bkg_light"
android:gravity="center"
android:text="刷新"
android:textColor="#FFFFFF"
diff --git a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
index d1a19e49b6..f8513976c9 100644
--- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
@@ -2,4 +2,7 @@
17px
14px
+ 120px
+ 150px
+ 48px
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index 4e810485fc..cff98ba677 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1056,5 +1056,7 @@
10px
31.9px
26px
-
+ 300px
+ 281px
+ 90px
diff --git a/modules/mogo-module-common/src/main/res/values/colors.xml b/modules/mogo-module-common/src/main/res/values/colors.xml
index 993e412000..d73639033d 100644
--- a/modules/mogo-module-common/src/main/res/values/colors.xml
+++ b/modules/mogo-module-common/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
#7f000000
#FFFFFF
+ #FFFFFF
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index a292d9e1b4..c0b7456f31 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1047,4 +1047,8 @@
8px
16px
20px
+ 120px
+ 150px
+ 48px
+
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 50f9eb4eb3..d1f9b455a4 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
@@ -24,7 +24,7 @@ import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.network.V2XShareNetworkModel;
import com.mogo.module.v2x.presenter.ShareEventsPresenter;
import com.mogo.module.v2x.utils.ThreadUtils;
-import com.mogo.module.v2x.view.V2XNetworkLoadingView;
+import com.mogo.module.common.view.NetworkLoadingView;
import java.util.ArrayList;
@@ -39,7 +39,7 @@ public class V2XShareEventsFragment extends MvpFragment poiInfosList = new ArrayList<>();
private IMogoServiceApis mApis;
- private V2XNetworkLoadingView mloadingImage;
+ private NetworkLoadingView mloadingImage;
@Override
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
index 7a58c30644..644113fcf9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
@@ -10,7 +10,7 @@
android:layout_width="@dimen/v2x_share_btn_width"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
- android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+ android:background="@drawable/module_dw_common_corner_bkg_light"
android:gravity="center"
android:paddingTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_12"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index ed78168882..d6c90ada38 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -137,7 +137,7 @@
-
-
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
index 7e74267929..4707ce5636 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
@@ -50,7 +50,7 @@
android:layout_height="@dimen/v2x_share_btn_height"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_60"
- android:background="@drawable/v2xt_dw_common_corner_bkg_light"
+ android:background="@drawable/module_dw_common_corner_bkg_light"
android:gravity="center"
android:text="刷新"
android:textColor="#FFFFFF"
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 56f8efe5eb..c99bf31c73 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -66,8 +66,6 @@
16px
117px
50px
- 150px
- 48px
17px
16px
36px
@@ -78,7 +76,7 @@
29px
-8px
84px
- 120px
+
16px
20px
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 21d1f7de8c..53a5cae3b8 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -64,8 +64,6 @@
140px
219px
100px
- 281px
- 90px
28px
28px
67.5px
@@ -77,7 +75,6 @@
-10px
114px
158px
- 300px
26px
25px
diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml
index 7df2cc766f..66fbad446e 100644
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -13,7 +13,6 @@
#FFFFFF
#FFFFFF
#ff616381
- #FFFFFF
#555A75
#000000
#FFF
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index 0a2a6ea64b..ff98b44a12 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -61,8 +61,6 @@
16px
117px
200px
- 150px
- 48px
17px
16px
36px
@@ -73,6 +71,6 @@
29px
-8px
84px
- 120px
+
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/module_dw_common_corner_bkg_light.xml
similarity index 100%
rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2xt_dw_common_corner_bkg_dark_light.xml
rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable/module_dw_common_corner_bkg_light.xml