From f5287becee0289ee8bf79a3d35c6d031897faeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Mon, 22 Dec 2025 14:04:19 +0800 Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=8D=A2=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=202?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moduleutil/base/CommonAppContext.java | 32 +++++++----- .../xscm/moduleutil/utils/SPConstants.java | 4 +- .../com/xscm/moduleutil/utils/SpUtil.java | 8 +++ .../src/main/res/layout/item_piaoping.xml | 2 +- .../main/res/mipmap-hdpi/red_effect_off.png | Bin 0 -> 2065 bytes .../main/res/mipmap-hdpi/red_effect_on.png | Bin 0 -> 1683 bytes .../main/res/mipmap-xhdpi/red_effect_off.png | Bin 0 -> 1543 bytes .../main/res/mipmap-xhdpi/red_effect_on.png | Bin 0 -> 1320 bytes .../main/res/mipmap-xxhdpi/red_effect_off.png | Bin 0 -> 3938 bytes .../main/res/mipmap-xxhdpi/red_effect_on.png | Bin 0 -> 3366 bytes .../user/activity/SettingActivity.java | 29 +++++++++-- .../adapter/HorizontalListAdapter.java | 2 +- .../src/main/res/layout/activity_setting.xml | 48 +++++++++++++----- gradle.properties | 4 +- 14 files changed, 94 insertions(+), 35 deletions(-) create mode 100644 BaseModule/src/main/res/mipmap-hdpi/red_effect_off.png create mode 100644 BaseModule/src/main/res/mipmap-hdpi/red_effect_on.png create mode 100644 BaseModule/src/main/res/mipmap-xhdpi/red_effect_off.png create mode 100644 BaseModule/src/main/res/mipmap-xhdpi/red_effect_on.png create mode 100644 BaseModule/src/main/res/mipmap-xxhdpi/red_effect_off.png create mode 100644 BaseModule/src/main/res/mipmap-xxhdpi/red_effect_on.png 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 0000000000000000000000000000000000000000..99ff1d992ff558ba370afdde8c8c8b8fce76df83 GIT binary patch literal 2065 zcmV+s2=4cZP)T8=!Hu&@KAiEl(FU_qqnrU2J z3pv%cQh03(WieIpzuTDzzvdRIG`CR}|3=oe(T=KCnt*W_k9kbP{pUesXYQbHm_bKo zID)B|8SGR5s3PV2Vg?^k(?VOSnrY0ifFYvKuy{=yU1o+#dYpt&YE$Mr&-0Jvb?k-$ zj9nwq*DO8++)Sf+(zIa$(_184D1(1TfiEM*U@Y%Y`bYrO!&;^* zMnpR>oR9+O?MMOzeiXh&Y1Sd-sA&XKnra<`m4Q+YjgGvdr{xWlU06X`1+S>+MIBW& zz11R$!2?=F_ye|Z4zMrlq@^1U(USEC$zkg;@;r2jZr^{Z)|b`8 z&GhS};phh258)&tuic}m3*2ekG$*0))4S;X|DEaRsd%bv=v3v$z;~a~0z9~_#H#pJ zBRwpxqMV`%dR$sduj<<6-NnB$Xv%zd0kMov$mdv$Jc~}qq9Z4+)9Nh&0_wXtE)*D= z2s1vg7;=PT)f&P~A~Z1q=5^y6x_P%q#A>6{pS0>1KU)6NVOr~Wl$<=z(6P`2n!dl+A97mTB`4;-7N;){W_UNfwK&eE>db~W{ z&woj4SZu(=_j6ro_2vND9}rC!uBKB|TqXsdyFr_rgK5&NUG(kDofH(7#3%HQPG7tu zW7cmEq_E4$Jl2J#FZPsquieO{$vhX{=M+_{;iUv=(E9|B^B5)U*9;2!vT0|qoWiW7 zdnl9{Ei5yC^xd5Y#Wa)OPhkUb{Z?ML1zhalD~wN=;Vk6l6W;ai-!fXb+FRaTzn!Os zmv+YCD2XOAP9$i0#SXg;X0Z6Ro4LJo#2Tm{SWgmD9(U~WfCa=UcpbjPI#fypY-|cj&0fL$=GR&c8d$ZT(g$#5&Z(-t*)miyP!flUtE?m zvBFjkB`DB~+BOkCYYrL~G9=;_m9q2HaY_JHWinFUvftz{j0A-xY61m9IE1m2=ed&K zi8u<6O_yk*ysq77?AdP8JGiX6g-x!PhzfRH>#kxv^af#7d~&``GXY&E1pu&0P-ys< zq|^dki*I!LLr%+)4T9E_?*F8^YTc>_RdYUsG-2jaFJWk#+bP*~Jq+ATFJkd?>z)T$ zur5979g9|)q=>I!5ON<&f(JtZGps+d@1)~rk~qI|>$Z4>oYEUQDYoV&=}xE|fEogF z97F|9UT5iXNv&aVdC6Ryk4_a(&@W`ghDvDMO~FYysT~l<(Xu7*)DVxUBIiA4Wo|fR zBl93aG9gw{8~Y_BKaz##tk|czIHI<0vE4mX=HBZUWu(yAiC9)sl#UD)i5pDudJax6 z#N4Gz*Y6vmNY>GPepe)VhxkRsKQOXET~WH^Q?2UrshFgk?hwb81f4>x_k=B=Zcr^s zKBZ*7j#~Ux45u7BJWfkQf#M42$2C4m2D?*=Etcm!X^LVsVQg0Xe5C6+&#__0aq>PI zP5IAj3^nYK!FN}cklSmiQAnD=u^B=gl)*sBnZ>f(aL9--EYB^3%y*#z9H|PDM$5ZG zjg{HHY81UHN~ppptxiJ|Z*>h(iZ3pdn*CfD1tCX5$^pTHSAq(U#}k z+)@!e_%SFxO3JWmb64&Yu+T-{pjfKlEZEkqRMai4_M?QB*wYX! zu=l3WOLtVK=9)}7SC;#%r`xKQE|u2eYC3x*RjN%WunY#60c+`&dOErY!`R!^+zYO2 zrL_ZIO;Ebv69 zbl+yH@)qVpaE(~hCc2~NPcAc}6WL<$W@fA0%ydK=g4hgRy0U1d4kv2{{vByxw=Rwwfxv7-YjatvT?00000NkvXXu0mjfwrT4+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fbb03589922af3b00aa5186b20c344e69374662d GIT binary patch literal 1683 zcmYMzdpOf;902g)kQSwMPD-6lsnc6JE-x%DKa7@tHU42Zz2F*azR@?ouuKQ*E zJ5ECnhbySy3aXnw)V222xA(tR5H_?6xx4``Z?Lg*u&HaPxl7c{7d5{XweUr)-NSEs zM%n?vXop~w*E`00Ki2g@%L<*u%sFyD% z-C#2F^9vq5VzVDNwY2egym!K(@o|ZKW_E6A`OAuquKo@fOvT#X+5&6WM8KP`a-6KR zobmrWT4os7u3=2N9`gQ((%G z<{c($5mAXhR{V-`e!wV?O8sGv2{NGdCqucC1Ifg3yIfqk>xa4W&0Pmqi>r5OP*u?{ z}roYtY;1sk;`5-X(mG|ewO;WRNTi~+t`P!u2RpRi^Uja1(xw0H6|x? zWQCO9DpwPZ%UfS@jnxkO{n7QmB2Hpfak4<0kTm^H0KkLc8= ztYO2CTBvzY3p>6n8=Tmm*X(1Kwc)Uu0Towqb-0YBK410F9RjwkK><26earx}M!4$Gb?eh@!-9$rm9 z$2iQcEphch8KJMsZkuAgLZkNjw%$)>6P?R3D+Z;fy|st2VOu;JA}us+xX*rh*wZGi zzEWD>9|(UQ`D@J9glLa_hxa@qPO7dY@lwm5YefGxPT^pdjrVdcnG*HJpKIGX%(nd% z!!T>=q~O~A28=c9>rAGPix-1)DUvza&X={<(GO;aWi+jdHJ95YFf zkPdu=)h?(F!Evjqs+4A!8@_#bZ%NlYdla!X=qMsq#f^!qgVTOKYqRgqz+*~3Y9}G4 z^B&Vpj_ZAk+g+1>#Pbx^Dl7R8UN<8(+s*xCTkXbPnX$kvP5Tq6sdN<#XY+0TUZJZs Q_%~tpHYn>SmiXv@0DTR%PXGV_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..21df717bb85feff6b15dfe4dc7b123d1d0894788 GIT binary patch literal 1543 zcmXw(dpOf;0LOo^ltfI4kSIegnd9^vqEy6O=CW1ms7zF7=M2Yki}O>DOs*l(jxD!o zv&TK7+Zdi$F4>qQO+_r1p&d!B-}!Yq=Xt*G_x-+~@B7#LzR#QPhjmxqv||$h0O}YI z*8q4v_I+$r{_cy&W&l`M;pdHagO@xAl1QKh*kzDR2FW4lgB+TJp!pR@_6d?f(6kJi z{shf`hCY6VWNXm;Dzvl;Ev!Pa&(Iva0j@qli?G84<}2STn85r;{_b%8S1^ae5C4zA z?f?404|>JA_{1OeOFV{4!W{q8i;#j1yykx<)&J~uJdt`LG!}4 z7MQ^XGuc|r$uSWP{wCIP4U8K=3ornSHR;q&@O&zqhIxotz-_Mz4eacifT*E7cN9q;UybPhE#Kj{N3Ej)WYhN zY;|U7ZC3tuR<3|gDV@MV!1siX3Bck2#KtX}n%i~t4UCL-?XtAo=kD(18x#~0l9Q94 zPove=Hgb6#BGJgmm}Gi-R`%&juZ{aH08oB|aXpOJ)hlVwI;u@EP+63zr)>S18udhJ z=dKp51N0E>_)DW|H#IBq4PE_n>doc?q@iVBz46jlkvbu6A8$;Jk%JJuesYCEjO*Rg z7faR~kz;-Ch}jbA;BIj(*HgPGHZy8(@iDHwhiEq^n6L$-%-0g5k%bBUJ4j&E*$80> ziOTY-^E1*HZ_fkfuaWqEH1jjm28+RuWs$}Ll-odtZ(@N@MsvD*7`4h)7s)+H_hhup zaL5nMUqGZy^M7UN(SMhA|HNy;Bv( z)if;ZxQD-e3`?^hW@~8qXi#vatHyhoC&l8O-pbV5t?QhuywBa4Lew2ivvCN0PCleM z@$OJur%GYB0jNsMJB<)ai5_m%7~TLdd*H-q+m4>Jd(=awBG4yo=_ivi5m~Lx_bWra z0;7Whu3(q-+nD(_CJK3?(Q2MqGD4?^XBK7dX0z^;aU=m^o$BQKpw+ld4`pq9 zeY3O)Ah7H#1=Tu>s?Igk!@NDYRk$b}mn-4ckBb1?z_O>{tFj0BYip{-`E`X2qi22EA zpGlPxfhrMI;_o>CaDzm(L9Q_mCjD^Pn;uaA(yQ`X*so+7jkgV~;NKm4%`E8&eF7kh z*<)=AZ&V1mkae!R)P`MPH4(crUdg*amlLQFuEll&-ue=j0u2bkb-@ly+|;lkU{oQD zUFSV-N60Y{ncyv69UjJ~v>!VXu#G8P5Fqw)Zk^;9TbXTU-%75Z??YZfPi8fu>3Q*3 zgBW^1PK$gQpU`D(-;LAVlJK@W=7*QgbiDKLvns!@AZSAzu9l7t=4y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0260fb29fdcdbccfed424c7f12ef0eefb003f295 GIT binary patch literal 1320 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8e0f43aab27e8dd520cffb1ed49c26b27ad9479e GIT binary patch literal 3366 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 literal 0 HcmV?d00001 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