詹子聪 hace 5 años
padre
commit
18fa51d1a5

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

@@ -74,6 +74,12 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/TextInputStyle"/>
+
+        <!--我的收藏-->
+        <activity android:name=".ui.home.more.favorite.MyFavActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/TextInputStyle"/>
     </application>
 
 </manifest>

+ 1 - 2
app/src/main/java/com/miekir/ym/ui/home/coupon/CouponAdapter.java

@@ -21,7 +21,6 @@ import com.miekir.ym.R;
 import com.miekir.ym.listener.ItemLongClickListener;
 import com.miekir.ym.manager.UserInfoManager;
 import com.miekir.ym.ui.home.coupon.detail.CouponDetailActivity;
-import com.miekir.ym.ui.home.more.add.AddCouponActivity;
 
 import java.util.List;
 
@@ -95,7 +94,7 @@ public class CouponAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder>
                     .filter(result -> result.resultCode() == RESULT_OK)
                     .doOnNext(result -> {
                         // 修改商品成功之后刷新item
-                        CouponBean modifiedBean = (CouponBean) result.data().getSerializableExtra(AddCouponActivity.KEY_MODIFY_COUPON);
+                        CouponBean modifiedBean = (CouponBean) result.data().getSerializableExtra(CouponDetailActivity.KEY_COUPON_DETAIL);
                         if (modifiedBean == null) {
                             return;
                         }

+ 1 - 5
app/src/main/java/com/miekir/ym/ui/home/coupon/detail/CouponDetailActivity.kt

@@ -116,7 +116,6 @@ class CouponDetailActivity : YangActivity(), IFavView {
         when (item.itemId) {
             R.id.action_done -> {
                 // 收藏或者取消收藏
-                showLoading()
                 favPresenter?.favGoods(mCouponBean!!.id)
             }
             else -> {
@@ -133,10 +132,7 @@ class CouponDetailActivity : YangActivity(), IFavView {
             } else {
                 item!!.title = "收藏"
             }
-            setResult(
-                RESULT_OK,
-                intent.putExtra(KEY_COUPON_DETAIL, mCouponBean)
-            )
+            setResult(RESULT_OK, intent.putExtra(KEY_COUPON_DETAIL, mCouponBean))
             ToastTool.showShort("操作成功")
         } else {
             ToastTool.showShort("操作失败")

+ 3 - 1
app/src/main/java/com/miekir/ym/ui/home/more/MineActivity.java

@@ -17,6 +17,7 @@ import com.miekir.ym.bean.BeiUser;
 import com.miekir.ym.manager.UserInfoManager;
 import com.miekir.ym.tool.TimeTool;
 import com.miekir.ym.ui.home.more.add.AddCouponActivity;
+import com.miekir.ym.ui.home.more.favorite.MyFavActivity;
 
 public class MineActivity extends YangActivity implements View.OnClickListener {
     private BeiUser mUser;
@@ -50,7 +51,8 @@ public class MineActivity extends YangActivity implements View.OnClickListener {
         switch (v.getId()) {
 
             case R.id.tv_my_fav:
-                // todo 我的收藏
+                // 我的收藏
+                startActivity(new Intent(this, MyFavActivity.class));
                 break;
 
             case R.id.tv_add_coupon:

+ 0 - 2
app/src/main/java/com/miekir/ym/ui/home/more/favorite/MyFavActivity.java

@@ -81,7 +81,6 @@ public class MyFavActivity extends YangActivity implements IMyFavView, ICouponVi
                 }
 
                 // 如果到底部了,而且不是正在加载状态,就变为正在加载状态,并及时去加载数据
-                showLoading();
                 mIsLoading = true;
                 myFavPresenter.getMyFavGoods(mCurrentPage, PAGE_SIZE);
             }
@@ -91,7 +90,6 @@ public class MyFavActivity extends YangActivity implements IMyFavView, ICouponVi
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        showLoading();
         mIsLoading = true;
         myFavPresenter.getMyFavGoods(mCurrentPage, PAGE_SIZE);
     }

+ 1 - 1
app/src/main/res/layout/item_coupon.xml

@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <include layout="@layout/view_divider" />
     <LinearLayout
         android:id="@+id/ll_coupon"
         android:layout_width="match_parent"
@@ -55,6 +54,7 @@
                 android:text="为表情包配字幕并下载制作的表情包"/>
         </LinearLayout>
     </LinearLayout>
+    <include layout="@layout/view_divider" />
 
 </LinearLayout>