xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MM内地版本

Browse Source
This commit is contained in:
guozhen
2024-12-05 17:25:35 +08:00
committed by xuhuixiang
parent 27639db559
commit e1b17dbbd3
62 changed files with 2283 additions and 1904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/layout/activity_main.xml
View File

@@ -50,6 +50,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"
android:onClick="tabClick">
<TextView
@@ -119,7 +120,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:onClick="tabClick"
android:visibility="visible">
android:visibility="gone">
<TextView
android:id="@+id/live"

3
app/src/main/res/layout/activity_phone_login.xml
View File

@@ -57,9 +57,8 @@
android:id="@+id/area_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50"
android:drawableRight="@mipmap/select_county_img"
android:gravity="center_vertical"
android:text="+886"
android:text="+86"
android:textColor="@color/color_333333"
android:textSize="18sp" />

3
app/src/main/res/layout/activity_register.xml
View File

@@ -60,9 +60,8 @@
android:id="@+id/area_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50"
android:drawableRight="@mipmap/select_county_img"
android:gravity="center_vertical"
android:text="+886"
android:text="+86"
android:textColor="@color/color_333333"
android:textSize="18sp" />

64
app/src/main/res/layout/activity_welcome.xml
View File

@@ -3,64 +3,76 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/big_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/big_bg"
tools:context=".welcome.WelcomeActivity">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:layout_weight="3">
android:layout_weight="3"
android:gravity="center_horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/app_yunxin_icon"
android:layout_width="119.7dp"
android:layout_height="164.7dp"
android:src="@drawable/kefu_loading1"
android:layout_centerHorizontal="true"
android:scaleType="fitXY"
android:layout_marginTop="@dimen/dp_200"
android:visibility="visible"
/>
android:scaleType="fitXY"
android:src="@drawable/kefu_loading1"
android:visibility="gone" />
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottieView"
android:layout_width="119.7dp"
android:layout_height="119.7dp"
app:lottie_autoPlay="true"
app:lottie_loop="true"
app:lottie_rawRes="@raw/loading"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_200"
android:scaleType="fitXY" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/bottom_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="6"
android:paddingBottom="@dimen/dp_64"
android:layout_weight="6"
android:gravity="bottom"
android:visibility="invisible"
android:id="@+id/bottom_ly"
android:orientation="vertical">
android:orientation="vertical"
android:paddingBottom="@dimen/dp_64"
android:visibility="invisible">
<androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@mipmap/start_login1"
android:text="@string/login_txt"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:gravity="center"
android:id="@+id/login_bt"
android:textColor="@color/color_white"
android:textSize="16sp"
/>
<androidx.appcompat.widget.AppCompatButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reg_txt"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="@mipmap/start_login1"
android:gravity="center"
android:text="@string/login_txt"
android:textColor="@color/color_white"
android:textSize="16sp" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/reg_bt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_20"
android:background="@mipmap/start_reg1"
android:gravity="center"
android:text="@string/reg_txt"
android:textColor="@color/white"
android:textSize="16sp"
/>
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>

77
app/src/main/res/layout/fragment_chat.xml
View File

@@ -37,10 +37,46 @@
android:text="@string/chat_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_20"
android:visibility="invisible"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/sss" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_8"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sss">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indexfm_notifytop"
android:layout_width="@dimen/dp_40"
android:layout_height="wrap_content"
android:src="@mipmap/index_tongzhi_img"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/view_chatfm_notifypoint"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:background="@drawable/point_chat_ff4e54"
android:gravity="center"
android:minWidth="@dimen/dp_16"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chatfm_setting"
android:layout_width="wrap_content"
@@ -115,10 +151,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_88"
android:paddingRight="@dimen/dp_15"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -137,15 +173,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:orientation="horizontal"
android:background="@android:color/white"
android:gravity="bottom"
android:background="@android:color/white">
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_chatfm_all"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="chatClick"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="parent">
@@ -185,15 +221,18 @@
app:layout_constraintRight_toRightOf="@+id/tv_chatfm_all"
app:layout_constraintTop_toBottomOf="@+id/tv_chatfm_all" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View android:layout_width="1dp"
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_16"
android:background="#EDE3E3"/>
android:background="#EDE3E3" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_chatfm_friends"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="chatClick"
app:layout_constraintLeft_toRightOf="@+id/layout_chatfm_all"
app:layout_constraintTop_toTopOf="@+id/layout_chatfm_all">
@@ -233,15 +272,18 @@
app:layout_constraintRight_toRightOf="@+id/tv_chatfm_friends"
app:layout_constraintTop_toBottomOf="@+id/tv_chatfm_friends" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View android:layout_width="1dp"
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_16"
android:background="#EDE3E3"/>
android:background="#EDE3E3" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_chatfm_group"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="chatClick"
app:layout_constraintLeft_toRightOf="@+id/layout_chatfm_friends"
app:layout_constraintTop_toTopOf="@+id/layout_chatfm_all">
@@ -282,15 +324,17 @@
app:layout_constraintTop_toBottomOf="@+id/tv_chatfm_group" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View android:layout_width="1dp"
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_16"
android:background="#EDE3E3"/>
android:background="#EDE3E3" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_chatfm_follow"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="chatClick"
app:layout_constraintLeft_toRightOf="@+id/layout_chatfm_group"
app:layout_constraintTop_toTopOf="@+id/layout_chatfm_all">
@@ -331,10 +375,11 @@
app:layout_constraintTop_toBottomOf="@+id/tv_chatfm_follow" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="#EDE3E3"/>
android:background="#EDE3E3" />
<TextView
android:id="@+id/errorTv"

4
app/src/main/res/layout/fragment_mine_new.xml
View File

@@ -28,7 +28,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@mipmap/user_info_bg1"
app:layout_constraintDimensionRatio="375:175"
app:layout_constraintDimensionRatio="375:146"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -179,6 +179,7 @@
app:layout_constraintDimensionRatio="375:210"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
@@ -188,6 +189,7 @@
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/index_user_bg"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="348:70"
app:layout_constraintLeft_toLeftOf="parent"