搜索之前

app/src/main/java/com/miekir/ym/ui/home/MainActivity.kt

@@ -1,19 +1,25 @@
 package com.miekir.ym.ui.home
 
+import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.Fragment
 import com.flyco.tablayout.listener.OnTabSelectListener
 import com.miekir.common.adapter.TabFragmentAdapter
+import com.miekir.common.utils.ViewTool
 import com.miekir.ym.R
 import com.miekir.ym.base.YangActivity
 import com.miekir.ym.listener.AppbarTranslateListener
 import com.miekir.ym.listener.ITopActionListener
+import com.miekir.ym.manager.UserInfoManager
 import com.miekir.ym.ui.home.coupon.CouponBean
 import com.miekir.ym.ui.home.coupon.CouponFragment
+import com.miekir.ym.ui.home.more.MineActivity
+import com.miekir.ym.ui.home.more.login.LoginActivity
 import kotlinx.android.synthetic.main.activity_main.*
 import java.util.*
 
-class MainActivity : YangActivity() {
+class MainActivity : YangActivity(), View.OnClickListener {
     override fun getLayoutId(): Int {
         return R.layout.activity_main
     }
@@ -50,5 +56,35 @@ class MainActivity : YangActivity() {
             rl_search_top, rl_search_top_shadow, rl_search
         )
         abl_main.addOnOffsetChangedListener(listener)
+
+        ViewTool.setOnClickListener(
+            this,
+            this,
+            intArrayOf(R.id.fl_search, R.id.fl_search_top, R.id.fl_more)
+        )
+    }
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.fl_more -> {
+                // 点击更多
+                if (UserInfoManager.getInstance().isLogin()) {
+                    startActivity(Intent(this, MineActivity::class.java))
+                } else {
+                    // 登录
+                    val intent = Intent(this, LoginActivity::class.java)
+                    startActivity(intent)
+                }
+            }
+
+            R.id.fl_search_top, R.id.fl_search -> {
+                // todo 点击搜索
+//                startActivity(Intent(this, SearchActivity::class.java))
+            }
+
+            else -> {
+
+            }
+        }
     }
 }

app/src/main/java/com/miekir/ym/ui/home/coupon/CouponFragment.java

@@ -1,24 +1,29 @@
 package com.miekir.ym.ui.home.coupon;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-
 import com.miekir.common.utils.ToastTool;
 import com.miekir.mvp.presenter.InjectPresenter;
 import com.miekir.mvp.view.BaseMvpFragment;
 import com.miekir.ym.R;
 import com.miekir.ym.listener.ITopActionListener;
 import com.miekir.ym.listener.OnRcvScrollListener;
+import com.miekir.ym.ui.home.more.add.AddCouponActivity;
 import com.miekir.ym.widget.NormalDividerItemDecoration;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import rx_activity_result2.RxActivityResult;
+
+import static android.app.Activity.RESULT_OK;
+
 /**
  * 模板Fragment
  */
@@ -109,21 +114,21 @@ public class CouponFragment extends BaseMvpFragment implements ICouponView<Coupo
                 .setMessage("选择操作")
                 .setPositiveButton("修改", (dialog, which) -> {
                     dialog.dismiss();
-//                    Intent modifyIntent = new Intent(getActivity(), AddCouponActivity.class);
-//                    modifyIntent.putExtra(AddCouponActivity.KEY_MODIFY_COUPON, couponBean);
-//                    RxActivityResult.on(getActivity())
-//                            .startIntent(modifyIntent)
-//                            .filter(result -> result.resultCode() == RESULT_OK)
-//                            .doOnNext(result -> {
-//                                // 修改商品成功之后刷新item
-//                                CouponBean modifiedBean = (CouponBean) result.data().getSerializableExtra(AddCouponActivity.KEY_MODIFY_COUPON);
-//                                if (modifiedBean == null) {
-//                                    return;
-//                                }
-//                                couponBean.updateData(modifiedBean);
-//                                mAdapter.notifyItemChanged(position);
-//                            })
-//                            .subscribe();
+                    Intent modifyIntent = new Intent(getActivity(), AddCouponActivity.class);
+                    modifyIntent.putExtra(AddCouponActivity.KEY_MODIFY_COUPON, couponBean);
+                    RxActivityResult.on(getActivity())
+                            .startIntent(modifyIntent)
+                            .filter(result -> result.resultCode() == RESULT_OK)
+                            .doOnNext(result -> {
+                                // 修改商品成功之后刷新item
+                                CouponBean modifiedBean = (CouponBean) result.data().getSerializableExtra(AddCouponActivity.KEY_MODIFY_COUPON);
+                                if (modifiedBean == null) {
+                                    return;
+                                }
+                                couponBean.updateData(modifiedBean);
+                                mAdapter.notifyItemChanged(position);
+                            })
+                            .subscribe();
                 })
                 .setNeutralButton("取消", (dialog, which) -> {
                     dialog.dismiss();