詹子聪 5 лет назад
Родитель
Сommit
a978d8ad58

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

@@ -57,7 +57,7 @@
             android:theme="@style/TextInputStyle" />
 
         <activity
-            android:name=".ui.mine.coupon.AddCouponActivity"
+            android:name=".ui.mine.coupon.AddPhotoActivity"
             android:screenOrientation="portrait"
             android:theme="@style/TextInputStyle" />
 

+ 4 - 4
app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateFragment.java

@@ -11,7 +11,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.itant.shibei.R;
 import com.itant.shibei.base.ITopActionListener;
 import com.itant.shibei.ui.function.FunctionFragment;
-import com.itant.shibei.ui.mine.coupon.AddCouponActivity;
+import com.itant.shibei.ui.mine.coupon.AddPhotoActivity;
 import com.itant.shibei.widget.bottomlistener.OnRcvScrollListener;
 import com.itant.shibei.widget.decoration.NormalDividerItemDecoration;
 import com.miekir.common.utils.ToastTool;
@@ -126,14 +126,14 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
                 .setMessage("选择操作")
                 .setPositiveButton("修改", (dialog, which) -> {
                     dialog.dismiss();
-                    Intent modifyIntent = new Intent(getActivity(), AddCouponActivity.class);
-                    modifyIntent.putExtra(AddCouponActivity.KEY_MODIFY_COUPON, couponBean);
+                    Intent modifyIntent = new Intent(getActivity(), AddPhotoActivity.class);
+                    modifyIntent.putExtra(AddPhotoActivity.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);
+                                CouponBean modifiedBean = (CouponBean) result.data().getSerializableExtra(AddPhotoActivity.KEY_MODIFY_COUPON);
                                 if (modifiedBean == null) {
                                     return;
                                 }

+ 6 - 4
app/src/main/java/com/itant/shibei/ui/home/goods/GoodsBean.java

@@ -4,8 +4,6 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- *
- *
  * @author Miekir
  * @date 2020/7/5 21:50
  * Description: 商品实体
@@ -34,10 +32,14 @@ public class GoodsBean implements Serializable {
      */
     public String description;
 
-    /**主演*/
+    /**
+     * 主演
+     */
     public String actors;
 
-    /**时长(分钟),-1表示未知*/
+    /**
+     * 时长(分钟),-1表示未知
+     */
     public int timeLong = -1;
 
     /**

+ 8 - 2
app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java

@@ -2,6 +2,7 @@ package com.itant.shibei.ui.mine;
 
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -22,6 +23,7 @@ import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.tool.TimeTool;
 import com.itant.shibei.ui.home.tool.ISystemView;
 import com.itant.shibei.ui.home.tool.SystemPresenter;
+import com.itant.shibei.ui.mine.coupon.AddPhotoActivity;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.utils.ViewTool;
 import com.miekir.mvp.presenter.InjectPresenter;
@@ -49,7 +51,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
         mUser = UserInfoManager.getInstance().getBeiUser();
         setTitle(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), mUser.nickName));
         ViewTool.setOnClickListener(this, this,
-                new int[]{R.id.ll_favorite, R.id.btn_exit_login, R.id.tv_deal_cash});
+                new int[]{R.id.ll_favorite, R.id.btn_exit_login, R.id.tv_add_photo, R.id.tv_deal_vip});
 
         // 只有我才能管理后台
         View ll_admin = findViewById(R.id.ll_admin);
@@ -86,10 +88,14 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
                 // todo 我的收藏条数
                 break;
 
-            case R.id.tv_deal_cash:
+            case R.id.tv_deal_vip:
                 // todo 设置会员VIP
                 break;
 
+            case R.id.tv_add_photo:
+                startActivity(new Intent(this, AddPhotoActivity.class));
+                break;
+
             case R.id.btn_exit_login:
                 sureToExit();
                 break;

+ 2 - 2
app/src/main/java/com/itant/shibei/ui/mine/coupon/AddCouponActivity.java

@@ -19,7 +19,7 @@ import com.miekir.mvp.presenter.InjectPresenter;
  * @date 2020/6/18 16:48
  * Description: 添加优惠券界面
  */
-public class AddCouponActivity extends BaseBeiActivity implements View.OnClickListener, IAddCouponView {
+public class AddPhotoActivity extends BaseBeiActivity implements View.OnClickListener, IAddPhotoView {
     public static final String KEY_MODIFY_COUPON = "key_modify_coupon";
 
     private TextInputEditText et_coupon_title;
@@ -31,7 +31,7 @@ public class AddCouponActivity extends BaseBeiActivity implements View.OnClickLi
     private CouponBean couponBean;
 
     @InjectPresenter
-    AddCouponPresenter presenter;
+    AddPhotoPresenter presenter;
 
     @Override
     public int getLayoutID() {

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/mine/coupon/AddCouponPresenter.java

@@ -16,7 +16,7 @@ import io.reactivex.schedulers.Schedulers;
  * @date 2020/7/9 20:54
  * Description: 商品的相关数据接口处理
  */
-public class AddCouponPresenter extends BasePresenter<IAddCouponView> {
+public class AddPhotoPresenter extends BasePresenter<IAddPhotoView> {
 
     public void addCoupon(CouponBean couponBean) {
         RetrofitHelper.getInstance()

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/mine/coupon/IAddCouponView.java

@@ -8,7 +8,7 @@ import com.miekir.mvp.view.IView;
  * @author Miekir
  * @date 2020/8/2 10:29
  */
-public interface IAddCouponView extends IView {
+public interface IAddPhotoView extends IView {
     /**
      * 增加优惠券的结果
      * @param success

+ 15 - 3
app/src/main/res/layout/activity_mine.xml

@@ -68,16 +68,28 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <!--处理提现-->
         <TextView
-            android:id="@+id/tv_deal_cash"
+            android:id="@+id/tv_deal_vip"
             android:layout_width="match_parent"
             android:layout_height="@dimen/height_tab_bar"
             android:background="?attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:paddingStart="@dimen/activity_horizontal_margin"
             android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:text="处理提现工单"
+            android:text="让用户成为VIP"
+            android:textColor="@color/black_text" />
+
+        <include layout="@layout/view_divider_common"/>
+
+        <TextView
+            android:id="@+id/tv_add_photo"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/height_tab_bar"
+            android:background="?attr/selectableItemBackground"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/activity_horizontal_margin"
+            android:paddingEnd="@dimen/activity_horizontal_margin"
+            android:text="增加图片"
             android:textColor="@color/black_text" />
 
         <include layout="@layout/view_divider_common"/>