From 772eea285fcd66386b7f7548aa099d12e0f9bc96 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Fri, 23 Sep 2022 09:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../uiui/aios/fragment/SecondFragment.java | 14 +- app/src/main/res/drawable-hdpi/location.png | Bin 0 -> 3935 bytes app/src/main/res/drawable-hdpi/shafa.png | Bin 0 -> 2668 bytes app/src/main/res/drawable-hdpi/zan.png | Bin 0 -> 2191 bytes .../main/res/layout-land/fragment_second.xml | 147 ++++++++++++++---- .../main/res/layout-port/fragment_second.xml | 140 ++++++++++++++--- 7 files changed, 251 insertions(+), 54 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/location.png create mode 100644 app/src/main/res/drawable-hdpi/shafa.png create mode 100644 app/src/main/res/drawable-hdpi/zan.png 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 0000000000000000000000000000000000000000..293f0c99d0a01e0ece355d2d9e79d464b7b9306b GIT binary patch literal 3935 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..81f4eb096ff5ee84b461f7bc58ba546efeea3290 GIT binary patch literal 2668 zcmaJ@dpy&7A0Hu>Ih0BiGdUL7jZwqVvWvx}O_8F_Ha4^U*7kGlC??l*QqOYmB)4*@ zj-;a^y#loGOP*_L2lM{A59EZW;&=~dYWRGIVQ3U$W@S2S7l^2PAM0rV||L zFA#HqXxX|?csiXx6U#uhn8Txy+z@I8lt92GkSJtl3Kpjx9uzE=Od?_(NE^r)A`b7o z0gI=Qzu1xhPNaw@2EW*H|FL!WrtLy2h$L#yB%V|d#p6<>fC&C6WP;$^S}@<_`)teo zwib0H--rXP7K2_W?0*&d%aOW!7M5SzR=xS!_&l+?+okHZzSM2h2Z87e(MUwUn1M$p z_Ia-+n>0nw&i*uF>AUW9&*nqPNsE^A(?o)^4+f6$@$`7J`{5zsB`cue?TeF5=BJFR z_-A^@EKG$}G-m4_zg=b}5B$RmR--EvZ;()bgrsTk^*ej{V3vzG6nNb~{&U1^Kx2OX z-0ipO>(wH5X0jnPuexA{Vgi)Loy42}oMz3O*B#bTw zhBm2;ievv|QF>z^NJf7ru5cad++`PZId&n zJ#{;m8^%jBU5WDfLC#)dQ4u7m9@f})R9CrgSAlC!Q>T_R;wUeQAq*#5&<`$EUD5{%Od~9g0U5XU)oP!*)uG0qa+|} z4tIo?H=Vk)qpf-M*nacoO%2Y=XICruO@_O?u3r6%mN+cmo@O0&ZDya+hwQhrGIP2? z^ZL`~oAHhnn4|5ZmnLcr-pF^KY)){o@0u^crBt*#{uI2Uh@|_Ym-J!49)pT@LsTGg zyaf+GHId~RMC-_)1H7z+M)@H}Vuu3uI$+4-h2hw*avy`SbE+a)O!0}`dk9(+aE&Cs zxS(x3w=y70&{`f34E`l3FX5M%brtY~EI@P3{8rQa+l3d8RIe_bC`{k7W56^`lTawS z^{%bG@hx*~j$@i1Xs^)A|Bm>=EKhpFCYw89xDI+MIBluX{2)~)GPp!Gka}lTo)k$6 zf$DsSPR&vlOq*I{{VW7u|4}3}qi-~xkW@#VHj2C0t{qApo?$-N`#53b5S}0;mVs|3 zM?CCx!SJCNb2addv(cuUpk>yvzDKusW^IY2Soa3S6co$Ic04dD~&$x)_!n>8_`@@ZCAcZg8A zGOo$6b-a4wmDbt0OdH!!uI-=eo+Vo{kabPv$HLRmiGxU+-KZAt`jn2q`b10leMMcX zUPD#xVq3Q7z-A5YKX3k+{) z$&+c`tuv=`dS9OFFK6{wA5vt$iE$5ycCJ14a(kW6!#kC8&--05zg?uLO1;cqP?Q(i zpS%hzs+Cd$d3P7x+vo+k(??lr#i>v42<#A4?}r2i#WS_uXWkn+Xf>l`?^6N6g{%RU zNf1zWGk0>uW~BeV@`tRXsb!86Ghs$`!TC&&SV}<4?JUb{7HzZ_*8PFB+}!5Z@sU3;3Bu`#*1v~qnujz>3iOGxbt#@@`EGP z;U|>>pTlC42^3tk>~>eNhWpB8&yj&Ins3HkdHRbX#X)bYj96mEZgL4BG8)t$ul&0e zTZH7@sSj(HR$kDr+bTHNh|CJzXYSAF>MDu>M$hZbsR$H$q{U^aCno8&xy`pY~JyzOF0Q; zM*4{up*~bumLs2IuK@%N!|vxsMCL7~OZy5!@(hl_B~#Ot2eeHfcU9$?ZT0&{7ykcf LWFJ!HW|sUv5K?vW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e3554915c29736638058c59bc73bb4a0be95c9b9 GIT binary patch literal 2191 zcmaJ@d0Z1`8V)8Pgiy``Qo(V=fCstA0WoMH2gDHMh!O*K3CUn$OeV(&fr=Fn6s&R- zcjeIHfdv=QDiyI>0R=$;ttensTxB)5VwIL^1zmSy#qJ;L&TnSEdeef6z#z`2(i$_O+^|QA_{|3_iE$A={;Y*POI1R~=8zD@%5>ABxp;o>YiihON zOhY%s!CM)Sq(W=ex-jtR_vb)BtqcPb z8Dff9&xKU#s4OFtkQF0QWN8$kN^sdyfMaH(0$K=>17_`dor!G@1K;Yh(YbY-3<7T< zh$amDBPppk7U0502w;$cgA^1h6<{(+R62vnq%H<%6e^8OL0@JNmCj}`*)$gL?g7zg zMr9g1o+o%03tfeQDg@E9$>fZT3{plg2{x`JQ$s^Ttr|315Q+#gW$F;QIY?)kH?6>f zObVk~kEmfCU{#c-!W)n<5Y6e0wN$f!<-lma8H1>PQ+t^RN>)DP;t<0?O# z3+;nkGMWt8+SvbU^z;_$9_#eIZPCSh<3l>s?MBqr9EP?XgR#X5dEpZCPq(W@D)(^j zi@{amep%5>+m4y*_SF_&Js2>abKkM_KEDC@A+|g#p7*ctj!0KNj?Z_QxITIKZ&~iV z_2E36vrxNz>;9F0*T&VaYWOK~;7xhZ1%@^)Z7p-j>y!$I?oAahpS;NaHM^?Y?eg&% zet1Ju-=@P-_2gcsfeCxN3f!l}ZGAuNGOA_@JnV{fwI$KEc}z}vuOUiUu{m0tbI_ej z1i05WA9vzUnzwCVS@=64itT#RPf;W-oG|$0T1qxA1(i3?1mGBXW%z(Pd^Dxz91hB> zz{j3?m>Q^O`TCDkN88yZQ)|zj&F<^!>hd{gv*?-8Z)g7Vq^EksJz{U=p_g@M&YamA zcQ<)7$vIo3&2}7XKD|D>_v&EJ;VZ5sUxAr~MEXTsnv=8h9Bzi!&R2vvZ*oR#h!U?t z-teKRPm_{vftb+3pNX^ky(eyLjo5brb3I_*l?npElq~djyH#TWPX~vHCj%OPuTasm z+V&mwoZK0VNxzghx`dG39MU)IfzA1`i0A%&EfX)RzLlO{3zcV$z#Pxa@$gR6b#-bxAG0g@iz z&MSlLn@+f@?rM&eJI@8ksf4aK(jBFpJ81Zt>H+_A-EGp<3a5&$)ZGoXmq%wTKCs8< zMzrU(T=1an8qO-kGnr$}_0d&p6g^YsBL$xjlm`mtx60xu(Xq0mq(wiLud^o>*(&^; zXOk$~B3;GX1@1q4#M#-!*BJO=+r0=YfIaop-7h&dRV=Sr*S&k-;ZK+x&tKydlsPM9 z(dRl-CNqNy!kVfcE|R&b>>&>YocM5gU}s(E(gBwq)0eOFmM8A7-FQGJp*$oGn@+X; z^T7j#+EcR$E$*#LZ601;{ZmaA#tc(!L&Mm1BSrBD4sTmY{|jR?t)!}I5#pNP>f!16 z@0=U6e*{j>UbtYvOAbFWnOC8CD4A@H6>Mg%W+{(YmJ*o+jdd@77H}aYT9AiJTSS*R%xn({ZYo$(i z4$KG!f`&ho{wQ^Gth3v1Iy>-cLw zmyEH*EF=bAY8}!K59w+_p!iYRtD7tBzce-HP4xEq`uYZMEhyMqlSC9jF)@AXN{cFN zmK*o?Bu>8BG>TK{dCmOJvgi#9Hve+>c0TJP2V#zs>Lh;eCg;pc>G@O*J>f{X0wR_P%%9FMPH%`OWA^1@E_fW)tDZe|S)4rX|a z)cGxX;n0E|9KWCT{l_l1X-{WWFW$CGT}t)t)gBg>b@*(-mLF=TdvQ;;*JJX%dQPQ^ zxPa%=dIKZBMRyx`Cp*kCf%)U9ZTlms z^&5}v?1!4n$99@p7Xs?nfrq*Q+ZjHbGmnpAuo%XP6Oz`O^%Cn9LCBBcHAbZ5{s$6q BWgGwi literal 0 HcmV?d00001 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"> + + + + + + + + + + + + + + + + + + + + + +