diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000000..2e92d39135 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +MogoLauncher \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000..681f41ae2a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000000..b68060b9df --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java new file mode 100644 index 0000000000..5f9a7b6385 --- /dev/null +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java @@ -0,0 +1,18 @@ +package com.mogo.module.share.constant; + +/** + * @author lixiaopeng + * @since 2019-1-19 + *

+ * 描述 + */ +public class ShareConstants { + + //埋点数据 + //分享分类 + public static final String LAUNCHER_SHARE_TYPE = "Launcher_Share_type"; + //分享/上报按钮点击 + public static final String LAUNCHER_SHARE_CLICK = "Launcher_Share_Click"; + // + public static final String CARNET_USER_UPLOAD = "CarNet_user_upload"; +} diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index d5e7a79308..fdd8fad891 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -11,9 +11,16 @@ import android.widget.TextView; import androidx.annotation.NonNull; +import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.share.R; +import com.mogo.module.share.constant.ShareConstants; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.utils.logger.Logger; +import java.util.HashMap; +import java.util.Map; + /** * @author lixiaopeng @@ -27,12 +34,15 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { private RelativeLayout mTrafficCheckLayout; private RelativeLayout mRoadClosureLayout; private Context mContext; + private IMogoAnalytics mAnalytics; public LaucherShareDialog(@NonNull Context context) { super(context, R.style.BottomDialog); this.mContext = context; getWindow().setBackgroundDrawableResource(android.R.color.transparent); + mAnalytics = (IMogoAnalytics) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(mContext); + } public LaucherShareDialog(@NonNull Context context, int themeResId) { @@ -68,15 +78,23 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { public void onClick(View view) { int id = view.getId(); if (id == R.id.btn_block_layout) { //拥堵 + traceTanluData("1"); sendShareReceiver("1"); + traceTypeData("1"); } else if (id == R.id.oil_price_layout) { + traceData("1"); Intent intent = new Intent(); intent.setData(Uri.parse("reshthing://com.zhidao.fresh.things/shareOilPrice")); mContext.startActivity(intent); + traceTypeData("2"); } else if (id == R.id.traffic_check_layout) { //交通检查 + traceData("1"); sendShareReceiver("2"); + traceTypeData("3"); } else if (id == R.id.road_closure_layout) { //封路 + traceData("1"); sendShareReceiver("3"); + traceTypeData("4"); } dismiss(); @@ -93,5 +111,34 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { mContext.sendBroadcast(intent); } + /** + * type=1 路况 + *

+ * type=2 油价 + *

+ * type=3 交通检查 + *

+ * type=4 封路 + * + * @param type + */ + private void traceTypeData(String type) { + Map properties = new HashMap<>(); + properties.put("type", type); + mAnalytics.track(ShareConstants.LAUNCHER_SHARE_TYPE, properties); + } + + private void traceData(String from) { + Map properties = new HashMap<>(); + properties.put("from", from); + mAnalytics.track(ShareConstants.LAUNCHER_SHARE_TYPE, properties); + } + + private void traceTanluData(String type) { + Map properties = new HashMap<>(); + properties.put("type", type); + mAnalytics.track(ShareConstants.CARNET_USER_UPLOAD, properties); + } + } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java index 5472fb444e..35444c8bec 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java @@ -27,4 +27,15 @@ public class TanluConstants { public static final String SHARE_TRAFFIC_CHECK = "com.zhidao.share.traffic.check"; //我要分享 public static final String GO_TO_SHARE = "com.zhidao.share"; + + + + //埋点数据 + //marker点击 + public static final String LAUNCHER_ICON_CLICK = "Launcher_Icon_Click"; + //分享分类 + public static final String LAUNCHER_SHARE_TYPE = "Launcher_Share_type"; + //分享/上报按钮点击 from=1 手动点击 from=2 语音打开 + public static final String LAUNCHER_SHARE_CLICK = "Launcher_Share_Click"; + public static final String CARNET_USER_UPLOAD = "CarNet_user_upload"; } 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 d2a77a3653..f1a23c0723 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 @@ -56,6 +56,7 @@ import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.MarkerUserInfo; import com.mogo.module.service.receiver.MogoReceiver; import com.mogo.module.share.ShareControl; +import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.tanlu.R; import com.mogo.module.tanlu.callback.AlongTheWayCallback; import com.mogo.module.tanlu.callback.RoadLineCallback; @@ -76,6 +77,7 @@ 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.MogoServicePaths; +import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.connection.IMogoSocketManager; import com.mogo.service.imageloader.IMogoImageLoaderListener; @@ -96,7 +98,9 @@ import org.greenrobot.eventbus.ThreadMode; import org.json.JSONObject; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Random; import static com.mogo.module.tanlu.util.StringUitlKt.formatDate; @@ -131,6 +135,7 @@ public class TanluCardViewFragment extends MvpFragment> private IMogoIntentManager mogoIntentManager; //免唤醒 private IMogoMapUIController mMApUIController; private GeocodeSearch mGeocodeSearch; + private IMogoAnalytics mAnalytics; //声音控制文字 private String voiceGetInfoMationTts; @@ -218,6 +223,7 @@ public class TanluCardViewFragment extends MvpFragment> mMApUIController = mMogoMapService.getMapUIController(); mGeocodeSearch = new GeocodeSearch(getContext()); mMogoStatusManager = (IMogoStatusManager) ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_MANAGER).navigation(getContext()); + mAnalytics = (IMogoAnalytics) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(getContext()); //poi查询 mGeocodeSearch.setOnGeocodeSearchListener(new GeocodeSearch.OnGeocodeSearchListener() { @@ -355,6 +361,11 @@ public class TanluCardViewFragment extends MvpFragment> mMogoRegisterCenter.registerMogoMarkerClickListener(TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() { @Override public boolean onMarkerClicked(IMogoMarker marker) { + //marker 点击 + Map properties = new HashMap<>(); + properties.put("type", "2"); + mAnalytics.track(TanluConstants.LAUNCHER_ICON_CLICK, properties); + mEmptyLayout.setVisibility(View.GONE); mRootLayout.setVisibility(View.VISIBLE); MarkerExploreWay exploreWay = extractFromMarker(marker); @@ -444,15 +455,20 @@ public class TanluCardViewFragment extends MvpFragment> e.printStackTrace(); } } else if (intentStr.equals(TanluConstants.UPLOAD_ROAD_CONDITION)) { //上报路况 免唤醒 --ok + traceTanluData("2"); sendShareReceiver("1"); Logger.d(TAG, "mogoIntentListener 上报路况 ----> "); - + traceTypeData("1"); } else if (intentStr.equals(TanluConstants.SHARE_ROAD_CLOSURE)) { //分享封路 --ok + traceData("2"); sendShareReceiver("3"); Logger.d(TAG, "mogoIntentListener 分享封路 ----> "); + traceTypeData("4"); } else if (intentStr.equals(TanluConstants.SHARE_TRAFFIC_CHECK)) { //分享交通检查 --ok + traceData("2"); sendShareReceiver("2"); Logger.d(TAG, "mogoIntentListener 分享交通检查 ----> "); + traceTypeData("3"); } else if (intentStr.equals(TanluConstants.GO_TO_SHARE)) { //我要分享 --ok ShareControl shareControl = new ShareControl(); shareControl.showDialog(getActivity()); @@ -461,6 +477,34 @@ public class TanluCardViewFragment extends MvpFragment> } }; + /** + * type=1 路况 + *

+ * type=2 油价 + *

+ * type=3 交通检查 + *

+ * type=4 封路 + * + * @param type + */ + private void traceTypeData(String type) { + Map properties = new HashMap<>(); + properties.put("type", type); + mAnalytics.track(TanluConstants.LAUNCHER_SHARE_TYPE, properties); + } + + private void traceData(String from) { + Map properties = new HashMap<>(); + properties.put("from", from); + mAnalytics.track(TanluConstants.LAUNCHER_SHARE_CLICK, properties); + } + + private void traceTanluData(String type) { + Map properties = new HashMap<>(); + properties.put("type", type); + mAnalytics.track(TanluConstants.CARNET_USER_UPLOAD, properties); + } /** * 免唤醒语音监听 @@ -849,18 +893,18 @@ public class TanluCardViewFragment extends MvpFragment> double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); double lon = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); String addressStr = TanluServiceHandler.getLocationClient().getLastKnowLocation().getAddress(); - + Log.d(TAG, "uploadShareInfo lat =" + lat + ">>>lon =" + lon + ">>>addressStr =" + addressStr); mTanluModelData.addTrafficCheckInfo(poiType, poiImgUrl, nickname, headImgUrl, lat, lon, addressStr, new UploadShareCallback() { @Override public void onSuccess(BaseData data) { - Logger.d(TAG, "uploadShareInfo onSuccess ----->"); + Log.d(TAG, "uploadShareInfo onSuccess ----->"); AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_success), null); } @Override public void onFail(String message, int code) { - Logger.e(TAG, "uploadShareInfo onFail ----->"); + Log.e(TAG, "uploadShareInfo onFail ----->"); AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_failed), null); } }); diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt index 2be3bb5c0f..effe820e7e 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt @@ -17,8 +17,7 @@ class MarkerInfoReceiver : BroadcastReceiver() { var imageUrl = intent.getStringExtra("imageUrl") var lat = intent.getLongExtra("lat",0) var lon = intent.getLongExtra("lon",0) //经度 - Log.d("MarkerInfoReceiver", "type = $type ---->lat = $lat ---->lon = $lon + " ) - Log.d("MarkerInfoReceiver", "") + Log.d("MarkerInfoReceiver", "type =" + type + "---->lat =" + lat + "----lon =" + lon + "---imageUrl =" + imageUrl) EventBus.getDefault().post(MarkerInfo(type, imageUrl,lon, lat)) } } diff --git a/modules/mogo-module-tanlu/src/main/res/values/strings.xml b/modules/mogo-module-tanlu/src/main/res/values/strings.xml index 104e6ba3bd..75dba528ee 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/strings.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ 已同意 探路共享计划 >> 探路APP用户服务协议 - 未找到其他用户分享的路况,
您可以试试上报路况]]> + 未找到其他用户分享的拥堵信息,
您可以试试分享拥堵]]> 未知区域 上报路况 正在更新情报数据