Upgrade greenDao to 3.2

YangZhangcn · Feb 7, 2017 · 9dc5f64 · 9dc5f64
1 parent 110abc8
commit 9dc5f64
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 102 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,18 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.1'
+    }
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'org.greenrobot.greendao'
 
 android {
     compileSdkVersion 23
@@ -22,11 +35,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main {
-            java.srcDirs = ['src/main/java', 'src/main/java-gen']
-        }
-    }
+
 }
 
 dependencies {
@@ -54,8 +63,8 @@ dependencies {
     compile 'io.reactivex:rxjava:1.1.5'
 
     compile 'com.github.bumptech.glide:glide:3.7.0'
-
-    compile 'de.greenrobot:greendao:1.3.7'
+    //升级greendao3.0
+    compile 'org.greenrobot:greendao:3.2.0'
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
@@ -79,4 +88,10 @@ dependencies {
     compile 'com.daimajia.easing:library:1.0.1@aar'
     compile 'com.daimajia.androidanimations:library:1.1.3@aar'
 
+
 }
+greendao {
+    schemaVersion 1
+    daoPackage 'com.cins.daily.greendao'
+    targetGenDir 'src/main/java'
+}
diff --git a/app/src/main/java/com/cins/daily/App.java b/app/src/main/java/com/cins/daily/App.java
@@ -20,7 +20,8 @@
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
 
-import de.greenrobot.dao.query.QueryBuilder;
+import org.greenrobot.greendao.query.QueryBuilder;
+
 
 /**
  * Created by Eric on 2017/1/16.

diff --git a/app/src/main/java/com/cins/daily/mvp/interactor/NewsChannelInteractor.java b/app/src/main/java/com/cins/daily/mvp/interactor/NewsChannelInteractor.java
@@ -1,7 +1,8 @@
 package com.cins.daily.mvp.interactor;
 
-import com.cins.daily.greendao.NewsChannelTable;
+
 import com.cins.daily.listener.RequestCallBack;
+import com.cins.daily.mvp.entity.NewsChannelTable;
 
 import rx.Subscription;
 

diff --git a/app/src/main/java/com/cins/daily/mvp/interactor/impl/NewsChannelInteractorImpl.java b/app/src/main/java/com/cins/daily/mvp/interactor/impl/NewsChannelInteractorImpl.java
@@ -3,8 +3,9 @@
 import com.cins.daily.App;
 import com.cins.daily.R;
 import com.cins.daily.common.Constants;
-import com.cins.daily.greendao.NewsChannelTable;
+
 import com.cins.daily.listener.RequestCallBack;
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.interactor.NewsChannelInteractor;
 import com.cins.daily.repository.db.NewsChannelTableManager;
 import com.cins.daily.utils.TransformUtils;

diff --git a/app/src/main/java/com/cins/daily/mvp/interactor/impl/NewsInteractorImpl.java b/app/src/main/java/com/cins/daily/mvp/interactor/impl/NewsInteractorImpl.java
@@ -2,8 +2,9 @@
 
 import com.cins.daily.App;
 import com.cins.daily.R;
-import com.cins.daily.greendao.NewsChannelTable;
+
 import com.cins.daily.listener.RequestCallBack;
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.interactor.NewsInteractor;
 import com.cins.daily.repository.db.NewsChannelTableManager;
 import com.cins.daily.utils.TransformUtils;

diff --git a/app/src/main/java/com/cins/daily/mvp/presenter/NewsChannelPresenter.java b/app/src/main/java/com/cins/daily/mvp/presenter/NewsChannelPresenter.java
@@ -1,6 +1,7 @@
 package com.cins.daily.mvp.presenter;
 
-import com.cins.daily.greendao.NewsChannelTable;
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.presenter.base.BasePresenter;
 
 /**

diff --git a/app/src/main/java/com/cins/daily/mvp/presenter/impl/NewsChannelPresenterImpl.java b/app/src/main/java/com/cins/daily/mvp/presenter/impl/NewsChannelPresenterImpl.java
@@ -2,7 +2,8 @@
 
 import com.cins.daily.common.Constants;
 import com.cins.daily.event.ChannelChangeEvent;
-import com.cins.daily.greendao.NewsChannelTable;
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.interactor.impl.NewsChannelInteractorImpl;
 import com.cins.daily.mvp.presenter.NewsChannelPresenter;
 import com.cins.daily.mvp.presenter.base.BasePresenterImpl;

diff --git a/app/src/main/java/com/cins/daily/mvp/presenter/impl/NewsPresenterImpl.java b/app/src/main/java/com/cins/daily/mvp/presenter/impl/NewsPresenterImpl.java
@@ -1,6 +1,7 @@
 package com.cins.daily.mvp.presenter.impl;
 
-import com.cins.daily.greendao.NewsChannelTable;
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.interactor.NewsInteractor;
 import com.cins.daily.mvp.interactor.impl.NewsInteractorImpl;
 import com.cins.daily.mvp.presenter.NewsPresenter;

diff --git a/app/src/main/java/com/cins/daily/mvp/ui/activities/NewsActivity.java b/app/src/main/java/com/cins/daily/mvp/ui/activities/NewsActivity.java
@@ -17,7 +17,8 @@
 import com.cins.daily.common.Constants;
 import com.cins.daily.event.ChannelChangeEvent;
 import com.cins.daily.event.ScrollToTopEvent;
-import com.cins.daily.greendao.NewsChannelTable;
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.presenter.impl.NewsPresenterImpl;
 import com.cins.daily.mvp.ui.activities.base.BaseActivity;
 import com.cins.daily.mvp.ui.adapter.PagerAdapter.NewsFragmentPagerAdapter;
@@ -106,7 +107,7 @@ public void onClick(View view) {
     }
 
 
-    @Override
+   @Override
     public void initViewPager(List<NewsChannelTable> newsChannels) {
         final List<String> channelNames = new ArrayList<>();
         if (newsChannels != null) {
@@ -193,4 +194,5 @@ public void hideProgress() {
     public void showMsg(String message) {
         Snackbar.make(mFab, message, Snackbar.LENGTH_SHORT).show();
     }
+
 }
diff --git a/app/src/main/java/com/cins/daily/mvp/ui/activities/NewsChannelActivity.java b/app/src/main/java/com/cins/daily/mvp/ui/activities/NewsChannelActivity.java
@@ -12,8 +12,11 @@
 
 import com.cins.daily.R;
 import com.cins.daily.event.ChannelItemMoveEvent;
-import com.cins.daily.greendao.NewsChannelTable;
+
 import com.cins.daily.listener.OnItemClickListener;
+
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.presenter.impl.NewsChannelPresenterImpl;
 import com.cins.daily.mvp.ui.activities.base.BaseActivity;
 import com.cins.daily.mvp.ui.adapter.NewsChannelAdapter;

diff --git a/app/src/main/java/com/cins/daily/mvp/ui/activities/base/BaseActivity.java b/app/src/main/java/com/cins/daily/mvp/ui/activities/base/BaseActivity.java
@@ -244,7 +244,7 @@ protected void setStatusBarTranslucent() {
     public void changeToDay() {
 //        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
         getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        mNightView.setBackgroundResource(R.color.transparent);
+        mNightView.setBackgroundResource(android.R.color.transparent);
     }
 
     public void changeToNight() {

diff --git a/app/src/main/java/com/cins/daily/mvp/ui/adapter/NewsChannelAdapter.java b/app/src/main/java/com/cins/daily/mvp/ui/adapter/NewsChannelAdapter.java
@@ -11,8 +11,8 @@
 import com.cins.daily.App;
 import com.cins.daily.R;
 import com.cins.daily.event.ChannelItemMoveEvent;
-import com.cins.daily.greendao.NewsChannelTable;
 import com.cins.daily.listener.OnItemClickListener;
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.ui.adapter.base.BaseRecyclerViewAdapter;
 import com.cins.daily.utils.ClickUtil;
 import com.cins.daily.utils.MyUtils;
@@ -38,6 +38,8 @@ public class NewsChannelAdapter extends BaseRecyclerViewAdapter<NewsChannelTable
 
     private OnItemClickListener mOnItemClickListener;
 
+
+
     public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
         mOnItemClickListener = onItemClickListener;
     }

diff --git a/app/src/main/java/com/cins/daily/mvp/view/NewsChannelView.java b/app/src/main/java/com/cins/daily/mvp/view/NewsChannelView.java
@@ -1,6 +1,7 @@
 package com.cins.daily.mvp.view;
 
-import com.cins.daily.greendao.NewsChannelTable;
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.view.base.BaseView;
 
 import java.util.List;

diff --git a/app/src/main/java/com/cins/daily/mvp/view/NewsView.java b/app/src/main/java/com/cins/daily/mvp/view/NewsView.java
@@ -1,6 +1,7 @@
 package com.cins.daily.mvp.view;
 
-import com.cins.daily.greendao.NewsChannelTable;
+
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.mvp.view.base.BaseView;
 
 import java.util.List;

diff --git a/app/src/main/java/com/cins/daily/repository/db/NewsChannelTableManager.java b/app/src/main/java/com/cins/daily/repository/db/NewsChannelTableManager.java
@@ -4,14 +4,17 @@
 import com.cins.daily.R;
 import com.cins.daily.common.ApiConstants;
 import com.cins.daily.common.Constants;
-import com.cins.daily.greendao.NewsChannelTable;
+
 import com.cins.daily.greendao.NewsChannelTableDao;
+import com.cins.daily.mvp.entity.NewsChannelTable;
 import com.cins.daily.utils.MyUtils;
 
+import org.greenrobot.greendao.query.Query;
+
 import java.util.Arrays;
 import java.util.List;
 
-import de.greenrobot.dao.query.Query;
+
 
 /**
  * Created by Eric on 2017/1/16.

diff --git a/app/src/main/java/com/cins/daily/widget/URLImageGetter.java b/app/src/main/java/com/cins/daily/widget/URLImageGetter.java
@@ -30,7 +30,7 @@
  * Created by Eric on 2017/1/18.
  */
 
-public class URLImageGetter implements Html.ImageGetter{
+public class URLImageGetter implements Html.ImageGetter {
     private TextView mTextView;
     private int mPicWidth;
     private String mNewsBody;
@@ -47,7 +47,7 @@ public URLImageGetter(TextView textView, String newsBody, int picTotal) {
     }
 
     @Override
-    public Drawable getDrawable(String source) {
+    public Drawable getDrawable(final String source) {
         Drawable drawable;
         File file = new File(mFilePath, source.hashCode() + "");
         if (file.exists()) {

diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        //classpath 'org.greenrobot:greendao-gradle-plugin:3.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/daogenerator/.gitignore b/daogenerator/.gitignore
diff --git a/daogenerator/build.gradle b/daogenerator/build.gradle
diff --git a/daogenerator/src/main/java/com/example/DaoAutoGenerator.java b/daogenerator/src/main/java/com/example/DaoAutoGenerator.java
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':daogenerator'
+include ':app'