hanjing 6 lat temu
rodzic
commit
5d40b56f1f

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -49,8 +49,8 @@ public class NetModule {
     public Retrofit provideRetrofit(OkHttpClient okhttpClient) {
         Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClient)
-//                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
-                .baseUrl("http://ss.17xmy.com/v1/")
+                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
+//                .baseUrl("http://ss.17xmy.com/v1/")
 //                .baseUrl("http://10.8.220.239:8080/v1/")
 //                .baseUrl("http://10.8.240.193:8080/v1/")
                 .addConverterFactory(StringConverterFactory.create())

+ 2 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -115,8 +115,8 @@ public class Config {
         initSMALL_STATION_URL();
     }
     public static void initSMALL_STATION_URL(){
-//        SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
-        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
+        SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
+//        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
     }
     public static String getUrlByPath(String path, Object...query){
         String url = SMALL_STATION_URL + path;

+ 2 - 2
gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.6.9
-VERSION_CODE=3006009
+VERSION_NAME=3.7.1
+VERSION_CODE=3007001
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_MIN_SDK_VERSION=18
 ANDORID_TARGET_SDK_VERSION=28

+ 8 - 0
skin_newYear/src/main/res/drawable/drawable_selector_game_center.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/tab_game_blue" android:state_activated="true"/>
+    <item android:drawable="@drawable/tab_game_blue" android:state_pressed="true"/>
+    <item android:drawable="@drawable/tab_game"/>
+
+</selector>

+ 8 - 0
skin_newYear/src/main/res/drawable/drawable_selector_task.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_zhuanqian"/>
+
+</selector>