crachreport change

app/src/main/java/com/rehome/zhdcoa/App.java

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Process;
 import android.text.TextUtils;
 import android.util.Log;
@@ -88,7 +89,12 @@ public class App extends LitePalApplication {
         AutoLayoutConifg.getInstance().useDeviceSize();
         Utils.init(this);
         XUI.init(this); //初始化UI框架
-        CrashReport.initCrashReport(getApplicationContext(), "13d735012a", true);
+
+        CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(getApplicationContext());
+        // 通过UserStrategy设置
+        strategy.setDeviceModel(Build.MODEL);
+
+        CrashReport.initCrashReport(getApplicationContext(), "13d735012a", true, strategy);
         loadEmojiFromBundled();
         //BuildConfig.DEBUG
 

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -371,7 +371,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                                     usernameLogin
                                 )
                             ) {
-                                CrashReport.putUserData(context, "UserName", binding.etUsername.text.toString());
+                                CrashReport.putUserData(context, "UserName", binding.etUsername.text.toString().trim());
+                                CrashReport.setUserId(binding.etUsername.text.toString().trim())
                                 SPUtils.put(
                                     context,
                                     Contans.SP.OLD_PWD,

app/src/main/java/com/rehome/zhdcoa/ui/fragment/MineFragment.java

@@ -627,7 +627,7 @@ public class MineFragment extends BaseLazyFragment {
     }
 
     private void checkUpdate() {
-        HttpUtils.getApi(context).getCheckUpdataApk().enqueue(new BaseCallBack<ApkUpdateBean>(getActivity()) {
+        HttpUtils.getApi(requireContext()).getCheckUpdataApk().enqueue(new BaseCallBack<ApkUpdateBean>(getActivity()) {
             @Override
             public void onSuccess(Call<ApkUpdateBean> call, Response<ApkUpdateBean> response) {
                 ApkUpdateBean apkUpdateBean = response.body();
@@ -662,7 +662,7 @@ public class MineFragment extends BaseLazyFragment {
     }
 
     private void downloadAndInstall(String downloadURL, String versionName, String description, String versioncode) {
-        new DownloadManager.Builder(getActivity())
+        new DownloadManager.Builder(requireActivity())
                 .apkUrl(downloadURL)
                 .apkName("珠电e办公.apk")
                 .smallIcon(R.mipmap.ic_launcher)
@@ -748,7 +748,7 @@ public class MineFragment extends BaseLazyFragment {
         builder.addFormDataPart("file", "headPhoto", RequestBody.create(MediaType.parse("image/*"), fos));
 
         //builder.addFormDataPart("file", "headPhoto", RequestBody.create(MediaType.parse("image/*"), new File(HeadPhotoFilePath)));
-        HttpUtils.getApi(context).updateHeadPhoto("head_up", App.getInstance().getUserInfo().getManid(), ".jpg", builder.build()).enqueue(new BaseCallBack<HeadPhotoResultBean>(getActivity()) {
+        HttpUtils.getApi(requireContext()).updateHeadPhoto("head_up", App.getInstance().getUserInfo().getManid(), ".jpg", builder.build()).enqueue(new BaseCallBack<HeadPhotoResultBean>(getActivity()) {
             @Override
             public void onSuccess(Call<HeadPhotoResultBean> call, Response<HeadPhotoResultBean> response) {
                 HeadPhotoResultBean headPhotoResultBean = response.body();
@@ -769,7 +769,7 @@ public class MineFragment extends BaseLazyFragment {
     //获取我的待办(其他数据)
     public void getOtherCount() {
 
-        HttpUtils.getApi(context).getOther(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack<QtdbBean>(getContext()) {
+        HttpUtils.getApi(requireContext()).getOther(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBack<QtdbBean>(getContext()) {
             @Override
             public void onSuccess(Call<QtdbBean> call, Response<QtdbBean> response) {
                 QtdbBean bean = response.body();
@@ -787,7 +787,7 @@ public class MineFragment extends BaseLazyFragment {
 
     //获取关于我的数据总数量
     public void getAboutMeData() {
-        HttpUtils.getApi(context).getAboutMe(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBackNoProgress<AboutMeBean>(getActivity()) {
+        HttpUtils.getApi(requireContext()).getAboutMe(App.getInstance().getUserInfo().getManid()).enqueue(new BaseCallBackNoProgress<AboutMeBean>(getActivity()) {
             @Override
             public void onSuccess(Call<AboutMeBean> call, Response<AboutMeBean> response) {
                 AboutMeBean bean = response.body();