调整七鱼userId设置

app/src/main/java/com/datarecovery/master/data/repositories/AccountRepository.java

@@ -83,6 +83,7 @@ public class AccountRepository {
         KVUtils.getDefault().putString(KEY_LOGIN_TOKEN, token);
         //查找并存储userId
         refreshUserInfo();
+        QiYuHelper.setUserInfo(phoneNum, token);
     }
 
 
@@ -114,7 +115,6 @@ public class AccountRepository {
             @Override
             public void onSuccess(@NonNull UserInfoResponse userInfoResponse) {
                 requestUserInfoDisabled = false;
-                QiYuHelper.setUserInfo(getKeyLoginPhoneNum(), token);
                 KVUtils.getDefault().putString(KEY_LOGIN_USER_ID, userInfoResponse.getUserId());
             }
 

app/src/main/java/com/datarecovery/master/module/mine/MineViewModel.java

@@ -164,14 +164,13 @@ public class MineViewModel extends BaseViewModel {
 
     public void onCustomerServiceClick() {
         EventHelper.report(EventId.hf1001108);
-        QiYuHelper.openServiceActivity(ContextUtil.getContext());
-//        refreshCustomerUrl();
+        refreshCustomerUrl();
     }
 
     private void goCustomer(@NonNull CustomerUrlResponse customerResponse) {
         switch (customerResponse.getMethod()) {
             case CustomerUrlResponse.CustomerMethod.METHOD_QIYU:
-                Unicorn.openServiceActivity(ContextUtil.getContext(), "客服", null);
+                QiYuHelper.openServiceActivity(ContextUtil.getContext());
                 break;
             case CustomerUrlResponse.CustomerMethod.METHOD_ALI:
                 CustomerServiceActivity.start(ActivityUtil.getTopActivity(), customerResponse.getCustomerUrl());

app/src/main/java/com/datarecovery/master/sdk/qiyu/QiYuHelper.java

@@ -40,12 +40,7 @@ public class QiYuHelper {
 
     private static void setVisitorInfo() {
         YSFUserInfo userInfo = new YSFUserInfo();
-        String userId;
-        if (TextUtils.isEmpty(userId = KVUtils.getDefault().getString(VISITOR_KEY, null))) {
-            userId = UUID.randomUUID().toString();
-            KVUtils.getDefault().putString(VISITOR_KEY, userId);
-        }
-        userInfo.userId = userId;
+        userInfo.userId = getUserId();
         String appName = ContextUtil.getContext().getString(R.string.app_name) + "-访客";
         // CRM 扩展字段
         userInfo.data = "[\n" +
@@ -84,15 +79,19 @@ public class QiYuHelper {
         Unicorn.openServiceActivity(context, "客服", null);
     }
 
-    public static void setUserInfo(String phone, String token) {
-        YSFUserInfo userInfo = new YSFUserInfo();
-        // App 的用户 ID
+    private static String getUserId() {
         String userId;
         if (TextUtils.isEmpty(userId = KVUtils.getDefault().getString(VISITOR_KEY, null))) {
             userId = UUID.randomUUID().toString();
             KVUtils.getDefault().putString(VISITOR_KEY, userId);
         }
-        userInfo.userId = userId;
+        return userId;
+    }
+
+    public static void setUserInfo(String phone, String token) {
+        YSFUserInfo userInfo = new YSFUserInfo();
+        // App 的用户 ID
+        userInfo.userId = getUserId();
         // 当且仅当开发者在管理后台开启了 authToken 校验功能时，该字段才有效
         userInfo.authToken = token;
         String appName = ContextUtil.getContext().getString(R.string.app_name) + "-" + phone;