diff --git a/zhuike/src/main/java/com/deiniu/zhuike/Activity_cate_books.java b/zhuike/src/main/java/com/deiniu/zhuike/Activity_cate_books.java index 3c5f410..622635e 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/Activity_cate_books.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/Activity_cate_books.java @@ -6,6 +6,7 @@ import android.support.v4.view.ViewPager; import android.util.Log; import android.view.View; +import com.deiniu.zhuike.Fragments.Fragment_booklist; import com.deiniu.zhuike.Fragments.Fragment_shudan_list; import com.flyco.tablayout.SlidingTabLayout; @@ -53,10 +54,10 @@ public class Activity_cate_books extends Activity_base { if(mFragments ==null || mFragments.size() ==0){ mTitle = new String[]{"最热", "最新", "评分","完结"}; mFragments = new ArrayList<>(); - mFragments.add(new Fragment_shudan_list()); - mFragments.add(new Fragment_shudan_list()); - mFragments.add(new Fragment_shudan_list()); - mFragments.add(new Fragment_shudan_list()); + mFragments.add(new Fragment_booklist()); + mFragments.add(new Fragment_booklist()); + mFragments.add(new Fragment_booklist()); + mFragments.add(new Fragment_booklist()); Log.d(TAG,"initial fragments in tabs "); } Log.d(TAG,"set viewPager adapter "); diff --git a/zhuike/src/main/java/com/deiniu/zhuike/Config.java b/zhuike/src/main/java/com/deiniu/zhuike/Config.java index 89eaf0f..a059571 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/Config.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/Config.java @@ -4,9 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.Typeface; -/** - * Created by Administrator on 2016/7/18 0018. - */ + public class Config { private final static String SP_NAME = "config"; private final static String BOOK_BG_KEY = "bookbg"; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/FileActivity.java b/zhuike/src/main/java/com/deiniu/zhuike/FileActivity.java index e181869..41dd56f 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/FileActivity.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/FileActivity.java @@ -27,9 +27,7 @@ import java.util.List; import butterknife.BindView; -/** - * Created by Administrator on 2016/7/11 0011. - */ + public class FileActivity extends Activity_base { @BindView(R.id.toolbar) diff --git a/zhuike/src/main/java/com/deiniu/zhuike/Fragments/BasicFragment.java b/zhuike/src/main/java/com/deiniu/zhuike/Fragments/BasicFragment.java index 5cd4092..ddef06b 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/Fragments/BasicFragment.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/Fragments/BasicFragment.java @@ -136,6 +136,11 @@ public abstract class BasicFragment extends Fragment { void openBook(Book book, BookListAdapter mAdapter) { + //从新从数据库抓取该书的最新阅读进度 + + Book book1 = (Book)LitePal.find(Book.class,book.getId()); + book.setBegin(book1.getBegin()); + Toast.makeText(activity, book.getBookname() + "加载", Toast.LENGTH_SHORT).show(); final String path = book.getBookpath(); diff --git a/zhuike/src/main/java/com/deiniu/zhuike/Fragments/CatalogFragment.java b/zhuike/src/main/java/com/deiniu/zhuike/Fragments/CatalogFragment.java index 473955b..156f21a 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/Fragments/CatalogFragment.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/Fragments/CatalogFragment.java @@ -82,11 +82,6 @@ public class CatalogFragment extends BasicFragment { catalogFragment.setArguments(bundle); return catalogFragment; } - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return super.onCreateView(inflater,container,savedInstanceState); - } } diff --git a/zhuike/src/main/java/com/deiniu/zhuike/Fragments/Fragment_booklist.java b/zhuike/src/main/java/com/deiniu/zhuike/Fragments/Fragment_booklist.java index 5b2767f..09005d3 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/Fragments/Fragment_booklist.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/Fragments/Fragment_booklist.java @@ -51,7 +51,8 @@ public class Fragment_booklist extends BasicFragment { @Override public void onItemClick(View view, int position) { - openBook(mData.get(position),mAdapter); + showBookDetail(mData.get(position).getId()); + // openBook(mData.get(position),mAdapter); } @Override diff --git a/zhuike/src/main/java/com/deiniu/zhuike/MarkActivity.java b/zhuike/src/main/java/com/deiniu/zhuike/MarkActivity.java index 1bff7dc..36520a4 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/MarkActivity.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/MarkActivity.java @@ -19,9 +19,7 @@ import java.util.ArrayList; import butterknife.BindView; -/** - * Created by Administrator on 2016/1/6. - */ + public class MarkActivity extends Activity_base { @BindView(R.id.toolbar) diff --git a/zhuike/src/main/java/com/deiniu/zhuike/ReadActivity.java b/zhuike/src/main/java/com/deiniu/zhuike/ReadActivity.java index c11e75c..29f9bab 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/ReadActivity.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/ReadActivity.java @@ -53,9 +53,7 @@ import java.util.List; import butterknife.BindView; import butterknife.OnClick; -/** - * Created by Administrator on 2016/7/15 0015. - */ + public class ReadActivity extends Activity_base implements SpeechSynthesizerListener { private static final String TAG = "ReadActivity"; private final static String EXTRA_BOOK = "book"; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/adapter/FileAdapter.java b/zhuike/src/main/java/com/deiniu/zhuike/adapter/FileAdapter.java index 879a726..5d76351 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/adapter/FileAdapter.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/adapter/FileAdapter.java @@ -25,9 +25,7 @@ import java.util.Map; import butterknife.BindView; import butterknife.ButterKnife; -/** - * Created by Administrator on 2015/12/19. - */ + public class FileAdapter extends BaseAdapter { private List files; private HashMap checkMap = new HashMap<>(); diff --git a/zhuike/src/main/java/com/deiniu/zhuike/adapter/MarkAdapter.java b/zhuike/src/main/java/com/deiniu/zhuike/adapter/MarkAdapter.java index 61f45da..4a3d30a 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/adapter/MarkAdapter.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/adapter/MarkAdapter.java @@ -17,9 +17,7 @@ import com.deiniu.zhuike.utils.PageFactory; import java.text.DecimalFormat; import java.util.List; -/** - * Created by Administrator on 2016/1/3. - */ + public class MarkAdapter extends BaseAdapter { private Context mContext; private List list ; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/adapter/MyPagerAdapter.java b/zhuike/src/main/java/com/deiniu/zhuike/adapter/MyPagerAdapter.java index f97437c..1cf579c 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/adapter/MyPagerAdapter.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/adapter/MyPagerAdapter.java @@ -11,9 +11,7 @@ import com.deiniu.zhuike.Fragments.BookMarkFragment; import com.deiniu.zhuike.Fragments.CatalogFragment; -/** - * Created by Administrator on 2016/1/12. - */ + public class MyPagerAdapter extends FragmentPagerAdapter { private CatalogFragment catalogueFragment; private BookMarkFragment bookMarkFragment; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/adapter/ShelfAdapter.java b/zhuike/src/main/java/com/deiniu/zhuike/adapter/ShelfAdapter.java index 7a0c13c..7436425 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/adapter/ShelfAdapter.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/adapter/ShelfAdapter.java @@ -29,9 +29,7 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; -/** - * Created by Administrator on 2015/12/17. - */ + public class ShelfAdapter extends BaseAdapter implements DragGridListener { private Context mContex; private List bilist; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/bean/Cache.java b/zhuike/src/main/java/com/deiniu/zhuike/bean/Cache.java index ff65dae..a94599a 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/bean/Cache.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/bean/Cache.java @@ -2,9 +2,7 @@ package com.deiniu.zhuike.bean; import java.lang.ref.WeakReference; -/** - * Created by Administrator on 2016/8/15 0015. - */ + public class Cache { private long size; private WeakReference data; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/db/Book.java b/zhuike/src/main/java/com/deiniu/zhuike/db/Book.java index 45138d5..d23e348 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/db/Book.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/db/Book.java @@ -5,9 +5,7 @@ import org.litepal.crud.LitePalSupport; import java.io.Serializable; -/** - * Created by Administrator on 2015/12/27. - */ + public class Book extends LitePalSupport implements Serializable{ private int id; private String bookname; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/db/BookChapter.java b/zhuike/src/main/java/com/deiniu/zhuike/db/BookChapter.java index b4d449e..7366dbf 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/db/BookChapter.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/db/BookChapter.java @@ -3,9 +3,7 @@ package com.deiniu.zhuike.db; import org.litepal.crud.LitePalSupport; -/** - * Created by Lxq on 2016/4/9. - */ + public class BookChapter extends LitePalSupport { private int id; private String bookpath; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/db/BookMarks.java b/zhuike/src/main/java/com/deiniu/zhuike/db/BookMarks.java index b39656e..f8955cb 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/db/BookMarks.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/db/BookMarks.java @@ -3,9 +3,7 @@ package com.deiniu.zhuike.db; import org.litepal.crud.LitePalSupport; -/** - * Created by Administrator on 2015/12/27. - */ + public class BookMarks extends LitePalSupport { private int id ; // private int page; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/dialog/BaseDialog.java b/zhuike/src/main/java/com/deiniu/zhuike/dialog/BaseDialog.java index 6d22dea..0d41eb0 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/dialog/BaseDialog.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/dialog/BaseDialog.java @@ -1,8 +1,6 @@ package com.deiniu.zhuike.dialog; -/** - * Created by Administrator on 2016/7/19 0019. - */ + public interface BaseDialog { void show(); diff --git a/zhuike/src/main/java/com/deiniu/zhuike/dialog/PageModeDialog.java b/zhuike/src/main/java/com/deiniu/zhuike/dialog/PageModeDialog.java index 064b5cf..dc7ed17 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/dialog/PageModeDialog.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/dialog/PageModeDialog.java @@ -17,9 +17,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -/** - * Created by Administrator on 2016/8/30 0030. - */ + public class PageModeDialog extends Dialog { @BindView(R.id.tv_simulation) diff --git a/zhuike/src/main/java/com/deiniu/zhuike/dialog/ReadSettingDialog.java b/zhuike/src/main/java/com/deiniu/zhuike/dialog/ReadSettingDialog.java index b961952..b5cc593 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/dialog/ReadSettingDialog.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/dialog/ReadSettingDialog.java @@ -20,9 +20,7 @@ import com.deiniu.zhuike.view.BookPageWidget; import java.text.DecimalFormat; -/** - * Created by Administrator on 2016/7/19 0019. - */ + public class ReadSettingDialog implements BaseDialog,View.OnClickListener { ImageButton btn_return; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/dialog/SettingDialog.java b/zhuike/src/main/java/com/deiniu/zhuike/dialog/SettingDialog.java index 744feec..a339c6b 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/dialog/SettingDialog.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/dialog/SettingDialog.java @@ -22,9 +22,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -/** - * Created by Administrator on 2016/7/26 0026. - */ + public class SettingDialog extends Dialog { @BindView(R.id.tv_dark) diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/BitmapUtil.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/BitmapUtil.java index 5461ee2..3caf02c 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/BitmapUtil.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/BitmapUtil.java @@ -4,9 +4,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -/** - * Created by Administrator on 2016/7/29 0029. - */ + public class BitmapUtil { public static Bitmap decodeSampledBitmapFromResource(Resources res, int resId, int reqWidth, int reqHeight) { diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/BookUtil.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/BookUtil.java index 3197175..78996cd 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/BookUtil.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/BookUtil.java @@ -23,9 +23,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; -/** - * Created by Administrator on 2016/8/11 0011. - */ + public class BookUtil { private static final String cachedPath = Environment.getExternalStorageDirectory() + "/treader/"; //存储的字符数 diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/BrightnessUtil.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/BrightnessUtil.java index 23ce2ce..a64dab4 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/BrightnessUtil.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/BrightnessUtil.java @@ -6,9 +6,7 @@ import android.net.Uri; import android.provider.Settings; import android.view.WindowManager; -/** - * Created by Administrator on 2016/7/27 0027. - */ + public class BrightnessUtil { /** * 判断是否开启了自动亮度调节 diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/CommonUtil.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/CommonUtil.java index 95b287a..3b4e4b0 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/CommonUtil.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/CommonUtil.java @@ -12,9 +12,7 @@ import android.view.WindowManager; import java.lang.reflect.Method; -/** - * Created by Administrator on 2016/1/17. - */ + public class CommonUtil { /** diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/FileUtils.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/FileUtils.java index b41d60e..8074d95 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/FileUtils.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/FileUtils.java @@ -8,9 +8,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -/** - * Created by Administrator on 2016/7/11 0011. - */ + public class FileUtils { /** diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/Fileutil.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/Fileutil.java index 9e68439..77e683c 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/Fileutil.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/Fileutil.java @@ -18,9 +18,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; -/** - * Created by Administrator on 2015/12/22. - */ + public class Fileutil { public static String name ; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/PageFactory.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/PageFactory.java index ec47dae..d376bfb 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/PageFactory.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/PageFactory.java @@ -32,9 +32,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; -/** - * Created by Administrator on 2016/7/20 0020. - */ +import static com.baidu.tts.loopj.AsyncHttpClient.log; + + public class PageFactory { private static final String TAG = "PageFactory"; private static PageFactory pageFactory; @@ -297,7 +297,8 @@ public class PageFactory { public void run() { super.run(); values.put("begin",currentPage.getBegin()); - LitePal.update(Book.class,values,bookList.getId()); + int rows = LitePal.update(Book.class,values,bookList.getId()); + log.e(TAG,String.format("update book %s bigin %s, result %s",bookList.getBookname(),currentPage.getBegin(),rows) ); } }.start(); } diff --git a/zhuike/src/main/java/com/deiniu/zhuike/utils/TRPage.java b/zhuike/src/main/java/com/deiniu/zhuike/utils/TRPage.java index 75e5702..586b740 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/utils/TRPage.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/utils/TRPage.java @@ -2,9 +2,7 @@ package com.deiniu.zhuike.utils; import java.util.List; -/** - * Created by Administrator on 2016/8/11 0011. - */ + public class TRPage { private long begin; private long end; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/BookPageWidget.java b/zhuike/src/main/java/com/deiniu/zhuike/view/BookPageWidget.java index f40a4b2..32d0013 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/BookPageWidget.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/BookPageWidget.java @@ -24,9 +24,7 @@ import android.widget.Scroller; import com.deiniu.zhuike.utils.PageFactory; -/** - * Created by Administrator on 2016/7/15 0015. - */ + public class BookPageWidget extends View { private final static String TAG = "BookPageWidget"; private int mScreenWidth = 0; // 屏幕宽 diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridListener.java b/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridListener.java index fb4fd74..08f0d9a 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridListener.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridListener.java @@ -1,8 +1,6 @@ package com.deiniu.zhuike.view; -/** - * Created by Lxq on 2016/4/12. - */ + public interface DragGridListener { /** * 重新排列数据 diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridView.java b/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridView.java index 2c90df0..252e5fe 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridView.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/DragGridView.java @@ -32,9 +32,7 @@ import com.deiniu.zhuike.utils.CommonUtil; import java.util.LinkedList; import java.util.List; -/** - * Created by Lxq on 2016/4/12. - */ + public class DragGridView extends GridView implements View.OnClickListener{ /** diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/PageWidget.java b/zhuike/src/main/java/com/deiniu/zhuike/view/PageWidget.java index 320d784..3d0ae03 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/PageWidget.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/PageWidget.java @@ -24,9 +24,7 @@ import com.deiniu.zhuike.view.animation.SlideAnimation; import static com.deiniu.zhuike.Config.*; -/** - * Created by Administrator on 2016/8/29 0029. - */ + public class PageWidget extends View { private final static String TAG = "BookPageWidget"; private int mScreenWidth = 0; // 屏幕宽 diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/AnimationProvider.java b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/AnimationProvider.java index 1672e57..b4d9832 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/AnimationProvider.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/AnimationProvider.java @@ -5,9 +5,7 @@ import android.graphics.Canvas; import android.graphics.PointF; import android.widget.Scroller; -/** - * Created by Administrator on 2016/8/1 0001. - */ + public abstract class AnimationProvider { // static enum Mode { // NoScrolling(false), @@ -38,6 +36,7 @@ public abstract class AnimationProvider { // private Mode myMode = Mode.NoScrolling; + protected int duation =300;//翻页动画速度 protected Bitmap mCurPageBitmap,mNextPageBitmap; protected float myStartX; protected float myStartY; diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/CoverAnimation.java b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/CoverAnimation.java index a8df9de..561da13 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/CoverAnimation.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/CoverAnimation.java @@ -7,9 +7,7 @@ import android.graphics.drawable.GradientDrawable; import android.util.Log; import android.widget.Scroller; -/** - * Created by Administrator on 2016/8/30 0030. - */ + public class CoverAnimation extends AnimationProvider { private Rect mSrcRect, mDestRect; @@ -88,7 +86,7 @@ public class CoverAnimation extends AnimationProvider { } } //滑动速度保持一致 - int duration = (400 * Math.abs(dx)) / mScreenWidth; + int duration = (duation * Math.abs(dx)) / mScreenWidth; Log.e("duration",duration + ""); scroller.startScroll((int) mTouch.x, 0, dx, 0, duration); } diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/NoneAnimation.java b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/NoneAnimation.java index eab5caf..5e7ab00 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/NoneAnimation.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/NoneAnimation.java @@ -4,9 +4,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.widget.Scroller; -/** - * Created by Administrator on 2016/8/30 0030. - */ + public class NoneAnimation extends AnimationProvider { public NoneAnimation(Bitmap mCurrentBitmap, Bitmap mNextBitmap, int width, int height) { diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SimulationAnimation.java b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SimulationAnimation.java index 9f9c939..f44113b 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SimulationAnimation.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SimulationAnimation.java @@ -13,9 +13,7 @@ import android.graphics.drawable.GradientDrawable; import android.os.Build; import android.widget.Scroller; -/** - * Created by Administrator on 2016/8/26 0026. - */ + public class SimulationAnimation extends AnimationProvider { private int mCornerX = 1; // 拖拽点对应的页脚 private int mCornerY = 1; @@ -148,7 +146,7 @@ public class SimulationAnimation extends AnimationProvider { dy = (int) (1 - mTouch.y); // 防止mTouch.y最终变为0 } } - scroller.startScroll((int) mTouch.x, (int) mTouch.y, dx, dy, 400); + scroller.startScroll((int) mTouch.x, (int) mTouch.y, dx, dy, duation); } diff --git a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SlideAnimation.java b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SlideAnimation.java index 8e7d09f..8fecffd 100644 --- a/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SlideAnimation.java +++ b/zhuike/src/main/java/com/deiniu/zhuike/view/animation/SlideAnimation.java @@ -6,9 +6,7 @@ import android.graphics.Rect; import android.util.Log; import android.widget.Scroller; -/** - * Created by Administrator on 2016/8/29 0029. - */ + public class SlideAnimation extends AnimationProvider { private Rect mSrcRect, mDestRect,mNextSrcRect,mNextDestRect; @@ -92,7 +90,7 @@ public class SlideAnimation extends AnimationProvider { } } //滑动速度保持一致 - int duration = (400 * Math.abs(dx)) / mScreenWidth; + int duration = (duation * Math.abs(dx)) / mScreenWidth; Log.e("duration",duration + ""); scroller.startScroll((int) mTouch.x, 0, dx, 0, duration); } diff --git a/zhuike/src/main/res/layout/zactivity_mark.xml b/zhuike/src/main/res/layout/zactivity_mark.xml index d1845c5..54158e0 100644 --- a/zhuike/src/main/res/layout/zactivity_mark.xml +++ b/zhuike/src/main/res/layout/zactivity_mark.xml @@ -9,10 +9,7 @@ + style="@style/barLayout"> + android:background="@color/white" + + /> @dimen/marginRight @dimen/marginLeft - +