diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 063c476d..57b520f5 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -75,7 +75,7 @@ import lombok.Setter; * Created by cxf on 2017/8/3. */ -public class CommonAppContext extends MultiDexApplication implements Application.ActivityLifecycleCallbacks { +public class CommonAppContext extends MultiDexApplication implements Application.ActivityLifecycleCallbacks { private static CommonAppContext sInstance; private static Handler sMainThreadHandler; @@ -95,17 +95,17 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio public boolean isShowAg; - public boolean isRoomJoininj=false; + public boolean isRoomJoininj = false; public String playCover; public boolean showSelf;//盲盒是否能送自己 public String playName; - private MqttConnect mqttConnect=null; + private MqttConnect mqttConnect = null; // 添加后台状态标记 private boolean wasInBackground = false; - public boolean isMai=false; + public boolean isMai = false; public void onAppBackground() { wasInBackground = true; @@ -123,17 +123,17 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio private AppStateListener appStateListener; private boolean isListeningUnreadCount = false; - public boolean onConnectFailed=false;//是否重连 + public boolean onConnectFailed = false;//是否重连 @Getter @Setter - public Map onlineMap=new HashMap<>(); + public Map onlineMap = new HashMap<>(); @Setter @Getter public UnreadCountEvent unreadCountEvent; - public static int statusRelease = 11; + public static int selectRelease = -1; @Override public void onCreate() { @@ -156,14 +156,18 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio CrashHandler.init(this); - if (SpUtil.getShelf()!=0) { + if (SpUtil.getShelf() != 0) { SpUtil.setShelf(1); } + if (SpUtil.getTaskService()==1){ + selectRelease = 2; + } + //设置mqtt环境 false 测试环境 true 正式环境 // ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false); //设置http环境 false 测试环境 true 正式环境 - ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(statusRelease == 1); + ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(selectRelease != -1); currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH(); initialization(); @@ -230,17 +234,19 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio // 通知未读数变化的方法(可以发送广播或EventBus事件) private void notifyUnreadCountChanged(long unreadCount) { - UnreadCountEvent event =unreadCountEvent; - if (event==null){ - event=new UnreadCountEvent(); + UnreadCountEvent event = unreadCountEvent; + if (event == null) { + event = new UnreadCountEvent(); } event.setALong(unreadCount); // 使用EventBus通知 CommonAppContext.getInstance().setUnreadCountEvent(event); - EventBus.getDefault().post(event); + EventBus.getDefault().post(event); } + /** * 检查网络是否可用 + * * @return true表示网络可用,false表示网络不可用 */ public boolean isNetworkAvailable() { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java index 5091f987..0d53a0b7 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java @@ -34,5 +34,7 @@ public class SPConstants { public static final String FLOATING_SCREEN = "floatingScreen"; - public static final String SHELF="shelf"; + public static final String SHELF = "shelf";//货架 + + public static final String TASK_SERVICE="taskService";//切换服务器 } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java index c616cc7e..4abc56c8 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java @@ -335,6 +335,14 @@ public class SpUtil { return shelf; } + public static int setTaskService(int taskService){ + SPUtils.getInstance(SPConstants.PREFERENCE_NAME).put(SPConstants.TASK_SERVICE, taskService); + return taskService; + } + public static int getTaskService(){ + return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getInt(SPConstants.TASK_SERVICE); + } + //获取SharedPreferences音乐轮播方式 public static int getPlayPattern() { return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getInt(SPConstants.PLAY_MODE, 1); diff --git a/BaseModule/src/main/res/layout/item_piaoping.xml b/BaseModule/src/main/res/layout/item_piaoping.xml index d565ca78..05c51c2c 100644 --- a/BaseModule/src/main/res/layout/item_piaoping.xml +++ b/BaseModule/src/main/res/layout/item_piaoping.xml @@ -20,7 +20,7 @@ android:layout_marginStart="60dp" android:layout_marginEnd="@dimen/dp_2" android:ellipsize="start" - android:maxLines="1" + android:maxLines="2" android:text="礼品" android:textColor="#FFDE77" android:textSize="14sp" diff --git a/BaseModule/src/main/res/mipmap-hdpi/red_effect_off.png b/BaseModule/src/main/res/mipmap-hdpi/red_effect_off.png new file mode 100644 index 00000000..99ff1d99 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/red_effect_off.png differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/red_effect_on.png b/BaseModule/src/main/res/mipmap-hdpi/red_effect_on.png new file mode 100644 index 00000000..fbb03589 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/red_effect_on.png differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/red_effect_off.png b/BaseModule/src/main/res/mipmap-xhdpi/red_effect_off.png new file mode 100644 index 00000000..21df717b Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/red_effect_off.png differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/red_effect_on.png b/BaseModule/src/main/res/mipmap-xhdpi/red_effect_on.png new file mode 100644 index 00000000..0260fb29 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/red_effect_on.png differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/red_effect_off.png b/BaseModule/src/main/res/mipmap-xxhdpi/red_effect_off.png new file mode 100644 index 00000000..21829da4 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/red_effect_off.png differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/red_effect_on.png b/BaseModule/src/main/res/mipmap-xxhdpi/red_effect_on.png new file mode 100644 index 00000000..8e0f43aa Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/red_effect_on.png differ diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java index cea72e4b..d7dc5398 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java @@ -1,5 +1,7 @@ package com.xscm.modulemain.activity.user.activity; +import static android.view.View.GONE; + import android.annotation.SuppressLint; import android.content.DialogInterface; import android.content.Intent; @@ -80,16 +82,22 @@ public class SettingActivity extends BaseMvpActivity + android:visibility="gone" /> + android:background="@drawable/bg_r15_white"> + tools:visibility="visible"> + + android:gravity="center|end" /> @@ -196,6 +195,7 @@ android:layout_width="0dp" android:layout_weight="1" android:text="@string/version_number" /> + + + + + + + + + + - + android:padding="@dimen/dp_40" + android:visibility="gone" /> diff --git a/gradle.properties b/gradle.properties index ea5f059a..0816415e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.8.7 -APP_VERSION_CODE=77 +APP_VERSION_NAME=1.0.8.8 +APP_VERSION_CODE=78 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15