diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8e9756d758..b59a552525 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -77,6 +77,7 @@
+
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index a1942225d4..3fc7d6bba3 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -3,9 +3,9 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
d82xImplementation rootProject.ext.dependencies.moduleleftpanel
- em1Implementation rootProject.ext.dependencies.moduleleftpanel
bydautoImplementation rootProject.ext.dependencies.moduleleftpanel
+ em1Implementation rootProject.ext.dependencies.moduleleftpanelnoop
d8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
d80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop
em4Implementation rootProject.ext.dependencies.moduleleftpanelnoop
@@ -16,9 +16,9 @@ project.dependencies {
em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
} else {
d82xImplementation project(':modules:mogo-module-left-panel')
- em1Implementation project(':modules:mogo-module-left-panel')
bydautoImplementation project(':modules:mogo-module-left-panel')
-
+
+ em1Implementation project(':modules:mogo-module-left-panel-noop')
d8xxImplementation project(':modules:mogo-module-left-panel-noop')
d80xImplementation project(':modules:mogo-module-left-panel-noop')
em4Implementation project(':modules:mogo-module-left-panel-noop')
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 28b1bccd75..9fceff9c20 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -195,7 +195,11 @@ public class EntranceFragment extends MvpFragment {
- MyLocationUtil.emphasizeMyLocation();
-// View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
-// TextView tv = v.findViewById(R.id.tvIndex);
-// tv.setText("sub view height: " + currentHeight + ": " + v);
-// mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() {
-// @Override
-// public void onViewAdded(View view) {
-// Logger.d(TAG, "onSubViewAdded: " + view);
-// }
-//
-// @Override
-// public void onViewRemoved(View view) {
-// Logger.d(TAG, "onSubViewRemoved: " + view);
-// }
-//
-// @Override
-// public void beforeViewAddAnim(View view) {
-// Logger.d(TAG, "beforeSubViewAddAnim: " + view);
-// }
-//
-// @Override
-// public void beforeViewRemoveAnim(View view) {
-// Logger.d(TAG, "beforeSubViewRemoveAnim: " + view);
-// }
-// });
+// MyLocationUtil.emphasizeMyLocation();
+ View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
+ TextView tv = v.findViewById(R.id.tvIndex);
+ tv.setText("sub view height: " + currentHeight + ": " + v);
+ mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() {
+ @Override
+ public void onViewAdded(View view) {
+ Logger.d(TAG, "onSubViewAdded: " + view);
+ }
+
+ @Override
+ public void onViewRemoved(View view) {
+ Logger.d(TAG, "onSubViewRemoved: " + view);
+ }
+
+ @Override
+ public void beforeViewAddAnim(View view) {
+ Logger.d(TAG, "beforeSubViewAddAnim: " + view);
+ }
+
+ @Override
+ public void beforeViewRemoveAnim(View view) {
+ Logger.d(TAG, "beforeSubViewRemoveAnim: " + view);
+ }
+ });
});
findViewById(R.id.btnDebugCtrlTopView).setOnClickListener(view -> {
- SharedPrefsMgr.getInstance(getContext()).putString("MY_LOCATION_CONFIG", "https" +
- "://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1605705508574" +
- "&di=339d3259ad21f5f48c8abcd1bafff324&imgtype=0&src=http%3A%2F%2Fc-ssl" +
- ".duitang.com%2Fuploads%2Fitem%2F202004%2F23%2F20200423111550_4AJLr.thumb" +
- ".1000_0.jpeg");
- MyLocationUtil.setMyLocationIconUrl(getContext(),"https" +
- "://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1605705508574" +
- "&di=339d3259ad21f5f48c8abcd1bafff324&imgtype=0&src=http%3A%2F%2Fc-ssl" +
- ".duitang.com%2Fuploads%2Fitem%2F202004%2F23%2F20200423111550_4AJLr.thumb" +
- ".1000_0.jpeg");
- MyLocationUtil.emphasizeMyLocation();
-// View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
-// TextView tv = v.findViewById(R.id.tvIndex);
-// Random random = new Random();
-// currentHeight = heights[random.nextInt(3)];
-// tv.setText(" height: " + currentHeight + ": " + v);
-// ViewGroup.LayoutParams params =
-// new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight);
+// SharedPrefsMgr.getInstance(getContext()).putString("MY_LOCATION_CONFIG", "https" +
+// "://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1605705508574" +
+// "&di=339d3259ad21f5f48c8abcd1bafff324&imgtype=0&src=http%3A%2F%2Fc-ssl" +
+// ".duitang.com%2Fuploads%2Fitem%2F202004%2F23%2F20200423111550_4AJLr.thumb" +
+// ".1000_0.jpeg");
+// MyLocationUtil.setMyLocationIconUrl(getContext(),"https" +
+// "://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1605705508574" +
+// "&di=339d3259ad21f5f48c8abcd1bafff324&imgtype=0&src=http%3A%2F%2Fc-ssl" +
+// ".duitang.com%2Fuploads%2Fitem%2F202004%2F23%2F20200423111550_4AJLr.thumb" +
+// ".1000_0.jpeg");
+// MyLocationUtil.emphasizeMyLocation();
+ View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
+ TextView tv = v.findViewById(R.id.tvIndex);
+ Random random = new Random();
+ currentHeight = heights[random.nextInt(3)];
+ tv.setText(" height: " + currentHeight + ": " + v);
+ ViewGroup.LayoutParams params =
+ new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight);
// mApis.getEntranceButtonController().addLeftFeatureView(v);
-// mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() {
-// @Override
-// public void onViewAdded(View view) {
-// Logger.d(TAG, "onViewAdded: " + view);
-// }
-//
-// @Override
-// public void onViewRemoved(View view) {
-// Logger.d(TAG, "onViewRemoved: " + view);
-// }
-//
-// @Override
-// public void beforeViewAddAnim(View view) {
-// Logger.d(TAG, "beforeViewAddAnim: " + view);
-// }
-//
-// @Override
-// public void beforeViewRemoveAnim(View view) {
-// Logger.d(TAG, "beforeViewRemoveAnim: " + view);
-// }
-// });
+ mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() {
+ @Override
+ public void onViewAdded(View view) {
+ Logger.d(TAG, "onViewAdded: " + view);
+ }
+
+ @Override
+ public void onViewRemoved(View view) {
+ Logger.d(TAG, "onViewRemoved: " + view);
+ }
+
+ @Override
+ public void beforeViewAddAnim(View view) {
+ Logger.d(TAG, "beforeViewAddAnim: " + view);
+ }
+
+ @Override
+ public void beforeViewRemoveAnim(View view) {
+ Logger.d(TAG, "beforeViewRemoveAnim: " + view);
+ }
+ });
});
findViewById(R.id.btnDebugAddBottomLayerView).setOnClickListener(v -> {
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_share_no_map.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_share_no_map.png
new file mode 100644
index 0000000000..c2aa81d0f6
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_share_no_map.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_share_no_map_click.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_share_no_map_click.png
new file mode 100644
index 0000000000..fade23ec8e
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_share_no_map_click.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_share_no_map.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_share_no_map.png
new file mode 100644
index 0000000000..c2aa81d0f6
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_share_no_map.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_share_no_map_click.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_share_no_map_click.png
new file mode 100644
index 0000000000..fade23ec8e
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_share_no_map_click.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_share_no_map_selector.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_share_no_map_selector.xml
new file mode 100644
index 0000000000..b1a91b4bfe
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_share_no_map_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_top_container_shader_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_top_container_shader_bg.xml
new file mode 100644
index 0000000000..12be6e29d0
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_top_container_shader_bg.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml
new file mode 100644
index 0000000000..7acc4204c5
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index 227b7ec82b..af3016c3c6 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -40,6 +40,8 @@
82px
66px
66px
+ 120px
+ 120px
8px
16px
34.5px
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
index 5ed6ad9426..c69e16a9ab 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
@@ -9,7 +9,8 @@
+ android:layout_height="match_parent"
+ android:background="#000"/>