liujiangyao пре 8 година
родитељ
комит
a3bcda5b79

+ 2 - 2
app/build.gradle

@@ -220,8 +220,8 @@ dependencies {
     compile 'com.github.ithedan:TextViewDrawable:v1.0'
     compile 'com.lzy.widget:imagepicker:0.6.1'
     compile 'com.github.zhangkexpz:LayoutScroll:v1.0'
-    compile 'com.arialyy.aria:aria-core:3.3.14'
-    annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.14'
+    //Todo 脑壳浆糊了
+//    compile 'org.wlf:FileDownloader:0.3.2'
 
 
 }

+ 1 - 5
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -48,17 +48,13 @@ public class CommonUtil {
         String result = "未付款";
         switch (ety.getStatus()){
             case 0:
-                result = "未付款";
-                break;
             case 1:
+            case 3:
                 result = "付款中";
                 break;
             case 2:
                 result = "已付款";
                 break;
-            case 3:
-                result = "付款失败";
-                break;
         }
         return result;
     }

+ 4 - 1
app/src/main/java/com/sheep/gamegroup/util/TimeUtil.java

@@ -51,7 +51,10 @@ public class TimeUtil {
         return str;
     }
     public static String getDate(String formate, long paramLong){
-        String str = new SimpleDateFormat(formate, Locale.ENGLISH).format(new Date());
+        Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(paramLong);
+        Date date = c.getTime();
+        String str = new SimpleDateFormat(formate, Locale.ENGLISH).format(date);
         return str;
     }
 }

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

@@ -71,7 +71,7 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
             EasyPermissions.requestPermissions(this, "应用需要这些权限", PERMISSON_REQUESTCODE, needPermissions);
         } else {
 //            setContentView(R.layout.splash_activity);
-            if(Build.VERSION.SDK_INT >= 19){
+            if(Build.VERSION.SDK_INT >= 21){
                 animWelcomeImage();
 
             }else {

+ 2 - 2
app/src/main/res/layout/bind_phone_number_act_layout.xml

@@ -16,8 +16,8 @@
             android:orientation="vertical">
             <ImageView
                 android:id="@+id/phone_iv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="140dp"
+                android:layout_height="140dp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginLeft="100dp"
                 android:layout_marginRight="100dp"

+ 2 - 1
app/src/main/res/layout/login_act_layout.xml

@@ -14,11 +14,12 @@
 
         <TextView
             android:id="@+id/tel_login_tv"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="手机号登录"
             android:layout_alignParentBottom="true"
             style="@style/login_btn"
+            android:gravity="center"
             android:textColor="@color/txt_white"
             android:background="@mipmap/x_ic_login_bg_sure"
             android:layout_marginBottom="@dimen/content_padding_65"

+ 1 - 0
app/src/main/res/layout/withdrawal_list.xml

@@ -11,5 +11,6 @@
         android:id="@+id/withdrawal_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:listSelector="@color/transparent"
         android:scrollbars="none"></ListView>
 </LinearLayout>