集成表情功能到评论页面

CeuiLiSA · Jun 23, 2020 · af31fc9 · af31fc9
1 parent f1c6b59
commit af31fc9
Show file tree

Hide file tree

Showing 9 changed files with 411 additions and 331 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 95
-        versionName "1.9.5"
+        versionCode 96
+        versionName "1.9.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/ceui/lisa/activities/BaseActivity.java b/app/src/main/java/ceui/lisa/activities/BaseActivity.java
@@ -35,6 +35,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mContext = this;
         mActivity = this;
 
+        Intent intent = getIntent();
+        if (intent != null) {
+            Bundle bundle = intent.getExtras();
+            if (bundle != null) {
+                initBundle(bundle);
+            }
+        }
+
         if (hideStatusBar()) {
             getWindow().setStatusBarColor(Color.TRANSPARENT);
             getWindow().getDecorView().setSystemUiVisibility(
@@ -45,14 +53,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         baseBind = DataBindingUtil.setContentView(mActivity, mLayoutID);
         BarUtils.setNavBarColor(mActivity, getResources().getColor(R.color.trans));
 
-        Intent intent = getIntent();
-        if (intent != null) {
-            Bundle bundle = intent.getExtras();
-            if (bundle != null) {
-                initBundle(bundle);
-            }
-        }
-
 
         initView();
         initData();

diff --git a/app/src/main/java/ceui/lisa/activities/MainActivity.java b/app/src/main/java/ceui/lisa/activities/MainActivity.java
@@ -32,6 +32,7 @@
 import com.blankj.utilcode.util.RomUtils;
 import com.bumptech.glide.Glide;
 import com.google.android.material.navigation.NavigationView;
+import com.tbruyelle.rxpermissions2.RxPermissions;
 
 import java.io.File;
 
@@ -49,6 +50,7 @@
 import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseImage;
 import ceui.lisa.utils.ReverseWebviewCallback;
+import io.reactivex.disposables.Disposable;
 
 import static ceui.lisa.activities.Shaft.sUserModel;
 
@@ -114,11 +116,20 @@ public int getCount() {
 
     @Override
     protected void initData() {
-        Common.showLog(className + DeviceUtils.getSDKVersionName());
-        Common.showLog(className + DeviceUtils.getModel());
-        Common.showLog(className + DeviceUtils.getManufacturer());
         if (sUserModel != null && sUserModel.getResponse().getUser().isIs_login()) {
-            initFragment();
+            final RxPermissions rxPermissions = new RxPermissions(mActivity);
+            Disposable disposable = rxPermissions
+                    .requestEachCombined(
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    )
+                    .subscribe(permission -> {
+                        if (permission.granted) {
+                            initFragment();
+                        } else {
+                            Common.showToast(mActivity.getString(R.string.access_denied));
+                            finish();
+                        }
+                    });
         } else {
             Intent intent = new Intent(mContext, TemplateActivity.class);
             intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "登录注册");

diff --git a/app/src/main/java/ceui/lisa/activities/TemplateActivity.java b/app/src/main/java/ceui/lisa/activities/TemplateActivity.java
@@ -1,6 +1,7 @@
 package ceui.lisa.activities;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.Window;
 import android.view.WindowManager;
@@ -59,6 +60,7 @@
 import ceui.lisa.fragments.FragmentWhoFollowThisUser;
 import ceui.lisa.models.IllustsBean;
 import ceui.lisa.models.NovelBean;
+import ceui.lisa.utils.Common;
 import ceui.lisa.utils.Dev;
 import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseResult;
@@ -68,11 +70,15 @@ public class TemplateActivity extends BaseActivity<ActivityFragmentBinding> {
     public static final String EXTRA_FRAGMENT = "dataType";
     public static final String EXTRA_KEYWORD = "keyword";
     protected Fragment childFragment;
+    private String dataType;
+
+    @Override
+    protected void initBundle(Bundle bundle) {
+        dataType = bundle.getString(EXTRA_FRAGMENT);
+    }
 
     protected Fragment createNewFragment() {
         Intent intent = getIntent();
-        String dataType = intent.getStringExtra(EXTRA_FRAGMENT);
-
         if (dataType != null) {
             switch (dataType) {
                 case "登录注册":
@@ -239,6 +245,12 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
 
     @Override
     public boolean hideStatusBar() {
-        return getIntent().getBooleanExtra("hideStatusBar", true);
+        if ("相关评论".equals(dataType) || "关于软件".equals(dataType)) {
+            Common.showLog(className + "不隐藏状态栏");
+            return false;
+        } else {
+            Common.showLog(className + "隐藏状态栏");
+            return getIntent().getBooleanExtra("hideStatusBar", true);
+        }
     }
 }