add v2ex

zy9959632 · Jan 2, 2017 · be9e755 · be9e755
1 parent 9afd4e1
commit be9e755
Show file tree

Hide file tree

Showing 56 changed files with 2,918 additions and 67 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.codeest.geeknews"
         minSdkVersion 21
         targetSdkVersion 24
-        versionCode 120
-        versionName "1.2.0"
+        versionCode 130
+        versionName "1.3.0"
 
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true
@@ -71,6 +71,7 @@ dependencies {
     compile 'com.orhanobut:logger:1.15'
     compile 'me.yokeyword:fragmentation:0.7.9'
     compile 'pub.devrel:easypermissions:0.2.0'
+    compile 'org.jsoup:jsoup:1.10.1'
 
     //widget
     compile 'com.prolificinteractive:material-calendarview:1.4.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -66,6 +66,18 @@
         <activity android:name=".ui.gold.activity.GoldManagerActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"/>
+
+        //v2ex
+        <activity android:name=".ui.vtex.activity.NodeActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".ui.vtex.activity.NodeListActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".ui.vtex.activity.RepliesActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"/>
+
         <service android:name=".component.UpdateService"/>
 
     </application>

diff --git a/app/src/main/java/com/codeest/geeknews/app/App.java b/app/src/main/java/com/codeest/geeknews/app/App.java
@@ -27,6 +27,7 @@
 public class App extends Application{
 
     private static App instance;
+    public static AppComponent appComponent;
     private Set<Activity> allActivities;
 
     public static int SCREEN_WIDTH = -1;
@@ -118,8 +119,11 @@ public void getScreenSize() {
     }
 
     public static AppComponent getAppComponent(){
-        return DaggerAppComponent.builder()
-                .appModule(new AppModule(instance))
-                .build();
+        if (appComponent == null) {
+            appComponent = DaggerAppComponent.builder()
+                    .appModule(new AppModule(instance))
+                    .build();
+        }
+        return appComponent;
     }
 }
diff --git a/app/src/main/java/com/codeest/geeknews/app/Constants.java b/app/src/main/java/com/codeest/geeknews/app/Constants.java
@@ -27,11 +27,13 @@ public class Constants {
 
     public static final int TYPE_GOLD = 108;
 
-    public static final int TYPE_SETTING = 109;
+    public static final int TYPE_VTEX = 109;
 
-    public static final int TYPE_LIKE = 110;
+    public static final int TYPE_SETTING = 110;
 
-    public static final int TYPE_ABOUT = 111;
+    public static final int TYPE_LIKE = 111;
+
+    public static final int TYPE_ABOUT = 112;
 
     //================= KEY ====================
 
@@ -88,4 +90,14 @@ public class Constants {
     public static final String IT_GOLD_TYPE_STR = "type_str";
 
     public static final String IT_GOLD_MANAGER = "manager";
+
+    public static final String IT_VTEX_TYPE = "type";
+
+    public static final String IT_VTEX_TOPIC_ID = "id";
+
+    public static final String IT_VTEX_TOPIC_CONTENT = "content";
+
+    public static final String IT_VTEX_REPLIES_TOP = "top_info";
+
+    public static final String IT_VTEX_NODE_NAME = "node_name";
 }
diff --git a/app/src/main/java/com/codeest/geeknews/di/component/ActivityComponent.java b/app/src/main/java/com/codeest/geeknews/di/component/ActivityComponent.java
@@ -6,6 +6,8 @@
 import com.codeest.geeknews.di.module.ActivityModule;
 import com.codeest.geeknews.ui.main.activity.MainActivity;
 import com.codeest.geeknews.ui.main.activity.WelcomeActivity;
+import com.codeest.geeknews.ui.vtex.activity.NodeListActivity;
+import com.codeest.geeknews.ui.vtex.activity.RepliesActivity;
 import com.codeest.geeknews.ui.zhihu.activity.SectionActivity;
 import com.codeest.geeknews.ui.zhihu.activity.ThemeActivity;
 import com.codeest.geeknews.ui.zhihu.activity.ZhihuDetailActivity;
@@ -31,4 +33,8 @@ public interface ActivityComponent {
     void inject(ThemeActivity themeActivity);
 
     void inject(SectionActivity sectionActivity);
+
+    void inject(RepliesActivity repliesActivity);
+
+    void inject(NodeListActivity nodeListActivity);
 }
diff --git a/app/src/main/java/com/codeest/geeknews/di/component/AppComponent.java b/app/src/main/java/com/codeest/geeknews/di/component/AppComponent.java
@@ -1,7 +1,6 @@
 package com.codeest.geeknews.di.component;
 
 import com.codeest.geeknews.app.App;
-import com.codeest.geeknews.di.ContextLife;
 import com.codeest.geeknews.di.module.AppModule;
 import com.codeest.geeknews.model.db.RealmHelper;
 import com.codeest.geeknews.model.http.RetrofitHelper;
@@ -18,7 +17,6 @@
 @Component(modules = AppModule.class)
 public interface AppComponent {
 
-    @ContextLife("Application")
     App getContext();  // 提供App的Context
 
     RetrofitHelper retrofitHelper();  //提供http的帮助类

diff --git a/app/src/main/java/com/codeest/geeknews/di/component/FragmentComponent.java b/app/src/main/java/com/codeest/geeknews/di/component/FragmentComponent.java
@@ -10,6 +10,7 @@
 import com.codeest.geeknews.ui.gold.fragment.GoldPagerFragment;
 import com.codeest.geeknews.ui.main.fragment.LikeFragment;
 import com.codeest.geeknews.ui.main.fragment.SettingFragment;
+import com.codeest.geeknews.ui.vtex.fragment.VtexPagerFragment;
 import com.codeest.geeknews.ui.wechat.fragment.WechatMainFragment;
 import com.codeest.geeknews.ui.zhihu.fragment.CommentFragment;
 import com.codeest.geeknews.ui.zhihu.fragment.DailyFragment;
@@ -52,4 +53,6 @@ public interface FragmentComponent {
     void inject(GoldMainFragment goldMainFragment);
 
     void inject(GoldPagerFragment goldPagerFragment);
+
+    void inject(VtexPagerFragment vtexPagerFragment);
 }
diff --git a/app/src/main/java/com/codeest/geeknews/di/module/AppModule.java b/app/src/main/java/com/codeest/geeknews/di/module/AppModule.java
@@ -1,7 +1,6 @@
 package com.codeest.geeknews.di.module;
 
 import com.codeest.geeknews.app.App;
-import com.codeest.geeknews.di.ContextLife;
 import com.codeest.geeknews.model.db.RealmHelper;
 import com.codeest.geeknews.model.http.RetrofitHelper;
 
@@ -24,7 +23,6 @@ public AppModule(App application) {
 
     @Provides
     @Singleton
-    @ContextLife("Application")
     App provideApplicationContext() {
         return application;
     }

diff --git a/app/src/main/java/com/codeest/geeknews/model/bean/NodeBean.java b/app/src/main/java/com/codeest/geeknews/model/bean/NodeBean.java
@@ -0,0 +1,71 @@
+package com.codeest.geeknews.model.bean;
+
+/**
+ * Created by codeest on 16/12/22.
+ */
+
+public class NodeBean {
+
+
+    /**
+     * id : 300
+     * name : programmer
+     * url : http://www.v2ex.com/go/programmer
+     * title : 程序员
+     * title_alternative : Programmer
+     * topics : 14214
+     * stars : 2806
+     * header : While code monkeys are not eating bananas, they're coding.
+     * footer : null
+     * created : 1293396163
+     * avatar_normal : //cdn.v2ex.co/navatar/94f6/d7e0/300_mini.png?m=1482295939
+     * avatar_normal : //cdn.v2ex.co/navatar/94f6/d7e0/300_normal.png?m=1482295939
+     * avatar_large : //cdn.v2ex.co/navatar/94f6/d7e0/300_large.png?m=1482295939
+     */
+
+    private String title;
+    private int topics;
+    private int stars;
+    private String header;
+    private String avatar_normal;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getTopics() {
+        return topics;
+    }
+
+    public void setTopics(int topics) {
+        this.topics = topics;
+    }
+
+    public int getStars() {
+        return stars;
+    }
+
+    public void setStars(int stars) {
+        this.stars = stars;
+    }
+
+    public String getHeader() {
+        return header;
+    }
+
+    public void setHeader(String header) {
+        this.header = header;
+    }
+
+    public String getavatar_normal() {
+        return avatar_normal;
+    }
+
+    public void setavatar_normal(String avatar_normal) {
+        this.avatar_normal = avatar_normal;
+    }
+}