Browse Source

部分ui调整

liujiangyao 8 years ago
parent
commit
7c929f7a20

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -6,9 +6,9 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+//  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
 //     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
-//   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
+   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";
 

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -103,7 +103,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             finish();
         } else {
             Jump2View.getInstance().goPhoneLoginView(LoginAct.this, false);
-            finish();
+//            finish();
         }
     }
 

+ 5 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalCenterAct.java

@@ -120,12 +120,13 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 Jump2View.getInstance().goWithdrawal(activity, null);
                 break;
             case R.id.account_safe_layout:
-                Intent i=new  Intent(PersonalCenterAct.this,AccountAndSecurityAct.class);
-                startActivity(i);
+                Jump2View.getInstance().goAccountAndSecurit(activity, null);
                 break;
-            case R.id.account_task_layout:
+            case R.id.account_task_layout://任务记录
+                Jump2View.getInstance().goTaskList2View(activity, null);
                 break;
-            case R.id.account_detail_layout:
+            case R.id.account_detail_layout://提现明细
+                Jump2View.getInstance().goWithdrawallistView(activity, null);
                 break;
         }
     }

+ 3 - 3
app/src/main/res/layout/login_act_layout.xml

@@ -20,9 +20,9 @@
             android:layout_alignParentBottom="true"
             style="@style/login_btn"
             android:textColor="@color/txt_white"
-            android:background="@drawable/sp_bg_transparency_line_white"
-            android:layout_marginBottom="80dp"
-            android:layout_marginTop="@dimen/content_padding_10"/>
+            android:background="@mipmap/x_ic_login_bg_sure"
+            android:layout_marginBottom="@dimen/content_padding_65"
+            android:layout_marginTop="@dimen/content_padding_20"/>
 
 
         <LinearLayout

BIN
app/src/main/res/mipmap-xhdpi/x_ic_login_bg_sure.png


BIN
app/src/main/res/mipmap-xhdpi/x_ic_login_qq.png


BIN
app/src/main/res/mipmap-xhdpi/x_ic_login_wx.png


BIN
app/src/main/res/mipmap-xxhdpi/x_ic_login_bg_sure.png


BIN
app/src/main/res/mipmap-xxhdpi/x_ic_login_qq.png


BIN
app/src/main/res/mipmap-xxhdpi/x_ic_login_wx.png


+ 2 - 2
app/src/main/res/values/gamegroup_styles.xml

@@ -46,7 +46,7 @@
         <item name="android:paddingBottom">6dp</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:paddingRight">8dp</item>
-        <item name="android:textColorHint">@color/black_444444</item>
+        <item name="android:textColorHint">@color/txt_gray_929292</item>
         <item name="android:background">@drawable/sp_edt_background_common</item>
     </style>
 
@@ -76,7 +76,7 @@
         <item name="android:textColor">@color/txt_black</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_margin">@dimen/content_padding</item>
-        <item name="android:background">@drawable/sp_bg_gradient_rectangle_yellow</item>
+        <item name="android:background">@drawable/sp_bg_gradient_rectangle_blue</item>
     </style>
     <style name="MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->