账号流程

app/build.gradle

@@ -47,7 +47,7 @@ android {
 
         company {
             // 开发2
-            buildConfigField("String", "BASE_URL", '"http://10.16.0.184:8080/"')
+            buildConfigField("String", "BASE_URL", '"http://10.16.0.113:8080/"')
         }
     }
 

app/src/main/java/com/itant/shibei/base/ApiService.java

@@ -27,77 +27,77 @@ import retrofit2.http.Query;
 public interface ApiService {
 
     /**请求验证码*/
-    @GET("/shibei/api/code")
+    @GET("/eden/api/code")
     Observable<BaseResponse<Boolean>> getCode(@Query("email") String email);
 
     /**注册*/
     //@Headers({ "Content-Type: application/json;charset=UTF-8"})
-    @POST("/shibei/api/register")
+    @POST("/eden/api/register")
     Observable<BaseResponse<BeiUser>> submitRegister(@Body Map<String, Object> body);
 
     /**邮箱+加密的密码 登录*/
-    @POST("/shibei/api/login/normal")
+    @POST("/eden/api/login/normal")
     Observable<BaseResponse<BeiUser>> submitLogin(@Query("email") String email, @Query("password") String password);
 
     /**忘记密码*/
-    @POST("/shibei/api/password")
+    @POST("/eden/api/password")
     Observable<BaseResponse<BeiUser>> resetPassword(@Body Map<String, Object> body);
 
     /*----------------------------------------京东商品开始----------------------------------------*/
     /**新增京东商品*/
-    @POST("/shibei/api/addGoods")
+    @POST("/eden/api/addGoods")
     Observable<BaseResponse<String>> addGoods(@Body GoodsBean body);
 
     /**删除京东商品*/
-    @GET("/shibei/api/deleteGoodsById")
+    @GET("/eden/api/deleteGoodsById")
     Observable<BaseResponse<String>> deleteGoodsById(@Query("goodsId") long goodsId);
 
     /**分页查询京东商品*/
-    @GET("/shibei/api/getGoodsList")
+    @GET("/eden/api/getGoodsList")
     Observable<BaseResponse<List<GoodsBean>>> getGoodsList(@Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
     /**根据关键字分页查询京东商品*/
-    @GET("/shibei/api/getGoodsListByKeyword")
+    @GET("/eden/api/getGoodsListByKeyword")
     Observable<BaseResponse<List<GoodsBean>>> getGoodsListByKeyword(@Query("keywords") String keyword, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
     /**根据链接查询京东商品*/
-    //@GET("/shibei/api/getGoodsByUrl")
+    //@GET("/eden/api/getGoodsByUrl")
     //Observable<BaseResponse<GoodsBean>> getGoodsByUrl(@Query("url") String url, @Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
     /*----------------------------------------优惠券开始----------------------------------------*/
     /**新增优惠券*/
-    @POST("/shibei/api/addCoupon")
+    @POST("/eden/api/addCoupon")
     Observable<BaseResponse<String>> addCoupon(@Body CouponBean body);
 
     /**删除优惠券*/
-    @GET("/shibei/api/deleteCouponById")
+    @GET("/eden/api/deleteCouponById")
     Observable<BaseResponse<String>> deleteCouponById(@Query("couponId") long goodsId);
 
     /**分页查询优惠券*/
-    @GET("/shibei/api/getCouponList")
+    @GET("/eden/api/getCouponList")
     Observable<BaseResponse<List<CouponBean>>> getCouponList(@Query("pageNum") int pageNum, @Query("pageSize") int pageSize);
 
     /*----------------------------------------JSON开始----------------------------------------*/
     /**保存和更新JSON*/
-    @POST("/shibei/api/saveJson")
+    @POST("/eden/api/saveJson")
     Observable<BaseResponse<JsonBean>> saveJson(@Body JsonBean body);
 
     /**获取JSON bean*/
-    @GET("/shibei/api/getJsonBean")
+    @GET("/eden/api/getJsonBean")
     Observable<BaseResponse<JsonBean>> getJsonBean();
 
     /*----------------------------------------升级信息----------------------------------------*/
     /**获取版本更新信息*/
-    @GET("/shibei/api/getUpgradeInfo")
+    @GET("/eden/api/getUpgradeInfo")
     Observable<BaseResponse<UpgradeBean>> getUpgradeInfo();
 
     /*----------------------------------------系统配置信息----------------------------------------*/
     /**获取系统配置信息*/
-    @GET("/shibei/api/getSystemConfig")
+    @GET("/eden/api/getSystemConfig")
     Observable<BaseResponse<SystemBean>> getSystemConfig();
 
     /**设置是否VIP才能用API*/
-    @POST("/shibei/api/setApiConfig")
+    @POST("/eden/api/setApiConfig")
     Observable<BaseResponse<String>> setApiConfig(@Query("isApiVipOnly") boolean isApiVipOnly);
 
 

app/src/main/java/com/itant/shibei/ui/mine/login/LoginActivity.java

@@ -1,6 +1,5 @@
 package com.itant.shibei.ui.mine.login;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
@@ -15,14 +14,10 @@ import com.itant.shibei.base.BaseBeiActivity;
 import com.itant.shibei.bean.BeiUser;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.StringTool;
-import com.itant.shibei.ui.mine.forget.ForgetActivity;
-import com.itant.shibei.ui.mine.register.RegisterActivity;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.utils.ViewTool;
 import com.miekir.mvp.presenter.InjectPresenter;
 
-import rx_activity_result2.RxActivityResult;
-
 /**
  * @author Miekir
  * @date 2020/6/18 16:48
@@ -42,7 +37,7 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-        setTitle("使用电子邮箱登录", false);
+        setTitle("使用账号密码登录", false);
         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});
@@ -52,7 +47,7 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_done, menu);
         MenuItem item = menu.findItem(R.id.action_done);
-        item.setTitle("  注册账号  ");
+        item.setTitle("  忘记密码  ");
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -61,7 +56,8 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
         switch (item.getItemId()) {
             case R.id.action_done:
                 // 注册
-                Intent registerIntent = new Intent(this, RegisterActivity.class);
+                ToastTool.showShort("请联系管理员");
+                /*Intent registerIntent = new Intent(this, RegisterActivity.class);
                 RxActivityResult.on(this).startIntent(registerIntent)
                         .filter(result -> result.resultCode() == RESULT_OK)
                         .doOnNext(result -> {
@@ -70,7 +66,7 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                             //startActivity(new Intent(LoginActivity.this, MineActivity.class));
                             finish();
                         })
-                        .subscribe();
+                        .subscribe();*/
                 break;
             default:
                 break;
@@ -83,7 +79,7 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
         switch (v.getId()) {
             case R.id.tv_forget:
                 // 忘记密码
-                Intent forgetIntent = new Intent(this, ForgetActivity.class);
+                /*Intent forgetIntent = new Intent(this, ForgetActivity.class);
                 RxActivityResult.on(this).startIntent(forgetIntent)
                         .filter(result -> result.resultCode() == RESULT_OK)
                         .doOnNext(result -> {
@@ -91,14 +87,14 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                             //startActivity(new Intent(LoginActivity.this, MineActivity.class));
                             finish();
                         })
-                        .subscribe();
+                        .subscribe();*/
                 break;
 
             case R.id.btn_login:
                 String email = et_email.getEditableText().toString();
                 String password = et_password.getEditableText().toString();
                 if (TextUtils.isEmpty(email)) {
-                    ToastTool.showShort("邮箱不能为空");
+                    ToastTool.showShort("账号不能为空");
                     return;
                 }
                 if (TextUtils.isEmpty(password)) {

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

@@ -18,7 +18,7 @@
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:layout_marginTop="@dimen/margin_default"
-        android:hint="请输入邮箱"
+        android:hint="请输入账号"
         app:boxBackgroundMode="outline"
         app:boxCornerRadiusBottomEnd="4dp"
         app:boxCornerRadiusBottomStart="4dp"
@@ -75,19 +75,20 @@
         android:textStyle="bold"
         android:textSize="@dimen/text_s"
         android:background="?attr/selectableItemBackground"
-        android:layout_gravity="end"/>
+        android:layout_gravity="end"
+        android:visibility="gone"/>
 
     <android.widget.Button
         android:id="@+id/btn_login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="0dp"
-        android:layout_marginTop="@dimen/margin_message"
+        android:layout_marginTop="@dimen/size_image_s"
         android:layout_marginStart="@dimen/margin_default"
         android:layout_marginEnd="@dimen/margin_default"
         android:paddingTop="@dimen/padding_full_width"
         android:paddingBottom="@dimen/padding_full_width"
-        android:text="立即登录"
+        android:text="登录或注册"
         android:textColor="@color/white"
         android:textStyle="bold"
         android:background="@drawable/selector_btn"

network/build.gradle

@@ -40,7 +40,7 @@ android {
 
         company {
             // 开发2
-            buildConfigField("String", "BASE_URL", '"http://10.16.0.184:8080/"')
+            buildConfigField("String", "BASE_URL", '"http://10.16.0.113:8080/"')
         }
     }
 }