3.0.2发版本前去除3.1.0中的新功能

app/src/main/AndroidManifest.xml

@@ -578,6 +578,9 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActivityMessages"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.sheep.gamegroup.view.activity.ActMainGame"
+            android:screenOrientation="portrait" />
         <activity android:name="com.sheep.gamegroup.view.activity.ActGameCenter"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActDownloadWelfareList"

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -85,16 +85,8 @@ public class LoginPresenter implements LoginContract.Presenter {
         LoginEntity loginEty = null;
         if(baseMessage!=null){
             loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
-            if(loginEty.getCode() != null){
-                switch (loginEty.getCode()){
-                    case "bind_mobile":
-                        Jump2View.getInstance().goBindPhoneRegister(SheepApp.getInstance(), loginEty);
-                        return;
-                }
-            }
             SpUtils.saveToken(SheepApp.mContext, loginEty.getToken());
             DataUtil.getInstance().setUserEntity(loginEty.getUser());
-            LogUtil.logI("token--------"+loginEty.getToken());
         }
         view.NetSuccess(1,"登录成功", EntityUtils.getUserCode(loginEty));
         TestUtil.saveUser(loginEty);

app/src/main/java/com/sheep/gamegroup/util/DataUtil.java

@@ -259,9 +259,9 @@ public class DataUtil {
         return null;
     }
     //是否使用小绵羊截图方案
-    public static final boolean IS_USE_SCREEN_SHOT = true;
+    public static final boolean IS_USE_SCREEN_SHOT = false;
     //是否监听媒体库图片变化
-    public static final boolean IS_LISTEN_SCREEN_SHOT = true;
+    public static final boolean IS_LISTEN_SCREEN_SHOT = false;
     /**
      * 截图路径
      *

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -42,12 +42,12 @@ import com.sheep.gamegroup.view.activity.ActFindGame;
 import com.sheep.gamegroup.view.activity.ActFindInformation;
 import com.sheep.gamegroup.view.activity.ActGameAccount;
 import com.sheep.gamegroup.view.activity.ActGameAgencyRecharge;
-import com.sheep.gamegroup.view.activity.ActGameCenter;
 import com.sheep.gamegroup.view.activity.ActGiftCenter;
 import com.sheep.gamegroup.view.activity.ActGuide;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
 import com.sheep.gamegroup.view.activity.ActLoadH5;
+import com.sheep.gamegroup.view.activity.ActMainGame;
 import com.sheep.gamegroup.view.activity.ActMiDong;
 import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.gamegroup.view.activity.ActMyWelfare;
@@ -907,7 +907,7 @@ public class Jump2View {
      * @param context
      */
     public void goMainGame(Context context) {
-        Intent intent = new Intent(context, ActGameCenter.class);
+        Intent intent = new Intent(context, ActMainGame.class);
         context.startActivity(intent);
     }
 

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

@@ -43,19 +43,19 @@
                 android:layout_width="?attr/actionBarSize"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:background="@color/translate"
                 android:gravity="center"
+                android:visibility="gone"
                 android:src="@mipmap/add_black_img" />
             <!--右边设置图标按钮-->
             <ImageButton
                 android:id="@+id/ibtn_baseactivity_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="40dp"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
-               android:layout_toLeftOf="@id/ibtn_baseactivity_message"
                 android:background="@color/translate"
-                android:gravity="center"
                 android:src="@mipmap/setting" />
 
 

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

@@ -34,6 +34,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginBottom="@dimen/content_padding"
                 android:background="@color/white" />
 
             <LinearLayout
@@ -69,16 +70,20 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginBottom="@dimen/content_padding"
                 android:background="@color/white" />
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/login_et_scope"
                 style="@style/style_login_et"
                 android:hint="请输入邀请码"
-                android:inputType="phone"
+                android:visibility="gone"
+                android:inputType="text"
                 android:maxLength="11"/>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:visibility="gone"
+                android:layout_marginBottom="@dimen/content_padding"
                 android:background="@color/white" />
         </LinearLayout>
         <View

app/src/main/res/values/dd_styles.xml

@@ -444,7 +444,6 @@
     <style name="style_login_et">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/edt_heigh_default</item>
-        <item name="android:layout_margin">@dimen/content_padding_small</item>
         <item name="android:background">@color/transparent</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textColorHint">#A0D3F6</item>