support delete some one by longclick

li-yu · li-yu · commit aa1d26a2f086 · 2017-07-13T14:31:59.000+08:00
diff --git a/app/src/main/assets/litepal.xml b/app/src/main/assets/litepal.xml
@@ -3,7 +3,7 @@
 
     <dbname value="huahui_db"></dbname>
 
-    <version value="1"></version>
+    <version value="2"></version>
 
     <list>
 
diff --git a/app/src/main/java/com/liyu/huahui/adapter/WordAdapter.java b/app/src/main/java/com/liyu/huahui/adapter/WordAdapter.java
@@ -1,6 +1,8 @@
 package com.liyu.huahui.adapter;
 
 import android.graphics.Paint;
+import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
@@ -10,6 +12,7 @@
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.liyu.huahui.R;
 import com.liyu.huahui.model.Word;
+import com.liyu.huahui.ui.MainActivity;
 import com.liyu.huahui.utils.DownloadUtil;
 import com.liyu.huahui.utils.Player;
 
@@ -26,18 +29,18 @@ public WordAdapter(int layoutResId, List<Word> data) {
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, final Word item) {
+    protected void convert(final BaseViewHolder helper, final Word item) {
         helper.setText(R.id.tv_name, item.getName());
 
-        helper.setText(R.id.tv_correct, "正确：" + item.getCorrect());
+        helper.setText(R.id.tv_correct, "正确：" + item.getCorrectPhonetic());
 
-        if (TextUtils.isEmpty(item.getWrong())) {
-            helper.setText(R.id.tv_wrong, item.getWrong());
+        if (TextUtils.isEmpty(item.getWrongPhonetic())) {
+            helper.setText(R.id.tv_wrong, item.getWrongPhonetic());
         } else {
-            helper.setText(R.id.tv_wrong, "错误：" + item.getWrong());
+            helper.setText(R.id.tv_wrong, "错误：" + item.getWrongPhonetic());
         }
 
-        helper.setVisible(R.id.image_play, !TextUtils.isEmpty(item.getVoice()));
+        helper.setVisible(R.id.image_play, !TextUtils.isEmpty(item.getVoiceUrl()));
 
         ((TextView) helper.getView(R.id.tv_wrong)).getPaint()
                 .setFlags(Paint.STRIKE_THRU_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG);
@@ -55,6 +58,24 @@ public void onClick(View v) {
                 playVoice(item);
             }
         });
+
+        helper.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                final int deletedPosition = helper.getAdapterPosition();
+                remove(deletedPosition);
+                item.delete();
+                Snackbar.make(((MainActivity) mContext).getWindow().getDecorView().getRootView().findViewById(R.id.coordinatorLayout), "删除成功!",
+                        Snackbar.LENGTH_LONG).setAction("撤销", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        addData(deletedPosition, item);
+                        item.save();
+                    }
+                }).setActionTextColor(ContextCompat.getColor(mContext, R.color.snackbar_action_color)).show();
+                return false;
+            }
+        });
     }
 
     private void playVoice(Word item) {
diff --git a/app/src/main/java/com/liyu/huahui/model/Word.java b/app/src/main/java/com/liyu/huahui/model/Word.java
@@ -11,24 +11,33 @@
 public class Word extends DataSupport implements Serializable {
 
     private String name;
-    private String correct;
-    private String wrong;
-    private String voice;
+    private String correctPhonetic;
+    private String wrongPhonetic;
+    private String voiceUrl;
+    private int sourceFrom;
 
-    public String getVoice() {
-        return voice;
+    public int getSourceFrom() {
+        return sourceFrom;
     }
 
-    public void setVoice(String voice) {
-        this.voice = voice;
+    public void setSourceFrom(From sourceFrom) {
+        this.sourceFrom = sourceFrom.getFrom();
     }
 
-    public String getCorrect() {
-        return correct;
+    public String getVoiceUrl() {
+        return voiceUrl;
     }
 
-    public void setCorrect(String correct) {
-        this.correct = correct;
+    public void setVoiceUrl(String voiceUrl) {
+        this.voiceUrl = voiceUrl;
+    }
+
+    public String getCorrectPhonetic() {
+        return correctPhonetic;
+    }
+
+    public void setCorrectPhonetic(String correctPhonetic) {
+        this.correctPhonetic = correctPhonetic;
     }
 
     public String getName() {
@@ -39,12 +48,12 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getWrong() {
-        return wrong;
+    public String getWrongPhonetic() {
+        return wrongPhonetic;
     }
 
-    public void setWrong(String wrong) {
-        this.wrong = wrong;
+    public void setWrongPhonetic(String wrongPhonetic) {
+        this.wrongPhonetic = wrongPhonetic;
     }
 
     @Override
@@ -58,4 +67,24 @@ public boolean equals(Object o) {
 
     }
 
+    public enum From {
+        LOCAL(1),
+        NETWORK(2);
+
+        private int from;
+
+        From(int from) {
+            this.from = from;
+        }
+
+        public int getFrom() {
+            return from;
+        }
+
+        public void setFrom(int from) {
+            this.from = from;
+        }
+    }
+
+
 }
diff --git a/app/src/main/java/com/liyu/huahui/ui/MainActivity.java b/app/src/main/java/com/liyu/huahui/ui/MainActivity.java
@@ -30,7 +30,10 @@
 import org.litepal.crud.DataSupport;
 
 import java.io.IOException;
+import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import rx.Observable;
@@ -83,7 +86,9 @@ private void getWords() {
         Observable<List<Word>> database = Observable.create(new Observable.OnSubscribe<List<Word>>() {
             @Override
             public void call(Subscriber<? super List<Word>> subscriber) {
-                List<Word> words = DataSupport.findAll(Word.class);
+                List<Word> words = DataSupport
+                        .where("sourceFrom =?", String.valueOf(Word.From.NETWORK.getFrom()))
+                        .find(Word.class);
                 if (words == null || words.isEmpty()) {
                     subscriber.onCompleted();
                 } else {
@@ -111,13 +116,13 @@ public List<Word> call(String url) {
                                 Word word = new Word();
                                 word.setName(tds.get(0).ownText());
                                 Element a = tds.get(0).select("a").first();
-                                word.setVoice(a == null ? "" : a.attr("href"));
-                                word.setCorrect(tds.get(1).ownText());
-                                word.setWrong(tds.get(2).ownText());
+                                word.setVoiceUrl(a == null ? "" : a.attr("href"));
+                                word.setCorrectPhonetic(tds.get(1).ownText());
+                                word.setWrongPhonetic(tds.get(2).ownText());
+                                word.setSourceFrom(Word.From.NETWORK);
                                 words.add(word);
                             }
                         }
-                        DataSupport.deleteAll(Word.class);
                         DataSupport.saveAll(words);
                         return words;
                     }
@@ -143,13 +148,25 @@ public void onError(Throwable e) {
 
                     @Override
                     public void onNext(List<Word> words) {
-                        tvTotal.setText(String.format("总计：%s个", words.size()));
-                        adapter.setNewData(words);
+                        List<Word> allWords = DataSupport.findAll(Word.class);
+                        tvTotal.setText(String.format("总计：%s个", allWords.size()));
+                        adapter.setNewData(allWords);
+                        sortData();
                     }
                 });
 
     }
 
+    private void sortData() {
+        final Collator collator = Collator.getInstance();
+        Collections.sort(adapter.getData(), new Comparator<Word>() {
+            @Override
+            public int compare(Word o1, Word o2) {
+                return collator.compare(o1.getName(), o2.getName());
+            }
+        });
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_main, menu);
@@ -168,7 +185,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             startActivity(intent);
             return true;
         } else if (id == R.id.action_sync) {
-            DataSupport.deleteAll(Word.class);
+            DataSupport.deleteAll(Word.class, "sourceFrom =?", String.valueOf(Word.From.NETWORK.getFrom()));
             getWords();
             return true;
         } else if (id == R.id.action_cache) {
@@ -234,12 +251,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             Word word = (Word) data.getSerializableExtra(QueryActivity.EXTRA_WORD);
             if (adapter.getData().contains(word)) {
                 Toast.makeText(this, "列表中已包含 " + word.getName(), Toast.LENGTH_SHORT).show();
-            } else if (word.getCorrect().contains("null")) {
+            } else if (word.getCorrectPhonetic().contains("null")) {
                 Toast.makeText(this, "该单词没有找到合适的读法", Toast.LENGTH_SHORT).show();
             } else {
                 word.save();
                 adapter.addData(word);
-                recyclerView.scrollToPosition(adapter.getData().size() - 1);
+                sortData();
+                int wordIndex = adapter.getData().indexOf(word);
+                recyclerView.scrollToPosition(wordIndex);
             }
         }
     }
diff --git a/app/src/main/java/com/liyu/huahui/ui/QueryActivity.java b/app/src/main/java/com/liyu/huahui/ui/QueryActivity.java
@@ -15,7 +15,6 @@
 import android.view.animation.Interpolator;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.Toast;
 
 import com.liyu.huahui.App;
 import com.liyu.huahui.R;
@@ -30,7 +29,6 @@
 
 import rx.Observer;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -107,8 +105,9 @@ public void onError(Throwable e) {
                     public void onNext(YoudaoResponse youdaoResponse) {
                         Word word = new Word();
                         word.setName(youdaoResponse.getQuery());
-                        word.setCorrect(String.format("[%s]", youdaoResponse.getBasic().getPhonetic()));
-                        word.setVoice(String.format("http://dict.youdao.com/dictvoice?audio=%s&type=1", youdaoResponse.getQuery()));
+                        word.setCorrectPhonetic(String.format("[%s]", youdaoResponse.getBasic().getPhonetic()));
+                        word.setVoiceUrl(String.format("http://dict.youdao.com/dictvoice?audio=%s&type=1", youdaoResponse.getQuery()));
+                        word.setSourceFrom(Word.From.LOCAL);
                         Intent i = new Intent();
                         i.putExtra(EXTRA_WORD, word);
                         setResult(RESULT_OK, i);
diff --git a/app/src/main/java/com/liyu/huahui/utils/DownloadUtil.java b/app/src/main/java/com/liyu/huahui/utils/DownloadUtil.java
@@ -23,7 +23,7 @@ public class DownloadUtil {
     private static Handler handler = new Handler(Looper.getMainLooper());
 
     public static void start(Word word, final SingleFileDownloadListener listener) {
-        FileDownloader.getImpl().create(word.getVoice()).setTag(word.getName()).setPath(App.getContext().getFilesDir().getPath() + "/" + word + ".mp3")
+        FileDownloader.getImpl().create(word.getVoiceUrl()).setTag(word.getName()).setPath(App.getContext().getFilesDir().getPath() + "/" + word + ".mp3")
                 .setListener(new FileDownloadListener() {
                     @Override
                     protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
@@ -116,8 +116,8 @@ protected void warn(BaseDownloadTask task) {
         final List<BaseDownloadTask> tasks = new ArrayList<>();
 
         for (Word word : list) {
-            if (!TextUtils.isEmpty(word.getVoice()))
-                tasks.add(FileDownloader.getImpl().create(word.getVoice()).setPath(App.getContext().getFilesDir().getPath() + "/" + word.getName() + ".mp3").setTag(word.getName()));
+            if (!TextUtils.isEmpty(word.getVoiceUrl()))
+                tasks.add(FileDownloader.getImpl().create(word.getVoiceUrl()).setPath(App.getContext().getFilesDir().getPath() + "/" + word.getName() + ".mp3").setTag(word.getName()));
         }
 
         queueSet.disableCallbackProgressTimes();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout
+    android:id="@+id/coordinatorLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,4 +6,5 @@
     <color name="white">#ffffff</color>
     <color name="dialog_background_color">#fafafa</color>
     <color name="dialog_background_scrim">#99323232</color>
+    <color name="snackbar_action_color">#8BB2DE</color>
 </resources>
