Browse Source

1.新增接口错误码2010 执行2008相同逻辑
2.修复首页岗位入口图标在个别低dpi手机上被遮挡的问题

zhangxinyu 5 years ago
parent
commit
925b66e54f

+ 2 - 2
app/build.gradle

@@ -24,8 +24,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
         multiDexKeepProguard file("multidexKeep.pro")//腾讯bugly的类放到主Dex
-        versionCode 339
-        versionName "3.3.9"
+        versionCode 340
+        versionName "3.4.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         flavorDimensions "versionCode"
         ndk {

+ 3 - 1
app/src/main/java/com/tongyu/luck/happywork/http/ApiCode.java

@@ -48,9 +48,11 @@ public class ApiCode {
         //简历不存在
         public static final int HTTP_NO_RESUME = 1015;
         //token失效
-        public static final int HTTP_TOKEN_FAILED=2008;
+        public static final int HTTP_TOKEN_FAILED = 2008;
         //存在多简历信息
         public static final int HTTP_DOUBLE_RESUME = 2009;
+        //用户未登录
+        public static final int HTTP_USER_UNLOGIN = 2010;
         //用户被注销或拉黑
         public static final int HTTP_USER_CANT_LOGIN = 4000;
 //        //AccessToken错误或已过期

+ 1 - 1
app/src/main/java/com/tongyu/luck/happywork/http/ApiObserver.java

@@ -96,7 +96,7 @@ public abstract class ApiObserver<T> implements Observer<ApiResultBean<T>> {
                 onSuccess(apiResultBean.getData());
             } else {
                 ApiException apiException = ApiException.handleException(new HttpResponseException(apiResultBean));
-                if(apiException.getErrorCode().equals(ApiCode.Response.HTTP_TOKEN_FAILED+"")){//token失效 弹窗提示 不报错
+                if(apiException.getErrorCode().equals(ApiCode.Response.HTTP_TOKEN_FAILED+"")||apiException.getErrorCode().equals(ApiCode.Response.HTTP_USER_UNLOGIN+"")){//token失效 弹窗提示 不报错
                     EventBus.getDefault().post(new BaseEvent(EventConstant.EVENT_TOKEN_FAILED));
                 }else{
                     onError(apiResultBean.getData(), apiException);

+ 2 - 2
app/src/main/java/com/tongyu/luck/happywork/http/exception/ApiException.java

@@ -100,11 +100,11 @@ public class ApiException extends IOException {
             ex.isNeedShowError = false;
         } else if (e.getErrorCode() == ApiCode.Response.HTTP_NO_RESUME) {//简历不存在需要填写简历
             ex.isNeedShowError = false;
-        }  else if (e.getErrorCode() == ApiCode.Response.HTTP_TOKEN_FAILED) {//token失效需要重新登录
+        } else if (e.getErrorCode() == ApiCode.Response.HTTP_TOKEN_FAILED || e.getErrorCode() == ApiCode.Response.HTTP_USER_UNLOGIN) {//token失效需要重新登录
             ex.isNeedShowError = false;
         } else if (e.getErrorCode() == ApiCode.Response.HTTP_DOUBLE_RESUME) {//存在多个简历需要删选
             ex.isNeedShowError = false;
-        } else if(e.getErrorCode() == ApiCode.Response.HTTP_USER_CANT_LOGIN){//用户已经注销或者拉黑不允许登录
+        } else if (e.getErrorCode() == ApiCode.Response.HTTP_USER_CANT_LOGIN) {//用户已经注销或者拉黑不允许登录
             ex.isNeedShowError = false;
         }
         return ex;

+ 0 - 14
app/src/main/res/layout/item_recycler_home_header.xml

@@ -106,10 +106,6 @@
             android:layout_marginBottom="10dp"
             android:orientation="horizontal">
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1px"
-                android:layout_weight="1" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -136,8 +132,6 @@
             <View
                 android:layout_width="0dp"
                 android:layout_height="1dp"
-                android:layout_marginLeft="22.5dp"
-                android:layout_marginRight="22.5dp"
                 android:layout_weight="1" />
 
             <LinearLayout
@@ -165,8 +159,6 @@
             <View
                 android:layout_width="0dp"
                 android:layout_height="1dp"
-                android:layout_marginLeft="22.5dp"
-                android:layout_marginRight="22.5dp"
                 android:layout_weight="1" />
 
             <LinearLayout
@@ -194,8 +186,6 @@
             <View
                 android:layout_width="0dp"
                 android:layout_height="1dp"
-                android:layout_marginLeft="22.5dp"
-                android:layout_marginRight="22.5dp"
                 android:layout_weight="1" />
 
             <LinearLayout
@@ -221,10 +211,6 @@
                     android:textSize="@dimen/px36_12sp" />
             </LinearLayout>
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1px"
-                android:layout_weight="1" />
         </LinearLayout>