hanjing 7 lat temu
rodzic
commit
a2ad36f840

+ 6 - 0
app/src/main/AndroidManifest.xml

@@ -127,6 +127,7 @@
             android:launchMode="singleTop" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.WebviewAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
 
         <service android:name=".service.DownloadService" />
@@ -218,9 +219,11 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.WithdrawalAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.WithdrawalResultAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct"
@@ -236,6 +239,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.LieMakeMoneyAct"
+            android:theme="@style/AppActionTheme"
             android:launchMode="singleTask" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.TaskListAct"
@@ -261,6 +265,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.TaskDetailAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.DialogToastAct"
@@ -786,6 +791,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActSysNfDetail"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActInvitation"

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActSysNfDetail.java

@@ -33,7 +33,7 @@ public class ActSysNfDetail extends BaseActivity {
 
     @Override
     protected boolean needButterKnife() {
-        return false;
+        return true;
     }
 
     @Override
@@ -43,7 +43,8 @@ public class ActSysNfDetail extends BaseActivity {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitle(this,"消息详情")
+        TitleBarUtils.getInstance()
+                .setTitle(this,"消息详情")
                 .setShowOrHide(this, true)
                 .setTitleFinish(this);
     }

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/LieMakeMoneyAct.java

@@ -52,6 +52,7 @@ public class LieMakeMoneyAct extends BaseActivity implements LieMakeMoneyContrac
         activity = this;
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(activity, "躺着赚钱")
                 .setTitleFinish(activity);
         DaggerLieMakeMoneyComponent.builder()

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -243,6 +243,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 .build()
                 .inject(this);
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(activity, "任务详情")
                 .setTitleFinish(activity);
         downloadUtil = new DownloadUtil();

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/WebviewAct.java

@@ -48,6 +48,7 @@ public class WebviewAct extends BaseActivity {
             return;
         }
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitleFinish(this)
                 .setTitle(this,
                         TextUtils.isEmpty(webviewEntity.getTitle()) ?"专属福利":webviewEntity.getTitle());

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalAct.java

@@ -78,6 +78,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         activity = this;
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(activity, "提现")
                 .setTitleFinish(activity);
         DaggerWithdrawalComponent.builder()

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalResultAct.java

@@ -54,6 +54,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         amount = getIntent().getFloatExtra(Float.class.getSimpleName(), 0);
         withdrawalSuccessMoneyTv.setText(String.format(Locale.CHINA, "+%.1f元", amount));
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(activity, "提现审核中")
                 .setTitleFinish(activity);
         DaggerWithdrawalResultComponent.builder()

+ 6 - 6
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java

@@ -43,8 +43,8 @@ public class FgtAudit extends BaseFragment {
     RefreshLayout swipe_container;
     @BindView(R.id.empty_view)
     View empty_view;
-    @BindView(R.id.title)
-    View title;
+//    @BindView(R.id.title)
+//    View title;
 
     private Activity activity;
     public List<TaskAcceptedEty> etyList = new ArrayList<>();
@@ -97,10 +97,10 @@ public class FgtAudit extends BaseFragment {
     }
 
     private void initView() {
-        if(title == null){
-            butterKnifeBindView();
-        }
-        title.setVisibility(View.GONE);
+//        if(title == null){
+//            butterKnifeBindView();
+//        }
+//        title.setVisibility(View.GONE);
         empty_view.setPadding(0, 50, 0, 0);
         swipe_container.setFooterView(activity, withdrawalListview, R.layout.listview_footer);
         adp = new TaskListItemAdp(activity , etyList);

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

@@ -3,10 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"

+ 1 - 3
app/src/main/res/layout/lie_make_money_listview.xml

@@ -3,11 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     android:background="@color/white_F9F9F9">
 
-    <include
-        layout="@layout/title"/>
-
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="wrap_content"

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

@@ -3,12 +3,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:background="@color/white"
     android:orientation="vertical">
 
     <include
-        layout="@layout/title"/>
-    <include
         android:id="@+id/empty_view"
         layout="@layout/empty_view"
         android:layout_width="match_parent"

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

@@ -2,9 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
-    <include
-        layout="@layout/title"/>
 
     <TextView
         android:id="@+id/title_name_tv"

+ 2 - 2
app/src/main/res/layout/withdrawal_layout.xml

@@ -3,10 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:background="@color/bg_gray">
-    <include
-        layout="@layout/title"/>
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

+ 1 - 3
app/src/main/res/layout/withdrawal_success_layout.xml

@@ -2,11 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include
-        layout="@layout/title"/>
-
     <ImageView
         android:id="@+id/withdrawal_image_iv"
         android:layout_width="wrap_content"