Browse Source

[Fix]引力引擎初始化问题

litchi98 1 week ago
parent
commit
c745e3f237

+ 3 - 2
app/src/main/java/com/datarecovery/master/App.java

@@ -6,6 +6,7 @@ import com.atmob.app.lib.base.BaseApplication;
 import com.atmob.channelreader.ChannelReader;
 import com.atmob.common.runtime.ProcessUtil;
 import com.atmob.sdk.appconvert.AppConvert;
+import com.atmob.sdk.gravity_engine.GravityEngine;
 import com.atmob.user.AtmobUser;
 import com.datarecovery.master.data.consts.Constants;
 import com.datarecovery.master.sdk.bugly.BuglyHelper;
@@ -123,7 +124,7 @@ public class App extends BaseApplication {
     }
 
     private void initBugly() {
-//        BuglyHelper.init(this);
+        BuglyHelper.init(this);
     }
 
     private void initAppConvert() {
@@ -131,7 +132,7 @@ public class App extends BaseApplication {
     }
 
     private void initGravityEngine() {
-//        GravityEngine.init(BuildConfig.GRAVITY_ACCESS_TOKEN, BuildConfig.DEBUG);
+        GravityEngine.init(BuildConfig.GRAVITY_ACCESS_TOKEN, BuildConfig.DEBUG);
     }
 
     public void firstPrivacyRelated() {

+ 18 - 4
app/src/main/java/com/datarecovery/master/module/mine/MineViewModel.java

@@ -8,19 +8,21 @@ import androidx.lifecycle.Transformations;
 
 import com.atmob.app.lib.base.BaseViewModel;
 import com.atmob.app.lib.livedata.SingleLiveEvent;
+import com.atmob.auth.AtmobAuth;
 import com.atmob.common.runtime.ActivityUtil;
 import com.atmob.common.runtime.ContextUtil;
+import com.atmob.compliance.AtmobCompliance;
 import com.datarecovery.master.R;
 import com.datarecovery.master.data.api.response.CustomerUrlResponse;
 import com.datarecovery.master.data.consts.ChannelHelper;
 import com.datarecovery.master.data.consts.ChannelId;
-import com.datarecovery.master.data.consts.ErrorCode;
 import com.datarecovery.master.data.consts.EventId;
 import com.datarecovery.master.data.repositories.AccountRepository;
 import com.datarecovery.master.data.repositories.ConfigRepository;
 import com.datarecovery.master.data.repositories.DeviceFuncRepository;
 import com.datarecovery.master.handler.EventHelper;
 import com.datarecovery.master.module.about.AboutActivity;
+import com.datarecovery.master.module.browser.BrowserActivity;
 import com.datarecovery.master.module.customerservice.CustomerServiceActivity;
 import com.datarecovery.master.module.feedback.UserFeedbackActivity;
 import com.datarecovery.master.module.homepage.HomePageViewModel;
@@ -31,10 +33,8 @@ import com.datarecovery.master.module.wxrecover.WeChatRecoverActivity;
 import com.datarecovery.master.sdk.qiyu.QiYuHelper;
 import com.datarecovery.master.sdk.wechat.WechatHelper;
 import com.datarecovery.master.utils.BoxingUtil;
-import com.datarecovery.master.utils.ReportUtil;
 import com.datarecovery.master.utils.RxHttpHandler;
 import com.datarecovery.master.utils.ToastUtil;
-import com.qiyukf.unicorn.api.Unicorn;
 
 import javax.inject.Inject;
 
@@ -200,7 +200,21 @@ public class MineViewModel extends BaseViewModel {
 
     public void onCustomerServiceClick() {
         EventHelper.report(EventId.hf1001108);
-        refreshCustomerUrl();
+//        refreshCustomerUrl();
+        BrowserActivity.start(ActivityUtil.getTopActivity(), buildCustomerServiceUrl());
+    }
+
+    private String buildCustomerServiceUrl() {
+        //ssid=%s
+        //device_id=%s
+        //app_version=%s
+        //package_name=%s
+        //app_name=%s
+        //phone=%s
+        return String.format("https://qiyu-kefu.fswangluo.icu?ssid=%s&device_id=%s&app_platform=1&app_version=%s&package_name=%s&app_name=%s&phone=%s",
+                AtmobAuth.getSSID(), AtmobAuth.getDeviceId(), AtmobCompliance.getDevices().getVersionName(),
+                AtmobCompliance.getDevices().getPackageName(), AtmobCompliance.getDevices().getAppName(),
+                accountRepository.getLoginPhoneNum().getValue());
     }
 
     private void goCustomer(@NonNull CustomerUrlResponse customerResponse) {

+ 2 - 2
build.gradle

@@ -6,8 +6,8 @@ buildscript {
         minSdkVersion = 21
         targetSdkVersion = 32
 
-        versionCode = 125
-        versionName = "1.2.5"
+        versionCode = 127
+        versionName = "1.2.7"
 
         hilt_version = '2.41'
         lifecycle_version = "2.6.1"

+ 2 - 2
gradle.properties

@@ -27,8 +27,8 @@ local_server_host=http://192.168.10.171:8880
 wechat_app_id=
 wework_crop_id=
 wechat_kf_id=
-gravity_access_token=
-bugly_app_id=
+gravity_access_token=mGZxq6oeTYcgUXjtDVoClauLOSw1stKs
+bugly_app_id=e290279e37
 umeng_app_key=
 qiyu_app_key=
 atmob_central_key=b62b748a584b40a3bf9b137a06c060eb