hanjing 7 年 前
コミット
3ed2c9911e

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

@@ -707,6 +707,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActMyWelfare"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity"
@@ -775,6 +776,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActUserCommentDetail"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActUserAppHome"

+ 10 - 10
app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -68,7 +68,7 @@ import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX
  * Created by realicing on 2018/9/6.
  * realicing@sina.com
  */
-public class ActMain extends BaseActYmPermissionCheck  {
+public class ActMain extends BaseActYmPermissionCheck {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         StatusBarUtils.setTranslucent(this);
@@ -95,13 +95,13 @@ public class ActMain extends BaseActYmPermissionCheck  {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && G.checkDeviceHasNavigationBar(this)) {
             //一定要判断是否存在按键,否则在没有按键的手机调用会影响别的功能。如之前没有考虑到,导致图传全屏变成小屏显示。
             int flag =
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-                    View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | // hide
-                    View.SYSTEM_UI_FLAG_FULLSCREEN | // hide status bar
-                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                    ;
+//                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR |
+                            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | // hide
+//                    View.SYSTEM_UI_FLAG_FULLSCREEN | // hide status bar
+                            View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
             // 获取属性
             decorView.setSystemUiVisibility(flag);
         }
@@ -356,7 +356,7 @@ public class ActMain extends BaseActYmPermissionCheck  {
             } else {
                 new DialogGameOrTaskOrGift(this, game_id).showDialog();
             }
-        } else if(action instanceof MainTab){
+        } else if (action instanceof MainTab) {
             view_pager_container.setCurrentItem(((MainTab) action).ordinal(), false);
         }
     }
@@ -440,7 +440,7 @@ public class ActMain extends BaseActYmPermissionCheck  {
     public void onEventMainThread(Intent intent) {
         if (intent != null && intent.getAction() != null && intent.getDataString() != null && intent.getDataString().contains("package:")) {
             String packageName = intent.getDataString().replace("package:", "");
-            if(progressView != null) {
+            if (progressView != null) {
                 TextView tvProgress = progressView.findViewWithTag(PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
                 if (tvProgress != null && downloadHelper != null && TextUtils.equals(packageName, this.packageName)) {
                     switch (intent.getAction()) {

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

@@ -35,6 +35,7 @@ public class ActMyWelfare extends BaseActivity {
     public void initView() {
         activity = this;
         TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "我的福利")
                 .setTitleFinish(this);
 

+ 4 - 9
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtUserCommentDetail.java

@@ -78,15 +78,10 @@ public class FgtUserCommentDetail extends BaseListFragment3<UserCommentReply> im
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitle(mView, "评论详情")
-                .setTitleFinish(mView, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if (!onBackPressed()) {
-                            KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
-                        }
-                    }
-                });
+        TitleBarUtils.getInstance()
+                .setShowOrHide(getActivity(), true)
+                .setTitle(getActivity(), "评论详情")
+                .setTitleFinish(getActivity());
         smartRefreshLayout = refresh;
         refresh.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
             @Override

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:fitsSystemWindows="true"
     android:background="@color/white">
 
     <TextView

+ 2 - 6
app/src/main/res/layout/net_empty_smart_refresh_rv_exp.xml

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -13,15 +14,10 @@
         android:background="@color/white">
 
         <include
-            android:id="@+id/title"
-            layout="@layout/title" />
-
-        <include
             android:id="@+id/check_net_ll"
             layout="@layout/check_net_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/title" />
+            android:layout_height="wrap_content" />
 
         <include
             android:id="@+id/empty_view"