1.添加webview处理js对话框类

2.修改工厂设计模式
3.加入抽象工厂类
4.修改model基类名称

Author: jamlu614

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven { url "https://jitpack.io" }
+//        maven { url "https://jitpack.io" }
     }
 }
 

demo/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.example.rxjava.frameworkdemo"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0.1"
+        versionCode 2
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -29,6 +29,6 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 //    compile 'com.github.jamlu614:Framework:-SNAPSHOT'
-    compile 'com.jamlu:framework:1.0.4'
+    compile 'com.jamlu:framework:1.0.5'
 //    compile project(':framework')
 }

demo/src/main/java/com/example/rxjava/frameworkdemo/HomePresenterFactory.java

@@ -20,8 +20,7 @@ public int setLayoutResID() {
 
     @Override
     protected TestPresenter createPresenter() {
-        HomePresenterFactory factory = HomePresenterFactory.getInstance();
-        return (TestPresenter) factory.create(this, this, HomePresenterFactory.TYPE_TEST);
+        return  new TestPresenterFactory(this, this).create();
     }
 
     @Override

demo/src/main/java/com/example/rxjava/frameworkdemo/PresenterFactory.java

@@ -9,7 +9,7 @@
  * Created by Kang on 2017/3/16.
  */
 
-public class HomeDegreeRoomListBean extends BaseBean {
+public class TestBean extends BaseBean {
 
 
     private List<HomesBean> homes;

demo/src/main/java/com/example/rxjava/frameworkdemo/TestActivity.java

@@ -1,24 +1,14 @@
 package com.example.rxjava.frameworkdemo;
 
-import com.example.rxjava.frameworkdemo.network.NetworkUtils;
-import com.jamlu.framework.model.BaseRxModel;
 import com.jamlu.framework.model.bean.BaseBean;
 
 import rx.Observable;
 
 /**
- * Created by ljb on 2017/4/6.
+ * Created by ljb on 2017/5/25.
  */
 
-class TestModel extends BaseRxModel {
-
-    /**
-     * 获取新浪头条
-     * @return
-     */
-    Observable<BaseBean> getSinaTouTiao() {
-       return NetworkUtils
-                .getWeatherService()
-                .getWeatherData();
-    }
+public interface TestModel {
+    Observable<BaseBean> getSinaTouTiao();
 }
+

demo/src/main/java/com/example/rxjava/frameworkdemo/HomeDegreeRoomListBean.java renamed to demo/src/main/java/com/example/rxjava/frameworkdemo/TestBean.java

@@ -0,0 +1,14 @@
+package com.example.rxjava.frameworkdemo;
+
+import com.jamlu.framework.base.AbstractFactory;
+
+/**
+ * Created by ljb on 2017/5/25.
+ */
+
+public class TestModelFactory extends AbstractFactory<TestModel> {
+    @Override
+    public TestModel create() {
+        return new TestModelImpl();
+    }
+}

demo/src/main/java/com/example/rxjava/frameworkdemo/TestModel.java

@@ -0,0 +1,26 @@
+package com.example.rxjava.frameworkdemo;
+
+import com.example.rxjava.frameworkdemo.network.NetworkUtils;
+import com.jamlu.framework.model.AbstractModel;
+import com.jamlu.framework.model.bean.BaseBean;
+
+import rx.Observable;
+
+/**
+ * Created by ljb on 2017/4/6.
+ */
+
+class TestModelImpl extends AbstractModel implements TestModel {
+
+    /**
+     * 获取新浪头条
+     *
+     * @return
+     */
+    @Override
+    public Observable<BaseBean> getSinaTouTiao() {
+        return NetworkUtils
+                .getWeatherService()
+                .getWeatherData();
+    }
+}

demo/src/main/java/com/example/rxjava/frameworkdemo/TestModelFactory.java

@@ -0,0 +1,27 @@
+package com.example.rxjava.frameworkdemo;
+
+import android.content.Context;
+
+import com.jamlu.framework.base.AbstractFactory;
+
+
+/**
+ * Created by ljb on 2017/5/16.
+ *
+ */
+
+public class TestPresenterFactory extends AbstractFactory<TestPresenter> {
+
+    private Context mContext;
+    private ITestView mIView;
+
+    public TestPresenterFactory(Context context, ITestView IView) {
+        mContext = context;
+        mIView = IView;
+    }
+
+    @Override
+    public TestPresenter create() {
+        return new TestPresenterImpl(mContext, mIView);
+    }
+}