diff --git a/app/src/main/java/com/chwl/app/application/App.java b/app/src/main/java/com/chwl/app/application/App.java index 186eec319..4220c075c 100644 --- a/app/src/main/java/com/chwl/app/application/App.java +++ b/app/src/main/java/com/chwl/app/application/App.java @@ -9,41 +9,15 @@ import android.content.res.Configuration; import android.graphics.Color; import android.net.http.HttpResponseCache; import android.os.Build; -import android.os.Environment; import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import androidx.annotation.NonNull; -import androidx.core.util.Supplier; import androidx.multidex.MultiDex; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.request.target.ViewTarget; -import com.chwl.app.support.IMUserInfoProvider; -import com.chwl.library.language.LanguageHelper; -import com.coorchice.library.utils.LogUtils; -import com.example.lib_utils.ServiceTime; -import com.hjq.toast.ToastUtils; -import com.netease.nim.uikit.api.NimUIKit; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.netease.nimlib.sdk.NIMClient; -import com.netease.nimlib.sdk.NotificationFoldStyle; -import com.netease.nimlib.sdk.SDKOptions; -import com.netease.nimlib.sdk.StatusBarNotificationConfig; -import com.netease.nimlib.sdk.mixpush.MixPushConfig; -import com.netease.nimlib.sdk.mixpush.NIMPushClient; -import com.netease.nimlib.sdk.msg.MessageNotifierCustomization; -import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.netease.nimlib.sdk.util.NIMUtil; -import com.opensource.svgaplayer.SVGAParser; -import com.orhanobut.logger.AndroidLogAdapter; -import com.orhanobut.logger.Logger; -import com.scwang.smartrefresh.header.MaterialHeader; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; -import com.scwang.smartrefresh.layout.footer.ClassicsFooter; -import com.tencent.vasdolly.helper.ChannelReaderUtil; import com.chwl.app.BuildConfig; import com.chwl.app.NimMiddleActivity; import com.chwl.app.R; @@ -51,11 +25,12 @@ import com.chwl.app.common.app.ActivityStack; import com.chwl.app.common.util.AppLifeCycleHelper; import com.chwl.app.module_hall.HallDataManager; import com.chwl.app.radish.wallet.RadishWalletManager; +import com.chwl.app.support.IMUserInfoProvider; import com.chwl.app.utils.PushMessageHandler; -import com.chwl.core.XConstants; import com.chwl.core.Constants; import com.chwl.core.DemoCache; import com.chwl.core.UriProvider; +import com.chwl.core.XConstants; import com.chwl.core.auth.AuthModel; import com.chwl.core.bean.response.ServiceResult; import com.chwl.core.channel.ChannelModel; @@ -81,6 +56,7 @@ import com.chwl.core.utils.net.ServerException; import com.chwl.library.common.application.BaseApp; import com.chwl.library.common.application.Env; import com.chwl.library.common.file.FileHelper; +import com.chwl.library.language.LanguageHelper; import com.chwl.library.net.rxnet.RxNet; import com.chwl.library.net.rxnet.converter.GsonConverterPlugins; import com.chwl.library.utils.AppMetaDataUtil; @@ -91,6 +67,28 @@ import com.chwl.library.utils.SystemUtils; import com.chwl.library.utils.VersionUtil; import com.chwl.library.utils.codec.MD5Utils; import com.chwl.library.utils.config.BasicConfig; +import com.coorchice.library.utils.LogUtils; +import com.example.lib_utils.ServiceTime; +import com.hjq.toast.ToastUtils; +import com.netease.nim.uikit.api.NimUIKit; +import com.netease.nim.uikit.common.util.log.LogUtil; +import com.netease.nimlib.sdk.NIMClient; +import com.netease.nimlib.sdk.NotificationFoldStyle; +import com.netease.nimlib.sdk.SDKOptions; +import com.netease.nimlib.sdk.StatusBarNotificationConfig; +import com.netease.nimlib.sdk.mixpush.MixPushConfig; +import com.netease.nimlib.sdk.mixpush.NIMPushClient; +import com.netease.nimlib.sdk.msg.MessageNotifierCustomization; +import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; +import com.netease.nimlib.sdk.msg.model.IMMessage; +import com.netease.nimlib.sdk.util.NIMUtil; +import com.opensource.svgaplayer.SVGAParser; +import com.orhanobut.logger.AndroidLogAdapter; +import com.orhanobut.logger.Logger; +import com.scwang.smartrefresh.header.MaterialHeader; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.footer.ClassicsFooter; +import com.tencent.vasdolly.helper.ChannelReaderUtil; import org.greenrobot.eventbus.EventBus; @@ -252,7 +250,7 @@ public class App extends BaseApp { ServiceResult serviceResult = (ServiceResult) result; if (serviceResult.getCode() == ServiceResult.CODE_NEED_COMPLETE_USER_INFO) { SingleToastUtil.showToast(serviceResult.getMessage()); - EventBus.getDefault().post(new NeedCompleteInfoEvent()); + EventBus.getDefault().post(new NeedCompleteInfoEvent()); //todo do 生日修改异常问题 throw new ServerException(serviceResult.getMessage(), serviceResult.getCode()); } else if (serviceResult.getCode() == 401) { if ((ServiceTime.INSTANCE.getTime() - logoutEventTime) > 800) { diff --git a/app/src/main/res/layout/fragment_add_user_info.xml b/app/src/main/res/layout/fragment_add_user_info.xml index ff33f8102..88c5e0b75 100644 --- a/app/src/main/res/layout/fragment_add_user_info.xml +++ b/app/src/main/res/layout/fragment_add_user_info.xml @@ -47,10 +47,10 @@ android:id="@+id/tv_detail" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" android:text="@string/gender_cannot_modify" android:textColor="@color/color_84868A" android:textSize="@dimen/sp_10" - android:layout_marginTop="@dimen/dp_5" app:layout_constraintStart_toStartOf="@id/tv_gender" app:layout_constraintTop_toBottomOf="@+id/tv_gender" /> @@ -185,4 +185,15 @@ app:layout_constraintTop_toBottomOf="@+id/view_code_bg" tools:ignore="SpUsage" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f91f1b4eb..13b531e90 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5366,6 +5366,7 @@ You cannot join again within 24 hours after leaving 封禁说明 封禁说明输入提示 %s 小时 + 18限制