2.2.1更新

Author: CeuiLiSA

app/build.gradle

@@ -12,9 +12,21 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 108
-        versionName "2.2.0"
+        versionCode 109
+        versionName "2.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [
+                        //必须，告知RxHttp你依赖的okhttp版本，目前已适配 v3.12.0 - v4.7.2版本  (v4.3.0除外)
+                        rxhttp_okhttp: '4.4.0',
+                        //使用asXxx方法时必须，告知RxHttp你依赖的rxjava版本，可传入rxjava2、rxjava3
+                        rxhttp_rxjava: 'rxjava3',
+                        rxhttp_package: 'rxhttp'   //非必须，指定RxHttp相关类的生成路径，即包名
+                ]
+            }
+        }
     }
 
     buildTypes {
@@ -105,15 +117,14 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.3.0'
 //
 //
-//    implementation 'com.ljx.rxhttp:rxhttp:2.3.3'
-//    implementation 'com.squareup.okhttp3:okhttp:4.7.2' //rxhttp v2.2.2版本起，需要手动依赖okhttp
-//    kapt 'com.ljx.rxhttp:rxhttp-compiler:2.3.3'
-//
-//    implementation 'com.ljx.rxlife:rxlife-coroutine:2.0.0'
-//
-//    implementation 'io.reactivex.rxjava3:rxjava:3.0.4'
-//    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-//    implementation 'com.ljx.rxlife3:rxlife-rxjava:3.0.0'
+    implementation 'com.ljx.rxhttp:rxhttp:2.3.3'
+    kapt 'com.ljx.rxhttp:rxhttp-compiler:2.3.3'
+
+    implementation 'com.ljx.rxlife:rxlife-coroutine:2.0.0'
+
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.4'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation 'com.ljx.rxlife3:rxlife-rxjava:3.0.0'
 
     implementation project(path: ':models')
     implementation project(path: ':base')

app/src/main/java/ceui/lisa/activities/TemplateActivity.java

@@ -17,8 +17,10 @@
 import ceui.lisa.fragments.FragmentAnime;
 import ceui.lisa.fragments.FragmentBh;
 import ceui.lisa.fragments.FragmentFileName;
+import ceui.lisa.fragments.FragmentHttpTest;
 import ceui.lisa.fragments.FragmentListSimpleUser;
 import ceui.lisa.fragments.FragmentMultiDownld;
+import ceui.lisa.fragments.FragmentNew;
 import ceui.lisa.fragments.FragmentNewNovel;
 import ceui.lisa.fragments.FragmentNovelSeries;
 import ceui.lisa.fragments.FragmentRecmdIllust;
@@ -39,7 +41,6 @@
 import ceui.lisa.fragments.FragmentLive;
 import ceui.lisa.fragments.FragmentLocalUsers;
 import ceui.lisa.fragments.FragmentMutedTags;
-import ceui.lisa.fragments.FragmentNew;
 import ceui.lisa.fragments.FragmentNiceFriend;
 import ceui.lisa.fragments.FragmentNovelHolder;
 import ceui.lisa.fragments.FragmentPv;
@@ -141,7 +142,8 @@ protected Fragment createNewFragment() {
                     return FragmentAnime.newInstance();
                 case "最新作品":
                     if (Dev.isDev) {
-                        return FragmentBh.newInstance();
+                        return new FragmentHttpTest();
+//                        return FragmentBh.newInstance();
                     } else {
                         return new FragmentNew();
                     }

app/src/main/java/ceui/lisa/fragments/FragmentHttpTest.java

@@ -0,0 +1,70 @@
+package ceui.lisa.fragments;
+
+import android.view.View;
+
+import androidx.lifecycle.ViewModelProvider;
+
+import ceui.lisa.R;
+import ceui.lisa.databinding.FragmentNewBinding;
+import ceui.lisa.utils.Common;
+import ceui.lisa.viewmodel.Hito;
+import ceui.lisa.viewmodel.HitoModel;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import rxhttp.RxHttp;
+
+public class FragmentHttpTest extends BaseFragment<FragmentNewBinding> {
+
+    private HitoModel mHitoModel;
+
+    @Override
+    public void initLayout() {
+        mLayoutID = R.layout.fragment_new;
+    }
+
+    @Override
+    public void initView(View view) {
+        mHitoModel = new ViewModelProvider(this).get(HitoModel.class);
+    }
+
+    @Override
+    void initData() {
+        mHitoModel.getContent().observe(this, new androidx.lifecycle.Observer<Hito>() {
+            @Override
+            public void onChanged(Hito hito) {
+                baseBind.content.setText(hito.toString());
+            }
+        });
+        if (mHitoModel.getContent().getValue() == null) {
+            RxHttp.get("https://api.imjad.cn/hitokoto/?cat=&charset=utf-8&encode=json")
+                    .asClass(Hito.class)
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new Observer<Hito>() {
+                        @Override
+                        public void onSubscribe(@NonNull Disposable d) {
+
+                        }
+
+                        @Override
+                        public void onNext(@NonNull Hito hito) {
+                            mHitoModel.getContent().setValue(hito);
+                        }
+
+                        @Override
+                        public void onError(@NonNull Throwable e) {
+                            e.printStackTrace();
+                        }
+
+                        @Override
+                        public void onComplete() {
+
+                        }
+                    });
+        }
+
+    }
+}

app/src/main/java/ceui/lisa/fragments/FragmentMutedTags.java

@@ -1,9 +1,11 @@
 package ceui.lisa.fragments;
 
 import android.content.DialogInterface;
+import android.text.InputType;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
@@ -21,7 +23,6 @@
 import ceui.lisa.database.AppDatabase;
 import ceui.lisa.databinding.FragmentBaseListBinding;
 import ceui.lisa.databinding.RecyBookTagBinding;
-import ceui.lisa.dialogs.AddTagDialog;
 import ceui.lisa.helper.TagFilter;
 import ceui.lisa.interfaces.OnItemClickListener;
 import ceui.lisa.models.TagsBean;
@@ -100,8 +101,30 @@ public void onClick(QMUIDialog dialog, int index) {
                                 .show();
                     }
                 } else if (item.getItemId() == R.id.action_add) {
-                    AddTagDialog dialog = AddTagDialog.newInstance(1);
-                    dialog.show(getChildFragmentManager(), "AddTagDialog");
+                    final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(mActivity);
+                    builder.setTitle("添加屏蔽标签")
+                            .setSkinManager(QMUISkinManager.defaultInstance(mContext))
+                            .setPlaceholder("请输入标签名")
+                            .setInputType(InputType.TYPE_CLASS_TEXT)
+                            .addAction("取消", new QMUIDialogAction.ActionListener() {
+                                @Override
+                                public void onClick(QMUIDialog dialog, int index) {
+                                    dialog.dismiss();
+                                }
+                            })
+                            .addAction("添加", new QMUIDialogAction.ActionListener() {
+                                @Override
+                                public void onClick(QMUIDialog dialog, int index) {
+                                    CharSequence text = builder.getEditText().getText();
+                                    if (text != null && text.length() > 0) {
+                                        addMutedTag(text.toString());
+                                        dialog.dismiss();
+                                    } else {
+                                        Toast.makeText(getActivity(), "请填入标签", Toast.LENGTH_SHORT).show();
+                                    }
+                                }
+                            })
+                            .show();
                 }
                 return true;
             }

app/src/main/java/ceui/lisa/fragments/FragmentSB.java

@@ -2,12 +2,18 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputType;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.qmuiteam.qmui.skin.QMUISkinManager;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
+
 import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
@@ -21,13 +27,11 @@
 import ceui.lisa.core.RemoteRepo;
 import ceui.lisa.databinding.FragmentSelectTagBinding;
 import ceui.lisa.databinding.RecySelectTagBinding;
-import ceui.lisa.dialogs.AddTagDialog;
 import ceui.lisa.http.ErrorCtrl;
 import ceui.lisa.http.Retro;
 import ceui.lisa.model.ListBookmarkTag;
 import ceui.lisa.models.NullResponse;
 import ceui.lisa.models.TagsBean;
-import ceui.lisa.utils.Channel;
 import ceui.lisa.utils.Common;
 import ceui.lisa.utils.Params;
 import io.reactivex.Observable;
@@ -164,8 +168,30 @@ public void initToolbar(Toolbar toolbar) {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
                 if (item.getItemId() == R.id.action_add) {
-                    AddTagDialog dialog = AddTagDialog.newInstance(0);
-                    dialog.show(getChildFragmentManager(), "AddTagDialog");
+                    final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(mActivity);
+                    builder.setTitle("添加标签")
+                            .setSkinManager(QMUISkinManager.defaultInstance(mContext))
+                            .setPlaceholder("请输入标签(收藏夹)名")
+                            .setInputType(InputType.TYPE_CLASS_TEXT)
+                            .addAction("取消", new QMUIDialogAction.ActionListener() {
+                                @Override
+                                public void onClick(QMUIDialog dialog, int index) {
+                                    dialog.dismiss();
+                                }
+                            })
+                            .addAction("添加", new QMUIDialogAction.ActionListener() {
+                                @Override
+                                public void onClick(QMUIDialog dialog, int index) {
+                                    CharSequence text = builder.getEditText().getText();
+                                    if (text != null && text.length() > 0) {
+                                        addTag(text.toString());
+                                        dialog.dismiss();
+                                    } else {
+                                        Toast.makeText(getActivity(), "请填入标签", Toast.LENGTH_SHORT).show();
+                                    }
+                                }
+                            })
+                            .show();
                     return true;
                 }
                 return false;

app/src/main/java/ceui/lisa/utils/Dev.java

@@ -3,7 +3,7 @@
 public class Dev {
 
     //是否是开发状态
-    public static boolean isDev = true;
+    public static boolean isDev = false;
     public static boolean refreshUser = false;
 
     /**

app/src/main/java/ceui/lisa/viewmodel/Hito.java

@@ -0,0 +1,81 @@
+package ceui.lisa.viewmodel;
+
+public class Hito {
+
+
+    /**
+     * hitokoto : 所以，他们的祭典还没结束。
+     * author : 阿布碳。
+     * source : 我的青春恋爱物语果然有问题
+     * date : 2013.07.23 22:04:49
+     * catname : Anime - 动画
+     * id : 1374588289000
+     */
+
+    private String hitokoto;
+    private String author;
+    private String source;
+    private String date;
+    private String catname;
+    private String id;
+
+    public String getHitokoto() {
+        return hitokoto;
+    }
+
+    public void setHitokoto(String hitokoto) {
+        this.hitokoto = hitokoto;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getCatname() {
+        return catname;
+    }
+
+    public void setCatname(String catname) {
+        this.catname = catname;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return "Hito{" +
+                "hitokoto='" + hitokoto + '\'' +
+                ", author='" + author + '\'' +
+                ", source='" + source + '\'' +
+                ", date='" + date + '\'' +
+                ", catname='" + catname + '\'' +
+                ", id='" + id + '\'' +
+                '}';
+    }
+}

app/src/main/java/ceui/lisa/viewmodel/HitoModel.java

@@ -0,0 +1,30 @@
+package ceui.lisa.viewmodel;
+
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import rxhttp.RxHttp;
+
+
+public class HitoModel extends ViewModel {
+
+    private MutableLiveData<Hito> content;
+
+    public HitoModel() {
+        content = new MutableLiveData<>();
+
+    }
+
+    public MutableLiveData<Hito> getContent() {
+        return content;
+    }
+
+    public void setContent(MutableLiveData<Hito> content) {
+        this.content = content;
+    }
+}