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 163630fed..669f3f522 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/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 = "";//推广码 diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml index f60997e6b..9323eff15 100644 --- a/main/src/main/res/layout/activity_entry.xml +++ b/main/src/main/res/layout/activity_entry.xml @@ -35,7 +35,7 @@ android:layout_marginBottom="21dp"> - - + --> @@ -171,7 +172,6 @@ + + + android:visibility="visible" /> @@ -251,6 +258,24 @@ + + + + + + + @@ -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" /> - - - - - diff --git a/main/src/main/res/mipmap-xxxhdpi/login_twitter.webp b/main/src/main/res/mipmap-xxxhdpi/login_twitter.webp index 9bad3eb6c..8f310a91f 100644 Binary files a/main/src/main/res/mipmap-xxxhdpi/login_twitter.webp and b/main/src/main/res/mipmap-xxxhdpi/login_twitter.webp differ