grep架构搭好

secpersu · Dec 3, 2017 · 4c6347b · 4c6347b
1 parent 475f317
commit 4c6347b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/fairy-client/src/main/java/me/zane/fairy/repository/LogcatContentRepository.java b/fairy-client/src/main/java/me/zane/fairy/repository/LogcatContentRepository.java
@@ -63,14 +63,16 @@ public static LogcatContentRepository getInstance(@NonNull AppExecutors executor
     /**
      * 向上层抛出LiveData
      * 根据grep来决策是否过滤数据
-     * @param id
      * @param grep
      * @return
      */
-    public LiveData<LogcatContent> getLogcatContent(int id, String grep) {
+    public LiveData<LogcatContent> getLogcatContent(String grep) {
+        return DataCreator.creat(source.asLiveData(), grep);
+    }
+
+    public void fetchFromData(int id) {
         source.init(id);
         source.initData();
-        return DataCreator.creat(source.asLiveData(), grep);
     }
 
     public void fetchData(String options, String filter) {

diff --git a/fairy-client/src/main/java/me/zane/fairy/view/content/LogcatContentViewModel.java b/fairy-client/src/main/java/me/zane/fairy/view/content/LogcatContentViewModel.java
@@ -51,15 +51,16 @@ public class LogcatContentViewModel extends AndroidViewModel{
     public LogcatContentViewModel(@NonNull Application application, LogcatContentRepository repository) {
         super(application);
         this.repository = repository;
-        contentLiveData = Transformations.switchMap(isStartLiveData, grep -> repository.getLogcatContent(id, grep));
+        contentLiveData = Transformations.switchMap(isStartLiveData, repository::getLogcatContent);
     }
 
     //---------------------------------action binding---------------------------------
     void init(int id, String grep, ActivityLogcatBinding binding) {
         this.binding = binding;
         this.id = id;
-        isStartLiveData.setValue(grep);
         insertIfNotExits(new LogcatContent(id, "init fairy"));
+        repository.fetchFromData(id);
+        isStartLiveData.setValue(grep);
     }
 
     public void onOptionsChanged(CharSequence s) {