From c8b351c82e442a7fd670a2ef8001eeee9e78e322 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Thu, 9 Apr 2020 12:34:55 +0800 Subject: [PATCH] Revert "AndroidX" This reverts commit c126ca0392fbd24348cf448f2cd187604dd8b1bf. --- app/build.gradle | 2 +- .../erban/audio/helper/SvgaCacheManager.java | 6 ++---- .../erban/avroom/dialog/RoomImposeDialog.java | 2 +- .../avroom/fragment/HomePartyRoomFragment.java | 6 ++---- .../erban/avroom/view/IHomePartyView.java | 6 +++--- .../erban/avroom/widget/GiftEffectView.java | 6 ++---- .../yizhuan/erban/avroom/widget/GiftView.java | 6 ++---- .../com/yizhuan/erban/base/BaseBsDialog.java | 2 +- .../com/yizhuan/erban/common/ReloadFragment.java | 7 ++++--- .../common/widget/dialog/CommonPopupDialog.java | 2 +- .../erban/decoration/adapter/CarShopAdapter.java | 2 +- .../decoration/adapter/HeadWearShopAdapter.java | 2 +- .../erban/home/adapter/HomeFragmentAdapter.java | 4 ++-- .../erban/home/fragment/GameHomeFragment.java | 7 ++++--- .../erban/push/HwPushMessageReceiver.java | 8 ++++---- .../erban/ui/gift/util/Preconditions.java | 2 +- .../ui/gift/widget/GlideCircleTransform.java | 2 +- .../erban/ui/widget/CustSlidingTabLayout.java | 2 +- .../com/yizhuan/erban/ui/widget/GiftDialog.java | 2 +- .../com/yizhuan/erban/ui/widget/ShareDialog.java | 2 +- .../ui/widget/dynamicface/DynamicFaceDialog.java | 2 +- app/src/main/res/layout/item_head_wear.xml | 2 +- app/src/main/res/values/attrs.xml | 2 +- .../tutu/music/widget/VoiceSeekDialog.java | 2 +- .../PublicChatHallGiftAnimationDialog.java | 6 ++---- .../com/yizhuan/tutu/database/AppDataBase.java | 2 +- gradle.properties | 16 +++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../xchat_android_library/utils/Validate.java | 4 ++-- 29 files changed, 55 insertions(+), 61 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a496e3425..6c35d7e41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -184,7 +184,7 @@ dependencies { api fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/app/src/main/java/com/yizhuan/erban/audio/helper/SvgaCacheManager.java b/app/src/main/java/com/yizhuan/erban/audio/helper/SvgaCacheManager.java index 84e171145..586ea6d0e 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/helper/SvgaCacheManager.java +++ b/app/src/main/java/com/yizhuan/erban/audio/helper/SvgaCacheManager.java @@ -6,13 +6,11 @@ import android.os.Build; import android.os.Handler; import android.os.Message; -import androidx.annotation.NonNull; - import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; - +import org.jetbrains.annotations.NotNull; import io.reactivex.Single; import io.reactivex.SingleOnSubscribe; @@ -101,7 +99,7 @@ public class SvgaCacheManager { String path = isBottle ? "svga/svga_voice_bottle.svga" : "svga/svga_voice_bubble.svga"; parser.decodeFromAssets(path, new SVGAParser.ParseCompletion() { @Override - public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) { + public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) { if (isBig) { if (isBottle) { bigBottleSvga = new SVGADrawable(svgaVideoEntity); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java index b4a781578..e8a9eccb2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java @@ -47,7 +47,7 @@ public class RoomImposeDialog extends BottomSheetDialog implements View.OnClickL binding = DataBindingUtil.bind(findViewById(R.id.dialog_container)); binding.setClick(this); - FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet); + FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet); if (bottomSheet != null) { BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false); BottomSheetBehavior.from(bottomSheet).setPeekHeight( diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index 3912c169e..34be50d7d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -3,8 +3,6 @@ package com.yizhuan.erban.avroom.fragment; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; - -import androidx.annotation.NonNull; import androidx.lifecycle.ViewModelProviders; import android.content.DialogInterface; import android.content.Intent; @@ -190,7 +188,7 @@ import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; - +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Iterator; @@ -3101,7 +3099,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment { ItemCarShopBinding binding = (ItemCarShopBinding) helper.getBinding(); boolean isSelect = selectPosition == helper.getAdapterPosition(); binding.llCarHolder.setSelected(isSelect); -// binding.setSelectPosition(isSelect); + binding.setSelectPosition(isSelect); if (item.getLabelType() == CarInfo.TAG_TYPE_NORMAL) { binding.ivTag.setVisibility(View.GONE); diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java index 28cafebdf..a08c1cbba 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java @@ -37,7 +37,7 @@ public class HeadWearShopAdapter extends BaseAdapter { ItemHeadWearBinding binding = (ItemHeadWearBinding) helper.getBinding(); binding.llRoot.setSelected(selectPosition == helper.getAdapterPosition()); NobleUtil.loadHeadWears(item.getPic(), binding.ivHeadWear); -// binding.setSelectPosition(selectPosition == helper.getAdapterPosition()); + binding.setSelectPosition(selectPosition == helper.getAdapterPosition()); if (item.getLabelType() == HeadWearInfo.LABEL_TYPE_NORMAL) { binding.ivTag.setVisibility(View.GONE); diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java index 94bb6ccaf..b835aa528 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java @@ -71,7 +71,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.StringUtils; - +import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; import java.net.URL; @@ -537,7 +537,7 @@ public class HomeFragmentAdapter extends BaseMultiItemQuickAdapter getHomeBanner(int num) { diff --git a/app/src/main/java/com/yizhuan/erban/push/HwPushMessageReceiver.java b/app/src/main/java/com/yizhuan/erban/push/HwPushMessageReceiver.java index 1f2189f50..83cc7d5e0 100644 --- a/app/src/main/java/com/yizhuan/erban/push/HwPushMessageReceiver.java +++ b/app/src/main/java/com/yizhuan/erban/push/HwPushMessageReceiver.java @@ -3,15 +3,15 @@ package com.yizhuan.erban.push; import android.content.Context; import android.os.Bundle; -import com.netease.nimlib.sdk.mixpush.HWPushMessageService; +import com.netease.nimlib.sdk.mixpush.HWPushMessageReceiver; import com.orhanobut.logger.Logger; import com.yizhuan.xchat_android_core.statistic.StatisticManager; -public class HwPushMessageReceiver extends HWPushMessageService { +public class HwPushMessageReceiver extends HWPushMessageReceiver { @Override - public void onNewToken(String token) { - super.onNewToken(token); + public void onToken(Context context, String token, Bundle extras) { + super.onToken(context, token, extras); StatisticManager.Instance().logToLocalFile("华为推送token:" + token); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java b/app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java index f6e4af8b5..b37f96f0b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java +++ b/app/src/main/java/com/yizhuan/erban/ui/gift/util/Preconditions.java @@ -24,7 +24,7 @@ public final class Preconditions { } } - public static T checkNonNull(T value, String message) { + public static T checkNotNull(T value, String message) { if (value == null) { throw new NullPointerException(message); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java b/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java index b09c4d72d..8e8f3dc18 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java +++ b/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GlideCircleTransform.java @@ -18,7 +18,7 @@ import java.security.MessageDigest; */ public class GlideCircleTransform extends BitmapTransformation { public GlideCircleTransform(Context context) { - super(); + super(context); } @Override diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/CustSlidingTabLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/CustSlidingTabLayout.java index 9cc64f781..dc9bbb160 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/CustSlidingTabLayout.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/CustSlidingTabLayout.java @@ -164,7 +164,7 @@ public class CustSlidingTabLayout extends HorizontalScrollView implements ViewPa mDividerPadding = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_divider_padding, dp2px(12)); mTextsize = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_textsize, sp2px(14)); -// mTextSizeNormal = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_textsize_normal, mTextsize); + mTextSizeNormal = ta.getDimension(R.styleable.CustSlidingTabLayout_tl_textsize_normal, mTextsize); mTextSelectColor = ta.getColor(R.styleable.CustSlidingTabLayout_tl_textSelectColor, Color.parseColor("#ffffff")); mTextUnselectColor = ta.getColor(R.styleable.CustSlidingTabLayout_tl_textUnselectColor, Color.parseColor("#AAffffff")); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index b26b0389a..f5813210a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -284,7 +284,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene setContentView(R.layout.dialog_bottom_gift); compositeDisposable = new CompositeDisposable(); init(findViewById(R.id.ll_dialog_bottom_gift)); - FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet); + FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet); if (bottomSheet != null) { BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false); BottomSheetBehavior.from(bottomSheet).setHideable(false); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java index 11bc52974..e1e963027 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java @@ -78,7 +78,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen tvQqZone.setOnClickListener(this); tvCancel.setOnClickListener(this); findViewById(R.id.tv_qq_game).setOnClickListener(this); - FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet); + FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet); if (bottomSheet != null) { BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java index b12ab471c..02b486df9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java @@ -67,7 +67,7 @@ public class DynamicFaceDialog extends BottomSheetDialog setContentView(R.layout.dialog_bottom_face); EventBus.getDefault().register(this); init(findViewById(R.id.rl_dynamic_face_dialog_root)); - FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet); + FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet); if (bottomSheet != null) { BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false); BottomSheetBehavior.from(bottomSheet).setPeekHeight( diff --git a/app/src/main/res/layout/item_head_wear.xml b/app/src/main/res/layout/item_head_wear.xml index 2fa3213b5..d4e7a6a2e 100644 --- a/app/src/main/res/layout/item_head_wear.xml +++ b/app/src/main/res/layout/item_head_wear.xml @@ -10,7 +10,7 @@ name="headWearInfo" type="com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7480c6f7b..56e10615e 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -254,7 +254,7 @@ - + diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java b/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java index f17130b8a..884ec5e40 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java @@ -53,7 +53,7 @@ public class VoiceSeekDialog extends BottomSheetDialog implements SeekBar.OnSeek musicVoiceNum.setText(PlayerModel.get().getCurrentVolume()+"%"); voiceNum.setText(PlayerModel.get().getCurrentRecordingVolume()+"%"); - FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet); + FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet); if (bottomSheet != null) { BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false); BottomSheetBehavior.from(bottomSheet).setPeekHeight( diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java index ae6f3b81b..52b54a511 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java @@ -12,8 +12,6 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.NonNull; - import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; @@ -28,7 +26,7 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; import com.yizhuan.xchat_android_core.utils.ActivityUtil; - +import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; import java.net.URL; @@ -108,7 +106,7 @@ public class PublicChatHallGiftAnimationDialog extends BaseSdDialog { try { svgaParser.parse(new URL("https://img.erbanyy.com/public_chat_spring.svga"), new SVGAParser.ParseCompletion() { @Override - public void onComplete(@NonNull SVGAVideoEntity svgaVideoEntity) { + public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) { SVGADrawable drawable = new SVGADrawable(svgaVideoEntity); svgaImageView.setImageDrawable(drawable); svgaImageView.startAnimation(); diff --git a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java b/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java index 93f6a5a14..6c5fe80f4 100644 --- a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java +++ b/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java @@ -11,7 +11,7 @@ import com.yizhuan.xchat_android_core.music.db.dao.LocalMusicDao; import com.yizhuan.xchat_android_core.music.db.dao.SongDao; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = false) +@Database(entities = {LocalMusicBean.class, SongBean.class}, version = 1, exportSchema = true) public abstract class AppDataBase extends RoomDatabase { private static volatile AppDataBase mInstance; diff --git a/gradle.properties b/gradle.properties index 151f308a3..f4a13773b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,23 +9,25 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m org.gradle.daemon=true + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + android.enableD8=true -org.gradle.parallel=true android.injected.testOnly=false -org.gradle.configureondemand=true -android.enableBuildScriptClasspathCheck=false # CI jenkins 参数化构建传入参数 + version_name=1.0.0 version_code=1 + # jenkins打包参数 可选值 arm x86 arm_x86 ndk_abi_filters=arm # jenkins参数，debug下打渠道包用到， # 可选值 v1：仅支持v1签名，v1v2：支持v1v2签名 sign_mode=v1 -with_jenkins=false android.useAndroidX=true android.enableJetifier=true -org.gradle.caching=true - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4240c7f15..69ed8a555 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Thu Apr 09 00:51:19 CST 2020 +#Thu Aug 09 10:54:29 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java index ade442c53..4d6b3489f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/Validate.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; *

* 

  * Validate.isTrue(i > 0, "The value must be greater than zero: %d", i);
- * Validate.NonNull(surname, "The surname must not be %s", null);
+ * Validate.notNull(surname, "The surname must not be %s", null);
  *
*

*

#ThreadSafe#

@@ -182,7 +182,7 @@ public class Validate { } } - // NonNull + // notNull //--------------------------------------------------------------------------------- /**