diff --git a/app/build.gradle b/app/build.gradle index 5fde585..6de5362 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 29 - versionName "3.8" + versionCode 31 + versionName "4.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java b/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java index bc26541..733b16d 100644 --- a/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/SecondFragment.java @@ -19,6 +19,7 @@ import android.widget.TextView; import com.blankj.utilcode.util.NetworkUtils; import com.bumptech.glide.Glide; +import com.shehuan.niv.NiceImageView; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.FragmentEvent; import com.uiui.aios.R; @@ -113,6 +114,12 @@ public class SecondFragment extends BaseFragment implements NetworkUtils.OnNetwo @BindView(R.id.cl4) ConstraintLayout cl4; + @BindView(R.id.nv_pic) + NiceImageView nv_pic; + @BindView(R.id.tv_like) + TextView tv_like; + @BindView(R.id.tv_comment) + TextView tv_comment; private View rootView; private Context mContext; @@ -265,12 +272,15 @@ public class SecondFragment extends BaseFragment implements NetworkUtils.OnNetwo tv_title_a.setText(activity.getName()); tc_joined_num_a.setText(activity.getJoin_num() + "人参加"); tv_time_a.setText(getTime(activity.getAdd_time())); - tv_address_a.setText(activity.getAddress()); + tv_address_a.setText(activity.getLocation()); + Glide.with(nv_pic).load(activity.getFile()).centerCrop().into(nv_pic); + tv_like.setText(activity.getLike_count() + ""); + tv_comment.setText(activity.getComment_count() + ""); } private String getTime(long second) { long ms = second * 1000L; - SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm"); + SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日"); Date date = new Date(ms); String time = sdf.format(date); Log.e(TAG, "getTime: " + time); diff --git a/app/src/main/res/drawable-hdpi/location.png b/app/src/main/res/drawable-hdpi/location.png new file mode 100644 index 0000000..293f0c9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/location.png differ diff --git a/app/src/main/res/drawable-hdpi/shafa.png b/app/src/main/res/drawable-hdpi/shafa.png new file mode 100644 index 0000000..81f4eb0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/shafa.png differ diff --git a/app/src/main/res/drawable-hdpi/zan.png b/app/src/main/res/drawable-hdpi/zan.png new file mode 100644 index 0000000..e355491 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/zan.png differ diff --git a/app/src/main/res/layout-land/fragment_second.xml b/app/src/main/res/layout-land/fragment_second.xml index 1c6d8fb..fa04543 100644 --- a/app/src/main/res/layout-land/fragment_second.xml +++ b/app/src/main/res/layout-land/fragment_second.xml @@ -175,8 +175,8 @@ + android:layout_weight="1" + android:orientation="vertical"> + app:layout_constraintTop_toBottomOf="@+id/textView18"> @@ -341,10 +342,10 @@ android:maxLines="1" android:text="活动名称" android:textColor="@color/black" - android:textSize="22sp" + android:textSize="@dimen/sp_12" android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/iv_avatar_a" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/iv_avatar_a" /> @@ -366,38 +368,129 @@ android:maxLines="1" android:text="时间" android:textColor="@color/black" - android:textSize="20sp" + android:textSize="@dimen/sp_11" app:layout_constraintStart_toStartOf="@+id/tv_title_a" app:layout_constraintTop_toBottomOf="@+id/tv_title_a" /> - + android:layout_marginBottom="@dimen/dp_4" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="@+id/iv_avatar_a"> + + + + + + + + + + + + + + + + + + + + + + android:background="@drawable/custom_background" + android:visibility="gone"> + app:layout_constraintTop_toTopOf="@+id/tv_title_d" + app:layout_goneMarginStart="4dp" /> + app:layout_constraintTop_toBottomOf="@+id/textView18"> @@ -329,10 +330,10 @@ android:maxLines="1" android:text="活动名称" android:textColor="@color/black" - android:textSize="22sp" + android:textSize="@dimen/sp_12" android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/iv_avatar_a" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/iv_avatar_a" /> @@ -354,25 +356,117 @@ android:maxLines="1" android:text="时间" android:textColor="@color/black" - android:textSize="20sp" + android:textSize="@dimen/sp_11" app:layout_constraintStart_toStartOf="@+id/tv_title_a" app:layout_constraintTop_toBottomOf="@+id/tv_title_a" /> - + android:layout_marginBottom="@dimen/dp_4" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="@+id/iv_avatar_a"> + + + + + + + + + + + + + + + + + + + + + +