删除操作

app/src/main/java/com/miekir/eden/constant/ConstantString.java

@@ -12,7 +12,7 @@ public interface ConstantString {
     String COMMENT_NUM = "评论 %s";
     String GOOD_COMMENT = "%s%%";
     String MONEY_GAME = "¥%s";
-    String WELCOME_HELLO = "%s好，%s";
+    String WELCOME_HELLO = "%s好";
     /**
      * 支付宝收款9.9元
      */

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsAdapter.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
@@ -163,7 +164,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         }*/
 
         // 暂时不需要长按弹出操作
-        /*if (UserInfoManager.getInstance().isLogin() &&
+        if (UserInfoManager.getInstance().isLogin() &&
                 TextUtils.equals("[email protected]", UserInfoManager.getInstance().getBeiUser().email)) {
             View view = holder.getView(R.id.cv_goods);
             view.setOnLongClickListener(v -> {
@@ -172,7 +173,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
                 }
                 return false;
             });
-        }*/
+        }
     }
 
     private void setDefaultView(RoundedImageView aciv_goods) {

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsFragment.java

@@ -136,13 +136,13 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
     private void showAdminDialog(int position) {
         AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
                 .setMessage("选择操作")
-                .setNeutralButton("取消", (dialog, which) -> {
+                .setNegativeButton("取消", (dialog, which) -> {
                     dialog.dismiss();
                 })
-                .setPositiveButton("禁用", (DialogInterface dialog, int which) -> {
-                    dialog.dismiss();
-                })
-                .setNegativeButton("删除", (DialogInterface dialog, int which) -> {
+//                .setPositiveButton("禁用", (DialogInterface dialog, int which) -> {
+//                    dialog.dismiss();
+//                })
+                .setPositiveButton("删除", (DialogInterface dialog, int which) -> {
                     dialog.dismiss();
                     showDeleteDialog(position);
                 }).create();

app/src/main/java/com/miekir/eden/ui/home/search/SearchActivity.java

@@ -163,10 +163,10 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
 
         AlertDialog alertDialog = new AlertDialog.Builder(this)
                 .setMessage("选择操作")
-                .setNeutralButton("取消", (dialog, which) -> {
+                .setNegativeButton("取消", (dialog, which) -> {
                     dialog.dismiss();
                 })
-                .setNegativeButton("删除", (DialogInterface dialog, int which) -> {
+                .setPositiveButton("删除", (DialogInterface dialog, int which) -> {
                     dialog.dismiss();
                     showDeleteDialog(position);
                 }).create();

app/src/main/java/com/miekir/eden/ui/mine/MineActivity.java

@@ -53,7 +53,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     @Override
     public void initViews(Bundle savedInstanceState) {
         mUser = UserInfoManager.getInstance().getBeiUser();
-        setTitle(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), mUser.nickName));
+        setTitle(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod()));
         ViewTool.setOnClickListener(this, this,
                 new int[]{R.id.tv_my_fav, R.id.btn_exit_login, R.id.tv_add_photo, R.id.btn_set_vip});
 

app/src/main/java/com/miekir/eden/ui/mine/login/LoginActivity.java

@@ -22,8 +22,9 @@ import com.miekir.mvp.presenter.InjectPresenter;
  * @date 2020/6/18 16:48
  * Description: 登录界面
  */
-public class LoginActivity extends BaseBeiActivity implements View.OnClickListener, ILoginView {
-    //private TextInputEditText et_email;
+public class LoginActivity extends BaseBeiActivity implements View.OnClickListener, ILoginView, View.OnLongClickListener {
+    private View til_email;
+    private TextInputEditText et_email;
     private TextInputEditText et_password;
 
     @InjectPresenter
@@ -37,10 +38,12 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
     @Override
     public void initViews(Bundle savedInstanceState) {
         setTitle("伊甸园登录", false);
-        //et_email = findViewById(R.id.et_email);
+        til_email = findViewById(R.id.til_email);
+        et_email = findViewById(R.id.et_email);
         et_password = findViewById(R.id.et_password);
         ViewTool.setOnClickListener(this, this, new int[]{R.id.btn_login, R.id.tv_forget});
 
+        findViewById(R.id.ll_login).setOnLongClickListener(this);
         //BeiUser user = UserInfoManager.getInstance().getBeiUser();
         //if (user != null && !TextUtils.isEmpty(user.email)) {
         //    et_email.setText(user.email);
@@ -55,20 +58,23 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                 break;
 
             case R.id.btn_login:
-                //String email = et_email.getEditableText().toString();
-                String email = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
-                String password = et_password.getEditableText().toString();
-                if (TextUtils.isEmpty(email)) {
-                    ToastTool.showShort("暂不支持本手机");
-                    return;
+                String email = et_email.getEditableText().toString();
+                if (til_email.getVisibility() != View.VISIBLE) {
+                    email = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+                    email = StringTool.getEncodeString(email);
                 }
+                String password = et_password.getEditableText().toString();
                 if (TextUtils.isEmpty(password)) {
                     ToastTool.showShort("密码不能为空");
                     return;
                 }
+                if (TextUtils.isEmpty(email)) {
+                    ToastTool.showShort("暂不支持本手机");
+                    return;
+                }
+
 
                 password = StringTool.getEncodeString(password);
-                email = StringTool.getEncodeString(email);
                 if (TextUtils.isEmpty(email) || TextUtils.isEmpty(password)) {
                     ToastTool.showShort("该手机不支持加密算法");
                     return;
@@ -93,4 +99,12 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
             ToastTool.showShort(message);
         }
     }
+
+    @Override
+    public boolean onLongClick(View v) {
+        if (v.getId() == R.id.ll_login) {
+            til_email.setVisibility(View.VISIBLE);
+        }
+        return false;
+    }
 }

app/src/main/res/layout/activity_login.xml

@@ -6,13 +6,15 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:focusableInTouchMode="true"
+    android:id="@+id/ll_login">
     <!--启用深色模式之后，需要使用fitsSystemWindows来不让布局上滑-->
 
     <include layout="@layout/view_toolbar" />
     <!--阴影效果android:background="?android:attr/listDivider"-->
 
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/til_email"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_default"

app/src/main/res/layout/activity_mine.xml

@@ -10,18 +10,6 @@
 
     <include layout="@layout/view_toolbar"/>
 
-    <TextView
-        android:id="@+id/tv_my_fav"
-        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" />
 
     <!--管理员才能看到此界面-->
     <LinearLayout
@@ -111,6 +99,19 @@
         <include layout="@layout/view_divider_common" />
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/tv_my_fav"
+        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" />
+
     <View
         android:layout_width="wrap_content"
         android:layout_height="0dp"