升级版本号，屏蔽OAID代码，个人中心显示自己“直播中”状态

.gitignore

@@ -10,3 +10,4 @@
 app/accompany/debug/app-accompany-debug.apk
 app/accompany/debug/output.json
 *.apk
+app/accompany/release/output.json

app/src/main/java/com/yizhuan/erban/application/XChatApplication.java

@@ -117,23 +117,19 @@ public class XChatApplication extends Application {
     public static final String TAG = "XChatApplication";
     private static XChatApplication instance;
     private RefWatcher mRefWatcher;
+
     private static String oaid;
-
-
-    private static boolean isSupportOaid=true;
+    private static boolean isSupportOaid=false;
     private static int errorCode;
-
     public static String getOaid() {
         return oaid;
     }
-    public static String getErrorCode() {
-        return String.valueOf(errorCode);
-    }
-
+//    public static String getErrorCode() {
+//        return String.valueOf(errorCode);
+//    }
     public static boolean isSupportOaid() {
         return isSupportOaid;
     }
-
     public static void setIsSupportOaid(boolean isSupportOaid) {
         XChatApplication.isSupportOaid = isSupportOaid;
     }
@@ -141,6 +137,7 @@ public class XChatApplication extends Application {
         XChatApplication.isSupportOaid = isSupportOaid;
         XChatApplication.errorCode=ErrorCode;
     }
+
     public static XChatApplication instance() {
         return instance;
     }
@@ -231,17 +228,16 @@ public class XChatApplication extends Application {
         }
         dealHuaWeiCrash();
         //获取OAID等设备标识符
-        MiitHelper miitHelper = new MiitHelper(appIdsUpdater);
-        miitHelper.getDeviceIds(getApplicationContext());
+//        MiitHelper miitHelper = new MiitHelper(appIdsUpdater);
+//        miitHelper.getDeviceIds(getApplicationContext());
     }
 
-    private MiitHelper.AppIdsUpdater appIdsUpdater = new MiitHelper.AppIdsUpdater() {
-        @Override
-        public void OnIdsAvalid(@NonNull String ids) {
-            Log.e("++++++ids: ", ids);
-            oaid = ids;
-        }
-    };
+//    private MiitHelper.AppIdsUpdater appIdsUpdater = new MiitHelper.AppIdsUpdater() {
+//        @Override
+//        public void OnIdsAvalid(@NonNull String ids) {
+//            oaid = ids;
+//        }
+//    };
 
     /**
      * 初始化linkedMe
@@ -293,11 +289,11 @@ public class XChatApplication extends Application {
         super.attachBaseContext(base);
         // you must install multiDex whatever tinker is installed!
         MultiDex.install(base);
-        try{
-            JLibrary.InitEntry(base);
-        }catch (Exception e){
-
-        }
+//        try{
+//            JLibrary.InitEntry(base);
+//        }catch (Exception e){
+//
+//        }
     }
 
 

app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java

@@ -25,6 +25,8 @@ import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
 import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
 import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
 
+import java.util.Objects;
+
 import io.reactivex.SingleObserver;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -58,7 +60,7 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
         mBinding.containerCode.setVisibility(View.GONE);
         mBinding.tvCodeTips.setVisibility(View.GONE);
         type = getIntent().getIntExtra("type", 1);
-        if (type == PAY_PWD && !UserModel.get().getCacheLoginUserInfo().isBindPaymentPwd()) {
+        if (type == PAY_PWD && !Objects.requireNonNull(UserModel.get().getCacheLoginUserInfo()).isBindPaymentPwd()) {
             type = FOGERT_PAY_PWD;
             isFirstSetPayPwd = true;
             mBinding.containerCode.setVisibility(View.VISIBLE);
@@ -66,7 +68,7 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
             mBinding.tvCodeTips.setText("");
         }
         if (type == LOGIN_PWD) {
-            if (UserModel.get().getCacheLoginUserInfo().isBindPasswd()) {
+            if (Objects.requireNonNull(UserModel.get().getCacheLoginUserInfo()).isBindPasswd()) {
                 setModifyPwdUI();
             } else {
                 setLoginPwdUI();

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java

@@ -303,10 +303,10 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         initGiftList(info.getUserGiftWall());
         initDynamicList(info.getDynamicInfo());
         initPhoto(info.getPrivatePhoto());
-        if (AuthModel.get().getCurrentUid() != userId){
+//        if (AuthModel.get().getCurrentUid() != userId){
             mRoomUid = info.getRoomUid();
             setWhereVisible();
-        }
+//        }
     }
 
     /**

app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java

@@ -55,7 +55,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
      * 基本权限管理
      */
     private final String[] BASIC_PERMISSIONS = new String[]{
-            Manifest.permission.READ_PHONE_STATE,
+//            Manifest.permission.READ_PHONE_STATE,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
 
@@ -65,19 +65,22 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
 //            Manifest.permission.ACCESS_FINE_LOCATION
     };
 
+    /**
+     * OAID
+     */
     private void permission() {
         checkPermission(() -> {
-            String oaid = OAIDUtil.getOaid();
-                    String imei = TelephonyUtils.getImei(BasicConfig.INSTANCE.getAppContext());
-                    String imeiMd5 = null;
-                    if (!TextUtils.isEmpty(imei)) {
-                        imeiMd5 = MD5Utils.getMD5String(imei);
-                    }
-
-                    if (TextUtils.isEmpty(oaid) && TextUtils.isEmpty(imeiMd5) && !"bilibili2".equals(AppMetaDataUtil.getChannelID()) ){
-                        return;
-                    }
-                    InitialModel.get().reportAdv(oaid,imeiMd5).subscribe();
+//            String oaid = OAIDUtil.getOaid();
+//                    String imei = TelephonyUtils.getImei(BasicConfig.INSTANCE.getAppContext());
+//                    String imeiMd5 = null;
+//                    if (!TextUtils.isEmpty(imei)) {
+//                        imeiMd5 = MD5Utils.getMD5String(imei);
+//                    }
+//
+//                    if (TextUtils.isEmpty(oaid) && TextUtils.isEmpty(imeiMd5) && !"bilibili2".equals(AppMetaDataUtil.getChannelID()) ){
+//                        return;
+//                    }
+//                    InitialModel.get().reportAdv(oaid,imeiMd5).subscribe();
                 },
                 R.string.ask_again,
                 BASIC_PERMISSIONS);

gradle.properties

@@ -21,5 +21,5 @@ with_jenkins=false
 #\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528
 ndk_abi_filters=arm
 
-version_name=1.0.6
-version_code=106
+version_name=1.1.0
+version_code=110

nim_uikit/src/com/netease/nim/uikit/common/util/AntiSpamUtil.java

@@ -17,7 +17,7 @@ public class AntiSpamUtil {
         String text = message.getContent();
         LocalAntiSpamResult result = NIMClient.getService(MsgService.class)
                 .checkLocalAntiSpam(text, "***");
-        message.setContent(result.getContent());
+        message.setContent(result.getContent()==null?"":result.getContent());
 
         if (result.getOperator() != 0) {
             //Map<String, Object> map = message.getRemoteExtension();