Junqin Wang 8 years ago
parent
commit
eace238d9e

+ 7 - 1
app/res/layout/trade_list_fragment.xml

@@ -16,6 +16,12 @@
         android:layout_width="368dp"
         android:layout_height="551dp"
         tools:layout_editor_absoluteY="8dp"
-        tools:layout_editor_absoluteX="8dp" />
+        tools:layout_editor_absoluteX="8dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
 
 </RelativeLayout>

+ 96 - 4
app/res/layout/trade_list_item.xml

@@ -1,6 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp">
 
-</LinearLayout>
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.netease.nim.uikit.common.ui.imageview.HeadImageView
+            android:id="@+id/trade_list_item_avatar"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="16dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:src="@drawable/logo"
+            android:layout_marginStart="16dp" />
+
+        <ImageView
+            android:id="@+id/trade_list_item_follow_img"
+            android:layout_width="48dp"
+            android:layout_height="48dp" />
+        <TextView
+            android:id="@+id/trade_list_item_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="用户名"
+            app:layout_constraintLeft_toRightOf="@+id/trade_list_item_avatar"
+            android:layout_marginLeft="8dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="8dp" />
+
+        <TextView
+            android:id="@+id/trade_list_item_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="发布时间"
+            app:layout_constraintLeft_toLeftOf="@+id/trade_list_item_name"
+            app:layout_constraintTop_toBottomOf="@+id/trade_list_item_name" />
+
+        <TextView
+            android:id="@+id/trade_list_item_content"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="这里是交易内容详情这里是交易内容详情这里是交易内容详情这里是交易内容详情
+                        这里是交易内容详情这里是交易内容详情这里是交易内容详情这里是交易内容详情"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/trade_list_item_avatar"
+            app:layout_constraintHorizontal_bias="1.0" />
+
+        <com.sheishuo.app.common.views.ImgGridView
+            android:id="@+id/trade_list_item_imgs_gridview"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:numColumns="2"
+            app:layout_constraintLeft_toLeftOf="@+id/trade_list_item_content"
+            app:layout_constraintTop_toBottomOf="@+id/trade_list_item_content"
+            app:layout_constraintRight_toRightOf="@+id/trade_list_item_content"
+            app:layout_constraintHorizontal_bias="0.0" />
+
+        <TextView
+            android:id="@+id/trade_list_item_priority"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="置顶101"
+            android:background="@drawable/style_rounded_corner_editext"
+            android:padding="4dp"
+            android:layout_marginLeft="0dp"
+            app:layout_constraintLeft_toLeftOf="@+id/trade_list_item_imgs_gridview"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/trade_list_item_imgs_gridview" />
+        <TextView
+            android:id="@+id/trade_list_item_views"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="阅读103"
+            android:padding="4dp"
+            android:layout_marginRight="0dp"
+            app:layout_constraintRight_toRightOf="@+id/trade_list_item_imgs_gridview"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/trade_list_item_imgs_gridview" />
+    </android.support.constraint.ConstraintLayout>
+</android.support.v7.widget.CardView>

+ 1 - 0
app/res/values/strings.xml

@@ -5,6 +5,7 @@
     <string name="hello_world">Hello world!</string>
     <string name="empty"></string>
     <string name="main_tab_groups">群组</string>
+    <string name="main_tab_trade">交易帖</string>
     <string name="main_tab_circleoffriends">朋友圈</string>
     <string name="main_tab_session">会话</string>
     <string name="main_tab_contact">通讯录</string>

+ 1 - 1
app/src/com/sheishuo/app/core_module/trade/model/TradeModel.java

@@ -30,7 +30,7 @@ public class TradeModel {
         net = new NetImpl();
     }
 
-    public void getTradeList(int type,int page){
+    public void loadTradeList(int type,int page){
         final FormBody body = new FormBody.Builder()
                 .add("id", AccountCache.getAccount().getId())
                 .add("province", AccountCache.getAccount().getProvince())

+ 16 - 0
app/src/com/sheishuo/app/core_module/trade/presenter/TradePresenter.java

@@ -1,9 +1,25 @@
 package com.sheishuo.app.core_module.trade.presenter;
 
+import com.sheishuo.app.core_module.trade.model.TradeModel;
+import com.sheishuo.app.main.fragment.TradeListFragment;
+
 /**
  * Created by KN on 2017/7/31.
  */
 
 public class TradePresenter {
+    TradeListFragment fragment;
+    TradeModel model;
+
+    public TradePresenter(TradeListFragment fragment){
+        this.fragment = fragment;
+        model = new TradeModel(this);
+    }
+
+
+    public void loadTradeList(int type,int page){
+        model.loadTradeList(type,page);
+    }
+
 
 }

+ 6 - 1
app/src/com/sheishuo/app/main/fragment/TradeListFragment.java

@@ -1,14 +1,19 @@
 package com.sheishuo.app.main.fragment;
 
+import com.sheishuo.app.core_module.trade.presenter.TradePresenter;
+
 /**
  * Created by KN on 2017/7/31.
  */
 
 public class TradeListFragment extends MainTabFragment {
 
+    private String TAG = this.getClass().getSimpleName();
 
+    private TradePresenter presenter;
     @Override
     protected void onInit() {
-
+        presenter = new TradePresenter(this);
     }
+    
 }

+ 3 - 1
app/src/com/sheishuo/app/main/model/MainTab.java

@@ -3,6 +3,7 @@ package com.sheishuo.app.main.model;
 import com.sheishuo.app.main.fragment.AreaGroupsFragment;
 import com.sheishuo.app.main.fragment.CircleOfFriendsFragment;
 import com.sheishuo.app.main.fragment.SessionListFragment;
+import com.sheishuo.app.main.fragment.TradeListFragment;
 import com.sheishuo.app.main.reminder.ReminderId;
 import com.sheishuo.app.R;
 import com.sheishuo.app.main.fragment.ChatRoomListFragment;
@@ -12,7 +13,8 @@ import com.sheishuo.app.main.fragment.MainTabFragment;
 public enum MainTab {
     AREA_GROUPS(0,ReminderId.CONTACT, AreaGroupsFragment.class,R.string.main_tab_groups,R.layout.area_groups_list_fragment),
     RECENT_CONTACTS(1, ReminderId.SESSION, SessionListFragment.class, R.string.main_tab_session, R.layout.session_list),
-    CHAT_ROOM(2, ReminderId.INVALID, ChatRoomListFragment.class, R.string.chat_room, R.layout.chat_room_tab),
+//    CHAT_ROOM(2, ReminderId.INVALID, ChatRoomListFragment.class, R.string.chat_room, R.layout.chat_room_tab),
+    TRADE(2,ReminderId.INVALID, TradeListFragment.class,R.string.main_tab_trade,R.layout.trade_list_fragment),
     CIRCLE_OF_FRIENDS(3,ReminderId.INVALID, CircleOfFriendsFragment.class,R.string.main_tab_circleoffriends,R.layout.circle_of_friends_fragment),
     CONTACT(4, ReminderId.CONTACT, ContactListFragment.class, R.string.main_tab_contact, R.layout.contacts_list);
     public final int tabIndex;

+ 7 - 7
uikit/uikit.iml

@@ -59,13 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -73,6 +66,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />