咸光金 4 лет назад
Родитель
Сommit
0be995309e

+ 1 - 0
app/src/main/AndroidManifest.xml

@@ -95,6 +95,7 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:taskAffinity="com.quansu.heifengwuliu" />
+        <activity android:name=".activity.MsgActivity" />
 
     </application >
 

+ 29 - 0
app/src/main/java/com/quansu/heifengwuliu/activity/MsgActivity.kt

@@ -0,0 +1,29 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.adapter.MsgAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityMsgBinding
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+class MsgActivity : MBRActivity<BRViewModel<BRRepository>, MsgAdapter, ActivityMsgBinding>() {
+    override fun binding(): ActivityMsgBinding {
+        return ActivityMsgBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): MsgAdapter {
+        return MsgAdapter()
+    }
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.taskList("", vm?.repository()?.autoPage()!!)
+    }
+
+    override fun title(): String? {
+        return getString(R.string.msg)
+    }
+}

+ 0 - 18
app/src/main/java/com/quansu/heifengwuliu/activity/TodosActivity.kt

@@ -10,24 +10,6 @@ import com.ysnows.base.net.IResponse
 import io.reactivex.Observable
 
 class TodosActivity : MBRActivity<TodoListVModel, TodosAdapter, ActivityTodosBinding>() {
-    //    @Override
-    //    public void onItemDragEnd(RecyclerView.ViewHolder viewHolder, int pos) {
-    //
-    //        int size = getAdapter().getData().size();
-    //        for (int i = 0; i < size; i++) {
-    ////            Todo item = getAdapter().getData().get(i);
-    //
-    ////            HashMap<String, Object> params = new HashMap<>();
-    ////            params.put("order", size - i);
-    //
-    ////            vm.repository().lreq(NetEngine.getService().taskSave(item.id, params), new OnRes<String>() {
-    ////                @Override
-    ////                public void onCall(IResponse<String> res) {
-    ////
-    ////                }
-    ////            });
-    //        }
-    //    }
     override fun title(): String {
         return getStr(R.string.todo_list)!!
     }

+ 13 - 0
app/src/main/java/com/quansu/heifengwuliu/adapter/MsgAdapter.kt

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemMsgBinding
+import com.quansu.heifengwuliu.model.Msg
+import com.ysnows.base.base.BAdapter
+
+class MsgAdapter : BAdapter<Msg, BaseDataBindingHolder<ItemMsgBinding>>(R.layout.item_msg) {
+    override fun convert(holder: BaseDataBindingHolder<ItemMsgBinding>, item: Msg) {
+        holder.dataBinding?.item = item
+    }
+}

+ 14 - 1
app/src/main/java/com/quansu/heifengwuliu/base/MBRActivity.kt

@@ -3,7 +3,7 @@ package com.quansu.heifengwuliu.base
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRActivity
@@ -27,4 +27,17 @@ abstract class MBRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
     override fun user(): IUser? {
         return User.get()
     }
+
+    override fun bgColor(): Int {
+        return R.color.white
+    }
+
+    override fun titleColor(): Int {
+        return R.color.black
+    }
+
+    override fun backDrawable(): Int {
+        return R.drawable.ic_back_black
+    }
+
 }

+ 2 - 1
app/src/main/java/com/quansu/heifengwuliu/base/MBRFragment.kt

@@ -3,7 +3,6 @@ package com.quansu.heifengwuliu.base
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.quansu.heifengwuliu.activity.LoginActivity
 import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRFragment
@@ -29,4 +28,6 @@ abstract class MBRFragment<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
     override fun user(): IUser? {
         return User.get()
     }
+
+
 }

+ 0 - 1
app/src/main/java/com/quansu/heifengwuliu/fragment/MineFragment.kt

@@ -14,7 +14,6 @@ import com.ysnows.base.base.BRepository
  */
 class MineFragment : MBFragment<MineVModel, FragmentMineBinding>() {
 
-
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentMineBinding {
         return FragmentMineBinding.inflate(layoutInflater)
     }

+ 12 - 0
app/src/main/java/com/quansu/heifengwuliu/model/Msg.kt

@@ -0,0 +1,12 @@
+package com.quansu.heifengwuliu.model
+
+
+data class Msg(
+        val title: String?,
+        val content: String?,
+        val create_time: String?,
+        val checked: Int?
+) {
+
+
+}

+ 5 - 0
app/src/main/java/com/quansu/heifengwuliu/vmodel/MineVModel.kt

@@ -1,6 +1,7 @@
 package com.quansu.heifengwuliu.vmodel
 
 import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.activity.MsgActivity
 import com.quansu.heifengwuliu.activity.SettingsActivity
 import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.repository.MineRepository
@@ -18,6 +19,10 @@ open class MineVModel : BViewModel<MineRepository>() {
         single(SettingsActivity::class.java)
     }
 
+    fun goMsg() {
+        single(MsgActivity::class.java)
+    }
+
     override fun firstReq() {
         super.firstReq()
         repository().getUserInfo()

BIN
app/src/main/res/drawable-xxhdpi/ic_msg.webp


BIN
app/src/main/res/drawable/ic_msg.png


+ 30 - 0
app/src/main/res/layout/activity_msg.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_msg" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+    </LinearLayout >
+
+</layout >

+ 3 - 1
app/src/main/res/layout/fragment_mine.xml

@@ -49,7 +49,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:layout_marginEnd="@dimen/dp_10"
-                        android:src="@drawable/ic_to_wxchat" />
+                        android:onClick="@{v->vm.goMsg()}"
+                        android:padding="@dimen/dp_2"
+                        android:src="@drawable/ic_msg" />
 
                 </RelativeLayout >
 

+ 78 - 0
app/src/main/res/layout/item_msg.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.Msg" />
+
+    </data >
+
+    <RelativeLayout
+        android:id="@+id/rl_todo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_10" >
+
+        <ImageView
+            android:id="@+id/img_icon"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_13"
+            android:src="@{item.checked==0?@drawable/uncomplete:@drawable/complete}"
+            tools:src="@mipmap/ic_launcher" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/dp_8"
+            android:layout_toEndOf="@id/img_icon"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@{item.title}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                android:textSize="@dimen/sp_16"
+                tools:text="@string/app_name" />
+
+            <TextView
+                android:id="@+id/tv_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_2"
+                android:text="@{item.create_time}"
+                android:textColor="@{item.checked==1?@color/text_hint:@color/text_black}"
+                tools:text="@string/app_name" />
+
+        </LinearLayout >
+
+        <ImageView
+            android:id="@+id/img_sort"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/dp_14"
+            android:src="@drawable/ic_sort" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@color/llGray" />
+    </RelativeLayout >
+</layout >

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

@@ -413,5 +413,6 @@ Api 已达到使用限制
     <string name="my_account" >我的账户</string >
     <string name="my_collection" >我的收藏</string >
     <string name="connect_service" >联系客服</string >
+    <string name="msg" >消息</string >
 
 </resources >