diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e5ca39e4..20e94b610 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,7 +86,7 @@ Log.i("checkLostUser", "onLogin"); - //登录成功查询未读信息数量 - mMainTabLayout.setUnReadDynamicCount(0); int unreadCount = IMMessageManager.get().queryUnreadMsg(); mMainTabLayout.setMsgNum(unreadCount); openCommunityNotice(); @@ -614,9 +612,6 @@ public class MainActivity extends BaseMvpActivity case MainTabType.TAB_TYPE_HOME: reportTabClick(IReportConstants.ELEVEN); break; - case MainTabType.TAB_TYPE_SQUARE: - reportTabClick(IReportConstants.TWELVE); - break; case MainTabType.TAB_TYPE_MSG: reportTabClick(IReportConstants.THIRTEEN); break; @@ -803,11 +798,6 @@ public class MainActivity extends BaseMvpActivity } } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onUnReadCount(UnReadCountEvent event) { - mMainTabLayout.setUnReadDynamicCount(event.getTotal()); - } - @Subscribe(threadMode = ThreadMode.MAIN) public void SquarePublish(SquareTaskEvent event) { } diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java index 9dc869080..99ad3ee3f 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java @@ -139,8 +139,6 @@ public class MainRedPointTab extends RelativeLayout { private int getDefaultRes(int tabType, boolean select) { int resId = select ? R.drawable.ic_main_tab_home_pressed : R.drawable.ic_main_tab_home; switch (tabType) { - case MainTabType.TAB_TYPE_SQUARE: - break; case MainTabType.TAB_TYPE_STAR: resId = select ? R.drawable.ic_main_tab_star_pressed : R.drawable.ic_main_tab_star; break; diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java b/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java index 8228be4a8..80fa07c15 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java @@ -23,9 +23,8 @@ import java.util.List; */ public class MainTabLayout extends LinearLayout implements View.OnClickListener { - private final List tabViewList = new ArrayList<>(5); + private final List tabViewList = new ArrayList<>(4); private MainRedPointTab homeTab; - private MainRedPointTab squareTab; private MainRedPointTab starTab; private MainRedPointTab msgTab; private MainRedPointTab meTab; @@ -56,7 +55,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener setOrientation(HORIZONTAL); inflate(context, R.layout.main_tab_layout, this); - squareTab = findViewById(R.id.main_square_tab); msgTab = findViewById(R.id.main_msg_tab); starTab = findViewById(R.id.main_star_tab); homeTab = findViewById(R.id.main_home_tab); @@ -65,17 +63,15 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener homeTab.setOnClickListener(this); meTab.setOnClickListener(this); starTab.setOnClickListener(this); - squareTab.setOnClickListener(this); msgTab.setOnClickListener(this); - tabViewList.add(homeTab); - tabViewList.add(squareTab); tabViewList.add(starTab); + tabViewList.add(homeTab); tabViewList.add(msgTab); tabViewList.add(meTab); } - public void setMainTabInfoList(@NonNull @Size(5) List mainTabInfoList) { + public void setMainTabInfoList(@NonNull @Size(4) List mainTabInfoList) { this.mainTabInfoList = mainTabInfoList; for (int i = 0; i < mainTabInfoList.size(); i++) { MainTabInfo mainTabInfo = mainTabInfoList.get(i); @@ -85,9 +81,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener case MainTabType.TAB_TYPE_MSG: redPointTab.setNumber(msgNumber); break; - case MainTabType.TAB_TYPE_SQUARE: - redPointTab.setNumber(squareNumber); - break; case MainTabType.TAB_TYPE_ME: redPointTab.setNumber(meNumber); break; @@ -109,9 +102,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener case R.id.main_home_tab: select(MainTabType.TAB_TYPE_HOME); break; - case R.id.main_square_tab: - select(MainTabType.TAB_TYPE_SQUARE); - break; case R.id.main_star_tab: select(MainTabType.TAB_TYPE_STAR); break; @@ -127,7 +117,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener private void select(int tabType) { if (tabType == 0) tabType = MainTabType.TAB_TYPE_HOME; if (mLastPosition == tabType) return; - squareTab.select(tabType == MainTabType.TAB_TYPE_SQUARE); msgTab.select(tabType == MainTabType.TAB_TYPE_MSG); starTab.select(tabType == MainTabType.TAB_TYPE_STAR); homeTab.select(tabType == MainTabType.TAB_TYPE_HOME); @@ -154,14 +143,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener } } - public void setUnReadDynamicCount(int mUnReadDynamicCount) { - squareNumber = mUnReadDynamicCount; - MainRedPointTab pointTab = findTabInfoByType(MainTabType.TAB_TYPE_SQUARE); - if (pointTab != null) { - pointTab.setNumber(mUnReadDynamicCount); - } - } - @Nullable private MainRedPointTab findTabInfoByType(int tabType) { if (mainTabInfoList == null) return null; diff --git a/app/src/main/res/drawable-xxhdpi/default_avatar.png b/app/src/main/res/drawable-xxhdpi/default_avatar.png new file mode 100644 index 000000000..61068a250 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/default_avatar.png differ diff --git a/app/src/main/res/drawable-xxhdpi/default_avatar.webp b/app/src/main/res/drawable-xxhdpi/default_avatar.webp deleted file mode 100644 index f9aefdac2..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/default_avatar.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/default_banner.png b/app/src/main/res/drawable-xxhdpi/default_banner.png new file mode 100644 index 000000000..fbcb58023 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/default_banner.png differ diff --git a/app/src/main/res/drawable-xxhdpi/default_banner.webp b/app/src/main/res/drawable-xxhdpi/default_banner.webp deleted file mode 100644 index 6435f7723..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/default_banner.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/default_cover.png b/app/src/main/res/drawable-xxhdpi/default_cover.png new file mode 100644 index 000000000..2b3934a8a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/default_cover.png differ diff --git a/app/src/main/res/drawable-xxhdpi/default_cover.webp b/app/src/main/res/drawable-xxhdpi/default_cover.webp deleted file mode 100644 index da5aea6d2..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/default_cover.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/login_ic_google.webp b/app/src/main/res/drawable-xxhdpi/login_ic_google.webp deleted file mode 100644 index 8a7936471..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/login_ic_google.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/login_ic_logo.webp b/app/src/main/res/drawable-xxhdpi/login_ic_logo.webp deleted file mode 100644 index a2b0148d9..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/login_ic_logo.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/login_ic_logo_name.webp b/app/src/main/res/drawable-xxhdpi/login_ic_logo_name.webp deleted file mode 100644 index 1be54feec..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/login_ic_logo_name.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg.webp b/app/src/main/res/drawable-xxhdpi/splash_bg.webp new file mode 100644 index 000000000..352835f60 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/splash_bg.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg_bottom.webp b/app/src/main/res/drawable-xxhdpi/splash_bg_bottom.webp deleted file mode 100644 index 1cc8757bf..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/splash_bg_bottom.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp b/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp index 58a898393..6a90066ce 100644 Binary files a/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp and b/app/src/main/res/drawable-xxhdpi/splash_bg_logo.webp differ diff --git a/app/src/main/res/drawable/base_theme_btn_21.xml b/app/src/main/res/drawable/base_theme_btn_21.xml index 64dfde80e..919170aaa 100644 --- a/app/src/main/res/drawable/base_theme_btn_21.xml +++ b/app/src/main/res/drawable/base_theme_btn_21.xml @@ -1,14 +1,7 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml index fc3339ab5..bd934a9ca 100644 --- a/app/src/main/res/drawable/bg_splash.xml +++ b/app/src/main/res/drawable/bg_splash.xml @@ -2,12 +2,13 @@ - - - + - + - - - - diff --git a/app/src/main/res/drawable/user_info_bg_live.xml b/app/src/main/res/drawable/user_info_bg_live.xml index 000698382..613f8f2fb 100644 --- a/app/src/main/res/drawable/user_info_bg_live.xml +++ b/app/src/main/res/drawable/user_info_bg_live.xml @@ -2,8 +2,10 @@ + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 85abc85db..c9dd2dfbf 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -32,14 +32,4 @@ android:textColor="@color/text_normal_c6c6e9" android:textSize="14sp" /> - - diff --git a/app/src/main/res/layout/main_tab_layout.xml b/app/src/main/res/layout/main_tab_layout.xml index 7cc744544..ec309cba6 100644 --- a/app/src/main/res/layout/main_tab_layout.xml +++ b/app/src/main/res/layout/main_tab_layout.xml @@ -20,14 +20,6 @@ android:layout_gravity="center_vertical" android:layout_weight="1" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 7353dbd1f..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/app_logo.webp b/app/src/main/res/mipmap-hdpi/app_logo.webp index b25ec1458..312615cb2 100644 Binary files a/app/src/main/res/mipmap-hdpi/app_logo.webp and b/app/src/main/res/mipmap-hdpi/app_logo.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index e0d7c9236..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index 10e02fc98..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index e124b2c3e..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 433252e08..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/app_logo.webp b/app/src/main/res/mipmap-xhdpi/app_logo.webp index ee2fbf301..999b8703a 100644 Binary files a/app/src/main/res/mipmap-xhdpi/app_logo.webp and b/app/src/main/res/mipmap-xhdpi/app_logo.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 5c2b4052a..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index bdf33a8b1..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/app_logo.webp b/app/src/main/res/mipmap-xxhdpi/app_logo.webp index 15fd61fef..056757d61 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/app_logo.webp and b/app/src/main/res/mipmap-xxhdpi/app_logo.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index ea6badb2a..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 61b8fb8c8..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/app_logo.webp b/app/src/main/res/mipmap-xxxhdpi/app_logo.webp index 37ebf7ddf..989b18184 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/app_logo.webp and b/app/src/main/res/mipmap-xxxhdpi/app_logo.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index 2f9c2efdf..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index c66297ae3..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea727f50d..0614ba299 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -851,7 +851,6 @@ 請輸入昵稱 綁定手機號 - 來&app_name;,邂逅你的專屬聲音 同意 不同意 diff --git a/core/src/main/java/com/chwl/core/home/bean/MainTabType.java b/core/src/main/java/com/chwl/core/home/bean/MainTabType.java index ea432b145..27c414415 100644 --- a/core/src/main/java/com/chwl/core/home/bean/MainTabType.java +++ b/core/src/main/java/com/chwl/core/home/bean/MainTabType.java @@ -2,9 +2,8 @@ package com.chwl.core.home.bean; public interface MainTabType { //tabType(1-派对,2-广场,3-赛事,4-消息,5-我的) - int TAB_TYPE_HOME = 1; - int TAB_TYPE_SQUARE = 2; - int TAB_TYPE_MSG = 4; - int TAB_TYPE_ME = 5; - int TAB_TYPE_STAR = 6; + int TAB_TYPE_STAR = 1; + int TAB_TYPE_HOME = 2; + int TAB_TYPE_MSG = 3; + int TAB_TYPE_ME = 4; } diff --git a/core/src/main/java/com/chwl/core/initial/IInitialModel.java b/core/src/main/java/com/chwl/core/initial/IInitialModel.java index b1fca0cc0..59d308d01 100644 --- a/core/src/main/java/com/chwl/core/initial/IInitialModel.java +++ b/core/src/main/java/com/chwl/core/initial/IInitialModel.java @@ -1,15 +1,12 @@ package com.chwl.core.initial; -import android.annotation.SuppressLint; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; import com.chwl.core.base.IModel; -import com.chwl.core.bean.response.ServiceResult; import com.chwl.core.home.bean.MainTabInfo; -import com.chwl.core.initial.bean.BoxInfo; import com.chwl.core.initial.bean.FairyOpenInfo; import com.chwl.core.initial.bean.InitInfo; import com.chwl.core.initial.bean.SplashComponent; @@ -29,15 +26,11 @@ public interface IInitialModel extends IModel { Single init(boolean force); - boolean isReportSwitch(); - SplashComponent getLocalSplashVo(); @Nullable InitInfo getCacheInitInfo(); - InitInfo getCacheInitInfoOnly(); - /** * 只是load 一下初始化接口 * @@ -47,33 +40,8 @@ public interface IInitialModel extends IModel { String getPublicChatHallUid(); - @SuppressLint("CheckResult") - void loadMainTabInfoList(); - - Single getBoxInfo(); - - boolean isCaptchaSwitch(); - - long getTimeDiff(); - - int getFindNewbieCharmLevel(); - - /** - * 回调结果至百度信息流api - * - * @return - */ - - Single reportAdv(String oaid, String imeiMD5); - int getTeenagerMode(); - int getRoomRefresh(); - - int getDynamicRefresh(); - - int getDefaultHomeTab(); - Single requestFairyOpenInfo(); @Nullable diff --git a/core/src/main/java/com/chwl/core/initial/InitialModel.java b/core/src/main/java/com/chwl/core/initial/InitialModel.java index e12debe92..e0a01f5f8 100644 --- a/core/src/main/java/com/chwl/core/initial/InitialModel.java +++ b/core/src/main/java/com/chwl/core/initial/InitialModel.java @@ -1,7 +1,6 @@ package com.chwl.core.initial; -import android.annotation.SuppressLint; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -143,12 +142,7 @@ public class InitialModel extends BaseModel implements IInitialModel { private InitialModel() { api = RxNet.create(Api.class); - loadMainTabInfoList(); - List tabInfoList = DemoCache.readMainTabInfoList(); - if (ListUtils.isListEmpty(tabInfoList)) { - tabInfoList = getDefaultMainTab(); - DemoCache.saveMainTabInfoList(tabInfoList); - } + List tabInfoList = getDefaultMainTab(); mainTabInfosLiveData.setValue(tabInfoList); IntentFilter filter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"); receiver = new BroadcastReceiver() { @@ -315,11 +309,6 @@ public class InitialModel extends BaseModel implements IInitialModel { return publicChatHallUid; } - @Override - public boolean isReportSwitch() { - return reportSwitch; - } - /** * 如果返回的是null,则可能是过期了,也有可能是因为图片还没有下载 * @@ -359,25 +348,6 @@ public class InitialModel extends BaseModel implements IInitialModel { return cacheInitInfo == null ? DemoCache.readInitInfo() : cacheInitInfo; } - /** - * 过期了才为空 - */ - @Override - public InitInfo getCacheInitInfoOnly() { - if (System.currentTimeMillis() - DemoCache.readInitInfoSavingTime() > TIME_EXPIRED) { - // 过期了 - return null; - } else { - InitInfo initInfo = DemoCache.readInitInfo(); - // 没有缓存 - if (initInfo == null) { - return null; - } else { - return initInfo; - } - } - } - private void downloadSplashPicture(final String path) { if (TextUtils.isEmpty(path)) return; if (path.equals(DemoCache.readSplashPicture()) && new File(path).exists()) return; @@ -419,27 +389,12 @@ public class InitialModel extends BaseModel implements IInitialModel { .observeOn(AndroidSchedulers.mainThread()); } - @SuppressLint("CheckResult") - @Override - public void loadMainTabInfoList() { - api.getMainTabList() - .compose(RxHelper.handleSchedulers()) - .compose(RxHelper.handleBeanData()) - .subscribe(mainTabInfos -> { - if (mainTabInfos.size() == 5) { - DemoCache.saveMainTabInfoList(mainTabInfos); - mainTabInfosLiveData.setValue(mainTabInfos); - } - }); - } - - private List getDefaultMainTab() { return new ArrayList<>(Arrays.asList( new MainTabInfo( "", "", - "", + "Star", MainTabType.TAB_TYPE_STAR, null ), @@ -450,13 +405,6 @@ public class InitialModel extends BaseModel implements IInitialModel { MainTabType.TAB_TYPE_HOME, null ), - new MainTabInfo( - "", - "", - ResUtil.getString(R.string.xchat_android_core_initial_initialmodel_04), - MainTabType.TAB_TYPE_SQUARE, - null - ), new MainTabInfo( "", "", @@ -474,50 +422,12 @@ public class InitialModel extends BaseModel implements IInitialModel { )); } - - /** - * 获取宝箱信息,如果没有,则重新加载 - */ - @Override - public Single getBoxInfo() { - if (boxInfo != null) { - return Single.just(boxInfo); - } - return loadInitInfo().flatMap(info -> { - boxInfo = initBoxInfo(info); - return Single.just(boxInfo); - }); - } - private BoxInfo initBoxInfo(InitInfo info) { BoxInfo boxInfo = new BoxInfo(); boxInfo.setOpenBoxSwitchLevelNo(info.getOpenBoxSwitchLevelNo()); return boxInfo; } - @Override - public boolean isCaptchaSwitch() { - return captchaSwitch; - } - - @Override - public long getTimeDiff() { - return this.timeDiff; - } - - /** - * 回调结果至百度信息流api - * - * @return - */ - - @Override - public Single reportAdv(String oaid, String imeiMd5) { - return api.reportAdv(imeiMd5, oaid) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - /** * 地区检测 */ @@ -556,26 +466,6 @@ public class InitialModel extends BaseModel implements IInitialModel { return teenagerMode; } - @Override - public int getRoomRefresh() { - return roomRefresh; - } - - @Override - public int getDynamicRefresh() { - return dynamicRefresh; - } - - @Override - public int getDefaultHomeTab() { - return defaultHomeTab; - } - - @Override - public int getFindNewbieCharmLevel() { - return findNewbieCharmLevel; - } - @Override public Single requestFairyOpenInfo() { return api.getFairyOpenInfo() @@ -601,24 +491,6 @@ public class InitialModel extends BaseModel implements IInitialModel { @GET("/client/init") Single> init(); - /** - * 回调结果至百度信息流api - * - * @param imeiMD5 - * @return - */ - @POST("/observe/callback") - @FormUrlEncoded - Single reportAdv(@Field("imei") String imeiMD5, @Field("oaid") String oaidMD5); - - /** - * 获取首页Tab配置 - * - * @return - */ - @GET("/app/bottomBar/getCurrentAppBottomBar") - Single>> getMainTabList(); - /** * 夺宝精灵开放状态 * diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml index 3edc5cd2b..f090a4024 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_15dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml index 405aa9a27..b2be0791c 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_30dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml b/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml index 2b5296947..99e295e9c 100644 --- a/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml +++ b/modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml new file mode 100644 index 000000000..f8a003ad5 --- /dev/null +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modules/module_base/src/main/res/values/colors.xml b/modules/module_base/src/main/res/values/colors.xml index d3ce36ec0..4ba8ade87 100644 --- a/modules/module_base/src/main/res/values/colors.xml +++ b/modules/module_base/src/main/res/values/colors.xml @@ -1,13 +1,13 @@ - #CBFF00 + #718CFF #1E1E1F - #1E1E1F + #FFFFFF #FFFFFF