接口地址修改

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -446,7 +446,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .load(AppUtil.getQRLink(userEntity.getShare_link(), 800))
                 .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                 .preload(800, 800);
-        if (userEntity.getIs_new() == 2) {//为1时代表老玩家
+        if (userEntity.getIs_new() == 2) {//1新用户 2老用户
             newbie_task.setVisibility(View.GONE);
         } else {
             try {
@@ -877,7 +877,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     }
     private void testChange(){
-        if(!"sheep".equals(BuildConfig.FLAVOR)){
+        if(BuildConfig.DEBUG){
             test_change.setVisibility(View.VISIBLE);
             test_change.setText(SheepApp.getInstance().getConnectAddress().getName());
             test_change.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -58,7 +58,7 @@ public class UserEntity implements Serializable {
     @Column(name = "newbie_task_status")
     private int newbie_task_status;
     @Column(name = "is_new")
-    private int is_new;
+    private int is_new;//1新用户 2老用户
 
     public String getWx_nickname() {
         return wx_nickname;

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -7,26 +7,15 @@ import android.support.multidex.MultiDex;
 import android.util.DisplayMetrics;
 
 import com.kfzs.duanduan.react.SharedPreferences;
-import com.kfzs.libs.di.http.DaggerHttpComponent;
-import com.kfzs.libs.di.http.HttpComponent;
-import com.kfzs.libs.di.http.HttpModule;
 import com.sheep.gamegroup.di.components.DaggerNetComponent;
 import com.sheep.gamegroup.di.components.NetComponent;
 import com.sheep.gamegroup.di.modules.NetModule;
-import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.ConnectAddress;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.bugly.Bugly;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
 /**
  * Created by kemllor on 2017/12/21.
  */
@@ -65,8 +54,13 @@ public class SheepApp extends BaseApplication {
         super.onCreate();
         mContext = getApplicationContext();
         mSheepApp = this;
-        String flavor = SharedPreferences.getInstance().getString("flavor",BuildConfig.FLAVOR);
-        connectAddress = ConnectAddress.valueOf(flavor);
+        if(BuildConfig.FLAVOR.equals("sheep") && BuildConfig.BUILD_TYPE.equals("release")){
+            connectAddress = ConnectAddress.sheep;
+        }else {
+            String flavor = SharedPreferences.getInstance().getString("flavor",BuildConfig.FLAVOR);
+            connectAddress = ConnectAddress.valueOf(flavor);
+        }
+
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
         Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);

app/src/main/res/drawable/sp_bg_gradient_retangle_transe.xml

@@ -3,6 +3,7 @@
     android:shape="rectangle">
 
     <gradient
+        android:angle="-90"
         android:startColor="@color/transparent"
         android:endColor="@color/dark"/>
 

app/src/main/res/layout/homepage_act_layout.xml

@@ -54,7 +54,8 @@
         android:layout_marginEnd="@dimen/content_padding_10"
         android:layout_marginBottom="@dimen/content_padding_20"
         android:gravity="center"
-        android:background="@drawable/shape_newbie_task_tv">
+        android:background="@drawable/shape_newbie_task_tv"
+        android:visibility="gone">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -75,5 +76,5 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:text="切换服务器"
-        android:visibility="visible"/>
+        android:visibility="gone"/>
 </RelativeLayout>

app/src/main/res/layout/homepage_item_4module.xml

@@ -20,7 +20,7 @@
                 android:gravity="center"
                 android:layout_gravity="center_vertical"
                 android:padding="@dimen/content_padding_10"
-                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                 android:layout_marginRight="@dimen/content_padding_small">
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -57,7 +57,7 @@
                 android:gravity="center"
                 android:layout_gravity="center_vertical"
                 android:padding="@dimen/content_padding_10"
-                android:background="@drawable/sp_rectangle_bg_white_radius">
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
                 android:gravity="center"
                 android:layout_gravity="center_vertical"
                 android:padding="@dimen/content_padding_10"
-                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                 android:layout_marginRight="@dimen/content_padding_small">
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -136,7 +136,7 @@
                 android:gravity="center"
                 android:layout_gravity="center_vertical"
                 android:padding="@dimen/content_padding_10"
-                android:background="@drawable/sp_rectangle_bg_white_radius">
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"