Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/announcement/adapter/AnnouncementAdapter.java

@@ -11,7 +11,10 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.databinding.ItemAnnouncementDetailBinding;
 import com.xingdata.zzdpos.model.Notice;
+import com.xingdata.zzdpos.util.StringUtil;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 public class AnnouncementAdapter extends BaseAdapter<Notice, ItemAnnouncementDetailBinding> {
@@ -25,7 +28,7 @@ public class AnnouncementAdapter extends BaseAdapter<Notice, ItemAnnouncementDet
 
     @Override
     protected void convert(ItemAnnouncementDetailBinding mViewBinding, Notice item) {
-        mViewBinding.date.setText(TimeUtils.millis2String(item.getCreateTime()));
+        mViewBinding.date.setText(TimeUtils.millis2String(item.getCreateTime(), new SimpleDateFormat(StringUtil.defaultDatePattern)));
         mViewBinding.title.setText(item.getNoticeTitle());
         mViewBinding.body.setText(item.getNoticeDesc());
 

app/src/main/res/drawable/selector_edit_frame_blue_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/all_transparent" android:state_enabled="false" />
+    <item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" />
+    <item android:drawable="@drawable/shape_white_round_rectangle_dark" />
+
+</selector>
\ No newline at end of file

app/src/main/res/layout/activity_feed_back.xml

@@ -5,7 +5,7 @@
 
         <variable
             name="textSize"
-            type="String"/>
+            type="String" />
 
 
     </data>
@@ -28,6 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/all_margin"
+            android:background="@drawable/selector_edit_frame_blue_background"
             android:gravity="top"
             android:hint="@string/feedBack_edit_hint"
             android:maxLength="101"
@@ -40,6 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/all_margin"
+            android:background="@drawable/selector_edit_frame_blue_background"
             android:gravity="top"
             android:hint="@string/feedBack_contactWay"
             android:maxLength="22"

app/src/main/res/layout/item_announcement_detail.xml

 <?xml version="1.0" encoding="utf-8"?>
 
-<layout >
+<layout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -22,37 +22,37 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:cardCornerRadius="@dimen/all_shape_radius"
+            android:layout_marginBottom="@dimen/all_padding"
             android:layout_marginLeft="@dimen/all_margin"
             android:layout_marginRight="@dimen/all_margin"
-            android:layout_marginBottom="@dimen/all_padding">
+            app:cardCornerRadius="@dimen/all_shape_radius">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:paddingBottom="@dimen/all_margin"
-             >
+                android:paddingBottom="@dimen/all_margin">
 
                 <TextView
                     android:id="@+id/title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/all_margin"
+                    android:layout_marginBottom="@dimen/all_padding"
                     android:layout_marginEnd="@dimen/all_padding"
                     android:layout_marginStart="@dimen/all_padding"
                     android:layout_marginTop="@dimen/all_margin"
-                    android:text="心灵受金华路：糖库心灵受的巅峰之路！"
+                    android:gravity="center"
+                    android:text=""
                     android:textColor="@color/black_baozheng"
-                    android:textStyle="bold" />
+                    android:textSize="@dimen/all_text_size" />
 
                 <TextView
                     android:id="@+id/body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingEnd="@dimen/dp_4"
-                    android:paddingStart="@dimen/dp_4"
-                    android:text="ask領導就阿喀琉斯大家阿厤克斯大家阿隆索死啦對啦開始覺得請問哦請假了受打擊啦看到解開了缺點青蛙禮金卡實力坑爹 啊就是了看到薔薇科額的擴大勢力的就喀什燈籠褲幾千萬大家拉薩大家李克强千萬快樂件大事多久啦空間的權威的來擴大是快樂的切阿德 啊時代科技千龍網的！" />
+                    android:paddingEnd="@dimen/all_padding"
+                    android:paddingStart="@dimen/all_padding"
+                    android:text="" />
             </LinearLayout>
 
         </android.support.v7.widget.CardView>