diff --git a/app/src/main/res/mipmap-xxxhdpi/screen.png b/app/src/main/res/mipmap-xxxhdpi/screen.png
index 291bac726..ed363a273 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/screen.png and b/app/src/main/res/mipmap-xxxhdpi/screen.png differ
diff --git a/common/src/main/res/mipmap-mdpi/screen.png b/common/src/main/res/mipmap-mdpi/screen.png
deleted file mode 100644
index 291bac726..000000000
Binary files a/common/src/main/res/mipmap-mdpi/screen.png and /dev/null differ
diff --git a/live/src/main/res/drawable/background_fff_d20.xml b/live/src/main/res/drawable/background_fff_d20.xml
index 8b466e367..9013418c7 100644
--- a/live/src/main/res/drawable/background_fff_d20.xml
+++ b/live/src/main/res/drawable/background_fff_d20.xml
@@ -3,7 +3,7 @@
-
-
+
\ No newline at end of file
diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
index e78005596..783e2b0de 100644
--- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
@@ -119,11 +119,11 @@ import java.util.TimerTask;
@Route(path = RouteUtil.PATH_ENTRY)
public class EntryActivity extends AppCompatActivity {
- private VideoView video_view;
- private ImageView btn_phone, btn_line, btn_twitter;
+ //private VideoView video_view;
+ private ImageView btn_line, btn_twitter;
private TextView btn_tip, btn_tip1, tv_customer;
private TwitterLoginButton tt_login_button;
- private LinearLayout btn_google, googleLayout;
+ private LinearLayout btn_google, googleLayout,btn_phone;
public static Activity activity;
private static String mLoginType = Constants.MOB_PHONE;//登录方式
public String mPromoCode = "", UserID = "";//推广码
@@ -287,7 +287,7 @@ public class EntryActivity extends AppCompatActivity {
getPromoCode();
getUuidDevice();
- video_view = findViewById(R.id.video_view);
+ /*video_view = findViewById(R.id.video_view);
video_view.setVideoPath(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.login_video) + "");
video_view.start();
video_view.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@@ -306,7 +306,7 @@ public class EntryActivity extends AppCompatActivity {
video_view.setVisibility(View.GONE);
return false;
}
- });
+ });*/
lt_btn_facebook.setOnClickListener(new View.OnClickListener() {
@Override
@@ -664,7 +664,7 @@ public class EntryActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- video_view.start();
+ //video_view.start();
}
diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml
index ea137dc72..289aefc1f 100644
--- a/main/src/main/res/layout/activity_entry.xml
+++ b/main/src/main/res/layout/activity_entry.xml
@@ -4,13 +4,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/white"
tools:context=".activity.EntryActivity">
-
-
+ android:gravity="center_vertical">
@@ -69,29 +70,62 @@
+ android:gravity="center_vertical">
+
+
+
+
+
+
+
+
+
+
@@ -158,14 +192,6 @@
android:src="@mipmap/login_phone"
android:visibility="gone" />
-
-
+ android:visibility="gone" />
@@ -222,24 +249,6 @@
-
-
-
-
-
-
-
@@ -265,7 +274,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="@string/user_protocol2"
- android:textColor="#ffb1b1b1"
+ android:textColor="#FF000000"
android:textSize="10sp" />
+
+
+
+
+
@@ -294,7 +319,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_marginTop="80dp"
+ android:layout_marginTop="125dp"
android:src="@mipmap/white_logo" />