Selaa lähdekoodia

1.职位列表 职位详情 薪资加粗
2.拼工详情 薪资字体调整
3.状态栏 逻辑优化 解耦

zhangxinyu 5 vuotta sitten
vanhempi
commit
cb72b8a0e6

+ 10 - 0
app/src/main/java/com/tongyu/luck/happywork/ui/activity/WebViewActivity.java

@@ -142,6 +142,16 @@ public class WebViewActivity extends BaseActivity {
     }
 
     @Override
+    public boolean isShowStatusTitle() {
+        return false;
+    }
+
+    @Override
+    public boolean isShowPrimordialStatus() {
+        return true;
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
     }

+ 11 - 1
app/src/main/java/com/tongyu/luck/happywork/ui/base/BaseActivity.java

@@ -42,7 +42,7 @@ public abstract class BaseActivity<P extends IPresenter> extends RxAppCompatActi
         mBaseHolder.initActivityContent(getLayoutId());
         setContentView(mBaseHolder.getView());
         //actionbar 后执行
-        mBaseHolder.initActionBar(isShowStatusTitle(), isShowActionBar());
+        mBaseHolder.initActionBar(isShowPrimordialStatus(), isShowStatusTitle(), isShowActionBar());
     }
 
     /**
@@ -93,6 +93,15 @@ public abstract class BaseActivity<P extends IPresenter> extends RxAppCompatActi
     }
 
     /**
+     * 是否显示原生状态栏
+     *
+     * @return
+     */
+    public boolean isShowPrimordialStatus() {
+        return false;
+    }
+
+    /**
      * 是否显示沉浸式
      *
      * @return
@@ -101,6 +110,7 @@ public abstract class BaseActivity<P extends IPresenter> extends RxAppCompatActi
         return false;
     }
 
+
     /**
      * 设置标题
      *

+ 10 - 14
app/src/main/java/com/tongyu/luck/happywork/ui/base/BaseActivityHolder.java

@@ -98,12 +98,13 @@ public class BaseActivityHolder extends BaseViewHolder {
     /**
      * 设置标题和状态栏
      *
-     * @param isShowStatus
-     * @param isShowActionBar
+     * @param isShowPrimordialStatus 是否显示原生状态栏
+     * @param isShowStatus           是否显示状态栏
+     * @param isShowActionBar        是否显示actionbar
      */
-    public void initActionBar(boolean isShowStatus, boolean isShowActionBar) {
+    public void initActionBar(boolean isShowPrimordialStatus, boolean isShowStatus, boolean isShowActionBar) {
+        ActionBarUtils.initStatus(mContext, isShowPrimordialStatus, false, true);
         if (isImmersion) {
-            ActionBarUtils.initStatus(mContext, false, false, true);
             //设置沉浸式头部高度
             RelativeLayout.LayoutParams p = (RelativeLayout.LayoutParams) llImmersionTitle.getLayoutParams();
             ViewGroup.LayoutParams params = vImmersionPadding.getLayoutParams();
@@ -120,25 +121,20 @@ public class BaseActivityHolder extends BaseViewHolder {
             loadPaddingLayoutParams.height = PxUtils.getStatusTitleHeight(mContext) + mContext.getResources().getDimensionPixelSize(R.dimen.title_height);
             vLoadPadding.setLayoutParams(errorPaddingLayoutParams);
         } else {
-            ActionBarUtils.initStatus(mContext, isShowStatus, false, true);
             //设置头部高度
             RelativeLayout.LayoutParams p = (RelativeLayout.LayoutParams) llBaseTitle.getLayoutParams();
-//            ViewGroup.LayoutParams params = vPadding.getLayoutParams();
-//            params.height = isShowStatus ? PxUtils.getStatusTitleHeight(mContext) : 0;
-//            params.height = 0;
-//            p.height = isShowActionBar ? params.height + mContext.getResources().getDimensionPixelSize(R.dimen.title_height) : params.height;
-            p.height = isShowActionBar ? mContext.getResources().getDimensionPixelSize(R.dimen.title_height) : 0;
+            ViewGroup.LayoutParams params = vPadding.getLayoutParams();
+            params.height = isShowStatus ? PxUtils.getStatusTitleHeight(mContext) : 0;
+            p.height = isShowActionBar ? params.height + mContext.getResources().getDimensionPixelSize(R.dimen.title_height) : params.height;
             llBaseTitle.setLayoutParams(p);
             llBaseTitle.setVisibility(View.VISIBLE);
             llImmersionTitle.setVisibility(View.GONE);
             //设置错误界面和loading界面头部padding
             LinearLayout.LayoutParams errorPaddingLayoutParams = (LinearLayout.LayoutParams) vErrorPadding.getLayoutParams();
-//            errorPaddingLayoutParams.height = PxUtils.getStatusTitleHeight(mContext) + mContext.getResources().getDimensionPixelSize(R.dimen.title_height) - p.height;
-            errorPaddingLayoutParams.height = mContext.getResources().getDimensionPixelSize(R.dimen.title_height) - p.height;
+            errorPaddingLayoutParams.height = PxUtils.getStatusTitleHeight(mContext) + mContext.getResources().getDimensionPixelSize(R.dimen.title_height) - p.height;
             vErrorPadding.setLayoutParams(errorPaddingLayoutParams);
             LinearLayout.LayoutParams loadPaddingLayoutParams = (LinearLayout.LayoutParams) vLoadPadding.getLayoutParams();
-//            loadPaddingLayoutParams.height = PxUtils.getStatusTitleHeight(mContext) + mContext.getResources().getDimensionPixelSize(R.dimen.title_height) - p.height;
-            loadPaddingLayoutParams.height = mContext.getResources().getDimensionPixelSize(R.dimen.title_height) - p.height;
+            loadPaddingLayoutParams.height = PxUtils.getStatusTitleHeight(mContext) + mContext.getResources().getDimensionPixelSize(R.dimen.title_height) - p.height;
             vLoadPadding.setLayoutParams(errorPaddingLayoutParams);
         }
     }

+ 2 - 1
app/src/main/res/layout/activity_assemble_job_detail.xml

@@ -50,9 +50,10 @@
                         android:id="@+id/tv_job_price"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textStyle="bold"
                         android:gravity="right"
                         android:textColor="@color/text_red_FF40"
-                        android:textSize="@dimen/px60_20sp" />
+                        android:textSize="@dimen/px45_15sp" />
                 </LinearLayout>
 
                 <LinearLayout

+ 2 - 1
app/src/main/res/layout/activity_full_job_detail.xml

@@ -51,7 +51,8 @@
                         android:layout_height="wrap_content"
                         android:gravity="right"
                         android:textColor="@color/text_red_FF40"
-                        android:textSize="@dimen/px45_15sp" />
+                        android:textSize="@dimen/px45_15sp"
+                        android:textStyle="bold" />
                 </LinearLayout>
 
                 <LinearLayout

+ 2 - 1
app/src/main/res/layout/activity_part_job_detail.xml

@@ -51,7 +51,8 @@
                         android:layout_height="wrap_content"
                         android:gravity="right"
                         android:textColor="@color/text_red_FF40"
-                        android:textSize="@dimen/px45_15sp" />
+                        android:textSize="@dimen/px45_15sp"
+                        android:textStyle="bold" />
                 </LinearLayout>
 
 

+ 2 - 1
app/src/main/res/layout/item_recycler_job_content.xml

@@ -64,7 +64,8 @@
                         android:gravity="center_vertical"
                         android:singleLine="true"
                         android:textColor="@color/text_red_FF40"
-                        android:textSize="@dimen/px45_15sp" />
+                        android:textSize="@dimen/px45_15sp"
+                        android:textStyle="bold" />
                 </LinearLayout>
 
                 <LinearLayout