补齐第三方登录

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -91,6 +91,7 @@ import com.yunbao.common.manager.NoviceInstructorManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.GoogleUtils;
+import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.http.LiveHttpUtil;
@@ -121,10 +122,10 @@ import java.util.TimerTask;
 public class EntryActivity extends AppCompatActivity {
 
     //private VideoView video_view;
-    private ImageView btn_line, btn_twitter;
+    private ImageView btn_line, btn_twitter,btn_phone;
     private TextView btn_tip, btn_tip1, tv_customer;
     private TwitterLoginButton tt_login_button;
-    private LinearLayout btn_google, googleLayout,btn_phone;
+    private LinearLayout btn_google, googleLayout;
     public static Activity activity;
     private static String mLoginType = Constants.MOB_PHONE;//登录方式
     public String mPromoCode = "", UserID = "",agent_code = "";//推广码

main/src/main/res/layout/activity_entry.xml

@@ -35,7 +35,7 @@
             android:layout_marginBottom="21dp">
 
             <LinearLayout
-                android:visibility="gone"
+                android:visibility="visible"
                 android:id="@+id/lt_btn_facebook"
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
@@ -94,7 +94,8 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout
+        <!--<LinearLayout
+            android:visibility="gone"
             android:id="@+id/phonelayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -125,7 +126,7 @@
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
             </LinearLayout>
-        </LinearLayout>
+        </LinearLayout>-->
 
         <!--        <RelativeLayout-->
         <!--            android:layout_width="match_parent"-->
@@ -171,7 +172,6 @@
 
         <LinearLayout
             android:id="@+id/lt_login_other"
-            android:layout_marginTop="100dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="25dp"
@@ -194,6 +194,14 @@
                     android:src="@mipmap/login_phone"
                     android:visibility="gone" />
 
+                <ImageView
+                    android:id="@+id/btn_phone"
+                    android:layout_width="57dp"
+                    android:layout_height="57dp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:src="@mipmap/login_phone" />
+
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -221,12 +229,11 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:src="@mipmap/login_line"
-                    android:visibility="gone" />
+                    android:visibility="visible" />
 
                 <RelativeLayout
                     android:id="@+id/lt_lyout_twitter"
                     android:layout_width="57dp"
-                    android:visibility="gone"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
 
@@ -251,6 +258,24 @@
                     </LinearLayout>
                 </RelativeLayout>
 
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/lt_customer"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginTop="30dp"
+                android:gravity="center">
+
+                <TextView
+                    android:id="@+id/tv_customer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/customer_service2"
+                    android:textColor="#ffb1b1b1"
+                    android:textSize="11sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -259,14 +284,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:layout_marginBottom="40dp"
+                android:layout_marginBottom="22dp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="@string/next_step_is_consent"
-                    android:textColor="#FF999999"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
 
@@ -276,7 +301,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/user_protocol2"
-                    android:textColor="#FF000000"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
                 <TextView
@@ -284,7 +309,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/and"
-                    android:textColor="#FF999999"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
                 <TextView
@@ -293,28 +318,11 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/privacy_terms"
-                    android:textColor="#FF000000"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/lt_customer"
-                android:layout_marginBottom="20dp"
-                android:layout_width="match_parent"
-                android:visibility="gone"
-                android:layout_height="30dp"
-                android:gravity="center">
-
-                <TextView
-                    android:id="@+id/tv_customer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/customer_service2"
-                    android:textColor="#FF999999"
-                    android:textSize="11sp" />
-            </LinearLayout>
-
         </LinearLayout>
     </LinearLayout>