增加新埋点

app/src/main/java/com/datarecovery/master/data/consts/EventId.java

@@ -42,9 +42,12 @@ public interface EventId {
     String hf1000606 = "hf1000606"; // 服务详情-支付失败 ID:放弃支付hf11028，网络错误hf11021，其他原因hf11022
     String hf1000607 = "hf1000607"; // 服务详情-挽留弹窗-关闭图标-点击 id:微信消息恢复hf11011，微信好友恢复hf11009，图片恢复hf11001，文件恢复hf11003，视频恢复hf11005，音频恢复hf11007，图片清除hf11013
     String hf1000608 = "hf1000608"; // 服务详情-挽留弹窗-立即恢复按钮-点击 id:微信消息恢复hf11011，微信好友恢复hf11009，图片恢复hf11001，文件恢复hf11003，视频恢复hf11005，音频恢复hf11007，图片清除hf11013
+    String hf1001133 = "hf1001133"; // 服务详情-服务说明 id:微信消息恢复hf11011，微信好友恢复hf11009，图片恢复hf11001，文件恢复hf11003，视频恢复hf11005，音频恢复hf11007，图片清除hf11013
     String hf1000801 = "hf1000801"; // 案例-案例详情
     String hf1000901 = "hf1000901"; // 订单-点击
     String hf1001129 = "hf1001129"; //订单-点击复制教程
+    String hf1001131 = "hf1001131"; //订单-取消订单 id:微信消息恢复hf11011，微信好友恢复hf11009，图片恢复hf11001，文件恢复hf11003，视频恢复hf11005，音频恢复hf11007，图片清除hf11013
+    String hf1001132 = "hf1001132"; // 订单-去支付 id:微信消息恢复hf11011，微信好友恢复hf11009，图片恢复hf11001，文件恢复hf11003，视频恢复hf11005，音频恢复hf11007，图片清除hf11013 type1:支付宝支付hf11023，支付宝扫码支付hf11024
     String hf1001101 = "hf1001101"; // 我的-banner图-点击
     String hf1001102 = "hf1001102"; // 我的-关于我们-点击
     String hf1001103 = "hf1001103"; // 我的-关于我们-用户协议

app/src/main/java/com/datarecovery/master/module/member/MemberActivity.java

@@ -115,7 +115,10 @@ public class MemberActivity extends BaseActivity<ActivityMemberBinding> {
                 new String[]{getResources().getString(R.string.member_service_description)},
                 Color.parseColor("#FCEAC7"),
                 false,
-                v -> ServiceDescriptionActivity.start(this, memberViewModel.getServiceContentTxt())
+                v -> {
+                    ServiceDescriptionActivity.start(this, memberViewModel.getServiceContentTxt());
+                    EventHelper.report(EventId.hf1001133, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(memberViewModel.getMemberType())));
+                }
         );
     }
 

app/src/main/java/com/datarecovery/master/module/order/OrderViewModel.java

@@ -1,6 +1,7 @@
 package com.datarecovery.master.module.order;
 
 import android.accounts.NetworkErrorException;
+import android.annotation.SuppressLint;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
@@ -13,11 +14,18 @@ import com.datarecovery.master.data.api.bean.OrderBean;
 import com.datarecovery.master.data.api.bean.PayOptions;
 import com.datarecovery.master.data.api.response.OrderPageResponse;
 import com.datarecovery.master.data.consts.ErrorCode;
+import com.datarecovery.master.data.consts.EventId;
 import com.datarecovery.master.data.repositories.MemberRepository;
 import com.datarecovery.master.data.repositories.PayRepository;
+import com.datarecovery.master.handler.EventHelper;
+import com.datarecovery.master.utils.Maps;
+import com.datarecovery.master.utils.ReportUtil;
 import com.datarecovery.master.utils.ToastUtil;
+import com.umeng.vt.diff.V;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -93,10 +101,12 @@ public class OrderViewModel extends BaseViewModel {
     }
 
 
+    @SuppressLint("WrongConstant")
     public void cancelOrder(OrderBean orderBean) {
         if (orderBean == null) {
             return;
         }
+        EventHelper.report(EventId.hf1001131, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(orderBean.getAuths())));
         payRepository.cancelOrder(orderBean.getId()).subscribe(new SingleObserver<Object>() {
             @Override
             public void onSubscribe(@NonNull Disposable d) {
@@ -131,6 +141,7 @@ public class OrderViewModel extends BaseViewModel {
         });
     }
 
+    @SuppressLint("WrongConstant")
     public void payOrder(OrderBean orderBean) {
         if (orderBean == null) {
             return;
@@ -138,6 +149,18 @@ public class OrderViewModel extends BaseViewModel {
         int payPlatform = orderBean.getPayPlatform();
         int payMethod = orderBean.getPayMethod();
         int goodsId = orderBean.getItemId();
+        HashMap<String, Object> map = new HashMap<>(2);
+        map.put(EventId.EVENT_ID, ReportUtil.getReportId(orderBean.getAuths()));
+        if (orderBean.getPayPlatform() == 1 && orderBean.getPayMethod() == 2) {
+
+        } else if (orderBean.getPayPlatform() == 4 && orderBean.getPayMethod() == 2) {
+
+        } else if (orderBean.getPayPlatform() == 1 && orderBean.getPayMethod() == 1) {//支付宝
+            map.put(EventId.EVENT_TYPE1, "hf11023");
+        } else if (orderBean.getPayPlatform() == 4 && orderBean.getPayMethod() == 1) {//支付宝扫码
+            map.put(EventId.EVENT_TYPE1, "hf11024");
+        }
+        EventHelper.report(EventId.hf1001132, map);
         memberRepository.payOrder(new PayOptions(
                 this::addDisposable,
                 goodsId,