zhangxinyu 5 rokov pred
rodič
commit
191699e2dd

+ 5 - 0
app/src/main/java/com/tongyu/luck/happywork/ui/base/BaseActivityHolder.java

@@ -60,6 +60,10 @@ public class BaseActivityHolder extends BaseViewHolder {
     View vLoadPadding;
     @BindView(R.id.v_error_padding)
     View vErrorPadding;
+    @BindView(R.id.v_title_line)
+    View vTitleLine;
+    @BindView(R.id.tv_base_error_title)
+    TextView tvBaseErrorTitle;
 
     private boolean isNewActionBarStyle;//是否为新版风格
     private boolean isImmersion;//是否未沉浸式标题
@@ -318,6 +322,7 @@ public class BaseActivityHolder extends BaseViewHolder {
         setActionBarBackgroundResource(R.drawable.gradient_blue_bg_0);
         setTitleColor(R.color.white);
         setBackColor(R.color.white);
+        vTitleLine.setVisibility(View.GONE);
         isNewActionBarStyle = true;
     }
 

+ 1 - 3
app/src/main/java/com/tongyu/luck/happywork/ui/base/BaseFragment.java

@@ -187,8 +187,6 @@ public abstract class BaseFragment<P extends IPresenter> extends RxFragment impl
      * C1.2 版本标题风格
      */
     public void initActionBarNewStyle() {
-        mBaseHolder.setActionBarBackgroundResource(R.drawable.gradient_blue_bg_0);
-        mBaseHolder.setTitleColor(R.color.white);
+        mBaseHolder.initActionBarNewStyle();
     }
-
 }

+ 14 - 0
app/src/main/java/com/tongyu/luck/happywork/ui/base/BaseFragmentHolder.java

@@ -51,6 +51,10 @@ public class BaseFragmentHolder extends BaseViewHolder {
     View vErrorPadding;
     @BindView(R.id.v_load_padding)
     View vLoadPadding;
+    @BindView(R.id.v_title_line)
+    View vTitleLine;
+    @BindView(R.id.tv_base_error_title)
+    TextView tvBaseErrorTitle;
 
     private Context mContext;
     private View.OnClickListener onClickListener;//刷新按钮点击效果
@@ -242,4 +246,14 @@ public class BaseFragmentHolder extends BaseViewHolder {
         }
     }
 
+
+    /**
+     * 新版风格
+     */
+    public void initActionBarNewStyle() {
+        setActionBarBackgroundResource(R.drawable.gradient_blue_bg_0);
+        setTitleColor(R.color.white);
+        vTitleLine.setVisibility(View.GONE);
+    }
+
 }

+ 1 - 0
app/src/main/res/layout/base_activity_layout.xml

@@ -54,6 +54,7 @@
                 android:paddingRight="7.5dp" />
 
             <View
+                android:id="@+id/v_title_line"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_alignParentBottom="true"

+ 2 - 0
app/src/main/res/layout/base_fragment_layout.xml

@@ -35,7 +35,9 @@
                 android:layout_alignParentRight="true"
                 android:orientation="horizontal"
                 android:paddingRight="7.5dp" />
+
             <View
+                android:id="@+id/v_title_line"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_alignParentBottom="true"