From 058eb515f035a631253edada2dd339f97c117286 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 10 Jan 2020 18:05:53 +0800
Subject: [PATCH] add share page

---
 .idea/gradle.xml                              |   1 +
 build.gradle                                  |   4 +-
 config.gradle                                 |   1 +
 gradle.properties                             |   1 +
 modules/mogo-module-extensions/build.gradle   |   2 +
 .../extensions/entrance/EntranceFragment.java |   4 ++
 modules/mogo-module-share/.gitignore          |   1 +
 modules/mogo-module-share/build.gradle        |  63 ++++++++++++++++++
 modules/mogo-module-share/consumer-rules.pro  |   0
 modules/mogo-module-share/gradle.properties   |   3 +
 modules/mogo-module-share/proguard-rules.pro  |  21 ++++++
 .../ExampleInstrumentedTest.kt                |  24 +++++++
 .../src/main/AndroidManifest.xml              |   2 +
 .../com/mogo/module/share/IShareControl.java  |  25 +++++++
 .../com/mogo/module/share/ShareControl.java   |  22 ++++++
 .../share/dialog}/LaucherShareDialog.java     |  49 +++++++-------
 .../main_video_play_btn_normal.png            | Bin 0 -> 3415 bytes
 .../main/res/layout/launcher_dialog_share.xml |  18 ++---
 .../src/main/res/values/colors.xml            |  18 +++++
 .../src/main/res/values/strings.xml           |   3 +
 .../mogo_module_share/ExampleUnitTest.kt      |  17 +++++
 .../tanlu/fragment/TanluCardViewFragment.java |  21 +++---
 settings.gradle                               |   1 +
 23 files changed, 257 insertions(+), 44 deletions(-)
 create mode 100644 modules/mogo-module-share/.gitignore
 create mode 100644 modules/mogo-module-share/build.gradle
 create mode 100644 modules/mogo-module-share/consumer-rules.pro
 create mode 100644 modules/mogo-module-share/gradle.properties
 create mode 100644 modules/mogo-module-share/proguard-rules.pro
 create mode 100644 modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt
 create mode 100644 modules/mogo-module-share/src/main/AndroidManifest.xml
 create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java
 create mode 100644 modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
 rename modules/{mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view => mogo-module-share/src/main/java/com/mogo/module/share/dialog}/LaucherShareDialog.java (57%)
 create mode 100644 modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png
 rename modules/{mogo-module-tanlu => mogo-module-share}/src/main/res/layout/launcher_dialog_share.xml (72%)
 create mode 100644 modules/mogo-module-share/src/main/res/values/colors.xml
 create mode 100644 modules/mogo-module-share/src/main/res/values/strings.xml
 create mode 100644 modules/mogo-module-share/src/test/java/com/example/mogo_module_share/ExampleUnitTest.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1a786d501e..26618df6e9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -25,6 +25,7 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-map" />
             <option value="$PROJECT_DIR$/modules/mogo-module-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-share" />
             <option value="$PROJECT_DIR$/modules/mogo-module-tanlu" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />
diff --git a/build.gradle b/build.gradle
index 93aead74f5..fe76aac9ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ def getValueFromRootProperties(String key) {
 afterEvaluate {
     rootProject.subprojects { project ->
         project.afterEvaluate {
-            dependencies{
+            dependencies {
                 components {
                     all { ComponentMetadataDetails details ->
                         if (details.toString().endsWith("-SNAPSHOT")) {
@@ -87,4 +87,4 @@ afterEvaluate {
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/config.gradle b/config.gradle
index 8eb80a6f88..46b9fc53fc 100644
--- a/config.gradle
+++ b/config.gradle
@@ -81,6 +81,7 @@ ext {
             moduledemo               : "com.mogo.module:module-demo:${DEMO_MODULE_MAP_VERSION}",
             moduledemo2              : "com.mogo.module:module-demo2:${DEMO_MODULE_MAP2_VERSION}",
             moduletanlu              : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}",
+            moduleshare              : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}",
             mogocommons              : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}",
             mogoutils                : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}",
             mapamap                  : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}",
diff --git a/gradle.properties b/gradle.properties
index 63b2f24080..c2bc11e8c9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,6 +29,7 @@ RELEASE=false
 DEMO_MODULE_MAP_VERSION=1.0.0-SNAPSHOT
 DEMO_MODULE_MAP2_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_TANLU_VERSION=1.0.0-SNAPSHOT
+MOGO_MODULE_SHARE_VERSION=1.0.0-SNAPSHOT
 MOGO_COMMONS_VERSION=1.0.0-SNAPSHOT
 MOGO_UTILS_VERSION=1.0.0-SNAPSHOT
 MAP_AMAP_VERSION=1.0.0-SNAPSHOT
diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle
index 8b4348232b..7ec6c89d89 100644
--- a/modules/mogo-module-extensions/build.gradle
+++ b/modules/mogo-module-extensions/build.gradle
@@ -50,6 +50,7 @@ dependencies {
         api rootProject.ext.dependencies.mogocommons
         api rootProject.ext.dependencies.mogoserviceapi
         implementation rootProject.ext.dependencies.modulecommon
+        implementation rootProject.ext.dependencies.moduleshare
     } else {
         api project(":libraries:mogo-map")
         api project(":libraries:mogo-map-api")
@@ -57,6 +58,7 @@ dependencies {
         api project(":foudations:mogo-commons")
         api project(':services:mogo-service-api')
         implementation project(':modules:mogo-module-common')
+        implementation project(':modules:mogo-module-share')
     }
 }
 
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 d1eefcb5a3..ed2738e085 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
@@ -28,6 +28,8 @@ import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.extensions.ExtensionsModuleConst;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.navi.NaviInfoView;
+import com.mogo.module.share.ShareControl;
+import com.mogo.module.share.dialog.LaucherShareDialog;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.fragmentmanager.FragmentDescriptor;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
@@ -106,6 +108,8 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
 
         mUploadRoadCondition = findViewById( R.id.module_entrance_id_upload_road_condition );
         mUploadRoadCondition.setOnClickListener( view -> {
+            ShareControl shareControl = new ShareControl();
+            shareControl.showDialog(getActivity());
         } );
 
         mVRMode = findViewById( R.id.module_entrance_id_vr_mode );
diff --git a/modules/mogo-module-share/.gitignore b/modules/mogo-module-share/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/modules/mogo-module-share/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle
new file mode 100644
index 0000000000..5fee9fa316
--- /dev/null
+++ b/modules/mogo-module-share/build.gradle
@@ -0,0 +1,63 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+apply plugin: 'com.alibaba.arouter'
+
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+    implementation rootProject.ext.dependencies.arouter
+    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    implementation rootProject.ext.dependencies.rxjava
+    implementation rootProject.ext.dependencies.rxandroid
+
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.mogoutils
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.modulecommon
+    } else {
+        implementation project(":foudations:mogo-utils")
+        api project(":foudations:mogo-commons")
+        implementation project(':modules:mogo-module-common')
+    }
+
+}
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
+repositories {
+    mavenCentral()
+}
diff --git a/modules/mogo-module-share/consumer-rules.pro b/modules/mogo-module-share/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-share/gradle.properties b/modules/mogo-module-share/gradle.properties
new file mode 100644
index 0000000000..ae56b543b4
--- /dev/null
+++ b/modules/mogo-module-share/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-share
+VERSION_CODE=1
diff --git a/modules/mogo-module-share/proguard-rules.pro b/modules/mogo-module-share/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/modules/mogo-module-share/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt b/modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..4d8f4c5680
--- /dev/null
+++ b/modules/mogo-module-share/src/androidTest/java/com/example/mogo_module_share/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.example.mogo_module_share
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.mogo_module_share.test", appContext.packageName)
+    }
+}
diff --git a/modules/mogo-module-share/src/main/AndroidManifest.xml b/modules/mogo-module-share/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..82aba71bd0
--- /dev/null
+++ b/modules/mogo-module-share/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.module.share" />
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java
new file mode 100644
index 0000000000..76d27221e9
--- /dev/null
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java
@@ -0,0 +1,25 @@
+package com.mogo.module.share;
+
+import android.content.Context;
+
+import androidx.annotation.Keep;
+
+/**
+ * @author lixiaopeng
+ * @description
+ * @since 2020-01-10
+ */
+@Keep
+public interface IShareControl {
+    /**
+     * 显示对话框
+     */
+    @Keep
+    void showDialog(Context context);
+
+    /**
+     * 对话框消失
+     */
+    @Keep
+    void dismissDialog();
+}
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
new file mode 100644
index 0000000000..5d09b0d770
--- /dev/null
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -0,0 +1,22 @@
+package com.mogo.module.share;
+
+import android.content.Context;
+import com.mogo.module.share.dialog.LaucherShareDialog;
+
+/**
+ * @author lixiaopeng
+ * @description 分享弹框接口
+ * @since 2020-01-10
+ */
+public class ShareControl implements IShareControl {
+    @Override
+    public void showDialog(Context context) {
+        LaucherShareDialog shareDialog = new LaucherShareDialog(context);
+        shareDialog.show();
+    }
+
+    @Override
+    public void dismissDialog() {
+
+    }
+}
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
similarity index 57%
rename from modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/LaucherShareDialog.java
rename to modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
index 71bd9a1c8d..4d3ad002d3 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/LaucherShareDialog.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
@@ -1,14 +1,18 @@
-package com.mogo.module.tanlu.view;
+package com.mogo.module.share.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.mogo.module.tanlu.R;
+import com.mogo.module.share.R;
+import com.mogo.utils.logger.Logger;
+
 
 /**
  * @author lixiaopeng
@@ -16,12 +20,14 @@ import com.mogo.module.tanlu.R;
  * @since 2020-01-10
  */
 public class LaucherShareDialog extends Dialog implements View.OnClickListener {
-
     private TextView txtOk;
+    private ImageView mBackImage;
+    private Context mContext;
 
 
     public LaucherShareDialog(@NonNull Context context) {
         super(context);
+        this.mContext = context;
     }
 
     public LaucherShareDialog(@NonNull Context context, int themeResId) {
@@ -31,48 +37,41 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         initView();
         initListener();
-
-        txtOk.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                if (onOkListener != null) {
-//                    onOkListener.onClick(v);
-//                }
-            }
-        });
-
     }
 
     private void initView() {
         setContentView(R.layout.launcher_dialog_share);
         txtOk = findViewById(R.id.btn_share_title);
-
+        mBackImage = findViewById(R.id.btn_back);
     }
 
     private void initListener() {
-        txtOk.setOnClickListener(this);
+        mBackImage.setOnClickListener(this);
 
     }
 
+
     @Override
     public void onClick(View view) {
         int id = view.getId();
-        if (id == R.id.btn_share_title) {
-
+        if (id == R.id.btn_back) {
+            sendShareReceiver();
+            dismiss();
         }
     }
 
-
-    public void setOnOkClickListener(View.OnClickListener onOkClickListener) {
-
+    /**
+     * 发送广播
+     */
+    private void sendShareReceiver() {
+        Logger.d("liyz", "LaucherShareDialog sendShareReceiver ---->");
+        Intent intent = new Intent();
+        intent.setAction("com.zhidao.roadcondition.share");
+        intent.putExtra("type", "1");
+        mContext.sendBroadcast(intent);
     }
 
 
-    public void setOnCancelListener(View.OnClickListener onCancelListener) {
-
-    }
-
 }
diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..7db2e805eea93f99e7fefc9c84a4dc1312e39472
GIT binary patch
literal 3415
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

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-tanlu/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
similarity index 72%
rename from modules/mogo-module-tanlu/src/main/res/layout/launcher_dialog_share.xml
rename to modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
index 3bef28759b..0e191c8292 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/launcher_dialog_share.xml
+++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:background="@color/color_545362"
+    android:layout_width="1980dp"
+    android:layout_height="1080dp">
 
     <TextView
         android:id="@+id/btn_share_title"
@@ -11,13 +11,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_60"
         android:layout_marginBottom="@dimen/dp_35"
         android:clickable="true"
         android:gravity="center_vertical|center_horizontal"
         android:text="我要分享"
-        android:textColor="@color/color_1F7FFF"
-        android:textSize="@dimen/dp_20" />
+        android:textColor="@color/white"
+        android:textSize="@dimen/dp_30" />
 
 
     <RelativeLayout
@@ -27,13 +27,13 @@
 
         <ImageView
             android:id="@+id/btn_back"
-            android:layout_width="@dimen/dp_55"
-            android:layout_height="@dimen/dp_55"
+            android:layout_width="@dimen/dp_90"
+            android:layout_height="@dimen/dp_90"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
             android:layout_marginLeft="@dimen/dp_50"
             android:layout_marginTop="@dimen/dp_65"
-            android:src="@mipmap/share_back_image" />
+            android:src="@drawable/main_video_play_btn_normal" />
 
     </RelativeLayout>
 
diff --git a/modules/mogo-module-share/src/main/res/values/colors.xml b/modules/mogo-module-share/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..0081f334bf
--- /dev/null
+++ b/modules/mogo-module-share/src/main/res/values/colors.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#000000</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorAccent">#1F7FFF</color>
+
+    <color name="red_tips">#FF1B1B</color>
+    <color name="white">#FFFFFF</color>
+    <color name="white_50">#80FFFFFF</color>
+    <color name="color_F8F8F8">#F8F8F8</color>
+    <color name="color_3">#333333</color>
+    <color name="color_DADAE2">#DADAE2</color>
+    <color name="color_545362">#545362</color>
+    <color name="color_191C25">#99191C25</color>
+    <color name="color_666666">#666666</color>
+    <color name="color_999999">#999999</color>
+
+</resources>
diff --git a/modules/mogo-module-share/src/main/res/values/strings.xml b/modules/mogo-module-share/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..94c5463011
--- /dev/null
+++ b/modules/mogo-module-share/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">share</string>
+</resources>
diff --git a/modules/mogo-module-share/src/test/java/com/example/mogo_module_share/ExampleUnitTest.kt b/modules/mogo-module-share/src/test/java/com/example/mogo_module_share/ExampleUnitTest.kt
new file mode 100644
index 0000000000..5f9bdcdccd
--- /dev/null
+++ b/modules/mogo-module-share/src/test/java/com/example/mogo_module_share/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.example.mogo_module_share
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
index 4ac2760951..cf785b7158 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
@@ -38,7 +38,6 @@ import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.tanlu.callback.AlongTheWayCallback;
 import com.mogo.module.tanlu.callback.RoadLineCallback;
 import com.mogo.module.tanlu.callback.VoiceSearchCallback;
-import com.mogo.module.tanlu.constant.HttpConst;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.tanlu.model.Information;
 import com.mogo.module.tanlu.model.InformationAndLiveCarResult;
@@ -59,8 +58,6 @@ import com.mogo.module.tanlu.video.FullMediaActivity;
 import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer;
 import com.mogo.module.tanlu.view.AutoZoomInImageView;
 import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.module.ModuleType;
-import com.mogo.service.network.IMogoNetwork;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
@@ -265,6 +262,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
             if (markerExploreWayList.size() > currentPosition && currentPosition >= 0) {
                 handleData(markerExploreWayList.get(currentPosition));
             }
+
         } else if (id == R.id.tv_next_res) { //下一个
             //判断是图片还是视频，最后一个时，下一个不可点击
             Logger.d(TAG, " tv_next_res  --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size());
@@ -309,7 +307,14 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
         MarkerExploreWay exploreWay = (MarkerExploreWay) marker.getObject();
         handleData(exploreWay);
 
-        //TODO 更新位置currentPosition
+        //更新位置currentPosition
+        for (int i = 0; i < markerExploreWayList.size(); i++) {
+            if (markerExploreWayList.get(i).getAddr().equals(exploreWay.getAddr())) {
+                currentPosition = i;
+                break;
+            }
+            Logger.d(TAG, "onMarkerClicked currentPosition = " + currentPosition);
+        }
 
         return true;
     }
@@ -457,7 +462,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
 
     @Override
     public void onMapLoaded() {
-        Logger.d(TAG, "地图加载事件");
+//        Logger.d(TAG, "地图加载事件");
     }
 
     @Override
@@ -543,17 +548,17 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
                 MogoMarkerOptions options = new MogoMarkerOptions()
                         .icon(mMarkerIcon)
                         .latitude(event.lat)
-                        .owner("tag")
+                        .owner(TanluConstants.MODEL_NAME)
                         .longitude(event.lon);
 
                 mMogoMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(getContext());
                 mMarkerManager = mMogoMapService.getMarkerManager(getContext());
-                IMogoMarker marker = mMarkerManager.addMarker("tag", options);
+                IMogoMarker marker = mMarkerManager.addMarker(TanluConstants.MODEL_NAME, options);
             }
 
             @Override
             public void onFailure(Exception e) {
-                Logger.e(TAG, "onMarkerInfo onFailure -----E->" + e);
+                Logger.e(TAG, "onMarkerInfo onFailure -----e =" + e);
             }
         });
     }
diff --git a/settings.gradle b/settings.gradle
index e070d5df36..b76d40d28f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,7 @@ include ':modules:mogo-module-common'
 include ':modules:mogo-module-main'
 include ':modules:mogo-module-search'
 include ':modules:mogo-module-tanlu'
+include ':modules:mogo-module-share'
 include ':modules:mogo-module-service'
 include ':libraries:map-amap'
 //include ':libraries:map-baidu'