diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b9cc049..4e4aaf6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,6 +3,6 @@
package="com.it114.android.oneframework.core"
android:versionCode="1"
android:versionName="1.0.0">
-
+
diff --git a/src/com/it114/android/oneframework/core/OneApplication.java b/src/com/it114/android/oneframework/core/OneApplication.java
index 72ad4cb..bb615b0 100644
--- a/src/com/it114/android/oneframework/core/OneApplication.java
+++ b/src/com/it114/android/oneframework/core/OneApplication.java
@@ -68,14 +68,14 @@ private void initImageLoader() {
.memoryCache(new WeakMemoryCache())
.diskCache(new LruDiskCache(cacheDir,new Md5FileNameGenerator(),500))
.denyCacheImageMultipleSizesInMemory()
- .threadPoolSize(3)//�̳߳��ڼ��ص�����
+ .threadPoolSize(3)//线程池内加载的数量
.threadPriority(Thread.NORM_PRIORITY - 2)
- .memoryCache(new UsingFreqLimitedMemoryCache(2 * 1024 * 1024)) // You can pass your own memory cache implementation/�����ͨ���Լ����ڴ滺��ʵ��
+ .memoryCache(new UsingFreqLimitedMemoryCache(2 * 1024 * 1024)) // You can pass your own memory cache implementation/你可以通过自己的内存缓存实现
.memoryCacheSize(2 * 1024 * 1024)
.discCacheSize(50 * 1024 * 1024)
- .discCacheFileNameGenerator(new Md5FileNameGenerator())//�������ʱ���URI������MD5 ����
+ .discCacheFileNameGenerator(new Md5FileNameGenerator())//将保存的时候的URI名称用MD5 加密
.tasksProcessingOrder(QueueProcessingType.LIFO)
- .discCacheFileCount(100) //����������
+ .discCacheFileCount(100) //缓存的文件数量
//.discCache(new UnlimitedDiscCache(cacheDir))
.defaultDisplayImageOptions(options);
} catch (IOException e) {
@@ -89,9 +89,9 @@ private void initImageLoader() {
public void setDebugModel(boolean debugModel){
if(debugModel) {
- Config.showLogcat = true;
+ Config.debug = true;
} else {
- Config.showLogcat = false;
+ Config.debug = false;
}
}
}
diff --git a/src/com/it114/android/oneframework/core/http/HttpRequestHandler.java b/src/com/it114/android/oneframework/core/http/HttpRequestHandler.java
index 16e3461..2d4a663 100644
--- a/src/com/it114/android/oneframework/core/http/HttpRequestHandler.java
+++ b/src/com/it114/android/oneframework/core/http/HttpRequestHandler.java
@@ -7,5 +7,6 @@ public void onSuccess(E data){
}
public void onSuccess(E data, int totalPages, int currentPage){}
public void onFailure(int statusCode,String error){}
+ public void onFailure(String error){}
public void onFinish(){}
}
diff --git a/src/com/it114/android/oneframework/core/http/OneApi.java b/src/com/it114/android/oneframework/core/http/OneApi.java
index 2f8e294..3843876 100644
--- a/src/com/it114/android/oneframework/core/http/OneApi.java
+++ b/src/com/it114/android/oneframework/core/http/OneApi.java
@@ -27,8 +27,8 @@ private static AsyncHttpClient getHttpClient(){
private static void get(RequestParams params,String url, AsyncHttpResponseHandler responseHandler) {
if(!NetUtil.isOpenNetwork()) {
- //�������ݿ��
- //String content = HttpCacheManager.get(url,params);
+ //返回数据库缓存
+// String content = HttpCacheManager.get(url,params);
return;
}
LogUtil.d(TAG, params.toString());
@@ -37,7 +37,7 @@ private static void get(RequestParams params,String url, AsyncHttpResponseHandle
private static void post(RequestParams params,String url,AsyncHttpResponseHandler responseHandler) {
if(!NetUtil.isOpenNetwork()){
- //�������ݿ��
+ //返回数据库缓存
return ;
}
LogUtil.d(TAG, params.toString());
@@ -60,19 +60,20 @@ public static String makeUrl(String uri){
/**
- * get����
- * @param useCache �Ƿ�ʹ�û���
- * @param cacheTime ����ʱ�䣺��λ��
- * @param url ���ʵ�ַ
- * @param params ���ʲ���
+ * get请求
+ * @param useCache 是否使用缓存
+ * @param cacheTime 缓存时间:单位秒
+ * @param url 访问地址
+ * @param params 访问参数
* @param handler
+ * @param dataModel
*/
public static void get(boolean useCache,long cacheTime,String url,RequestParams params, final HttpRequestHandler handler, final DataModel dataModel){
HttpCache cache = null;
if(useCache) {
cache = HttpCacheManager.get(url, params);
if(cache!=null){
- if(cache.updateTime+cacheTime*1000 < System.currentTimeMillis()){ //������
+ if(cache.updateTime+cacheTime*1000 < System.currentTimeMillis()){ //走缓存逻辑
SafeHandler.onSuccess(handler,cache.content);
handler.onFinish();
return;
diff --git a/src/com/it114/android/oneframework/core/http/UserApi.java b/src/com/it114/android/oneframework/core/http/UserApi.java
index 7a21f19..e56d83c 100644
--- a/src/com/it114/android/oneframework/core/http/UserApi.java
+++ b/src/com/it114/android/oneframework/core/http/UserApi.java
@@ -1,5 +1,6 @@
package com.it114.android.oneframework.core.http;
+import com.it114.android.oneframework.core.model.DataModel;
import com.it114.android.oneframework.core.model.UserModel;
import com.loopj.android.http.RequestParams;
@@ -29,7 +30,7 @@ public static void login(String userName,String password,HttpRequestHandler hand
* use cache example
* @param handler
*/
- public static void getUserList(HttpRequestHandler handler){
- get(true,5*60,makeUrl(URI_USER_RPOFIE),getRequestParams(),handler);
+ public static void getUserList(HttpRequestHandler handler, DataModel dataModel){
+ get(true,5*60,makeUrl(URI_USER_RPOFIE),getRequestParams(),handler,dataModel);
}
}
diff --git a/src/com/it114/android/oneframework/core/model/BaseModel.java b/src/com/it114/android/oneframework/core/model/BaseModel.java
index 04b0db4..278e25d 100644
--- a/src/com/it114/android/oneframework/core/model/BaseModel.java
+++ b/src/com/it114/android/oneframework/core/model/BaseModel.java
@@ -1,10 +1,8 @@
package com.it114.android.oneframework.core.model;
+
import android.widget.Toast;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.it114.android.oneframework.core.OneApplication;
-import com.it114.android.oneframework.core.R;
import org.json.JSONObject;
import java.io.Serializable;
@@ -12,9 +10,9 @@
/**
* Created by andy on 10/12/2015.
*
- * ���������ע���������ݸ�ʽ���������������ʽ�IJſ���ֱ�������model
+ * 基类解析。注意您的数据格式必须是下面这个格式的才可以直接用这个model
* {"code":1,"msg":"success","data":"{----}"}
- * �������ϸ�ʽ�������и������ĸ�ʽ��д����Ľ���
+ * 不是如上格式的请自行根据您的格式来写基类的解析
*
*/
public abstract class BaseModel implements Serializable {
@@ -22,7 +20,7 @@ public abstract class BaseModel implements Serializable {
public String msg="";
public int code;
protected boolean showErrorJsonMsg = true;
- abstract public boolean parseSuc();
+ abstract public boolean parseSuccess();
public void parse(String jsonObject) throws Exception {
JSONObject object = new JSONObject(jsonObject);
@@ -32,7 +30,7 @@ public void parse(String jsonObject) throws Exception {
parseModel(object);
} else {
if(showErrorJsonMsg) {
- Toast.makeText(OneApplication.getInstance(),OneApplication.getInstance().getString(R.string.error_data_valid),Toast.LENGTH_LONG).show();
+ Toast.makeText(OneApplication.getInstance(), "服务器返回数据不合法",Toast.LENGTH_LONG).show();
}
}
}
@@ -44,22 +42,19 @@ protected void setShowErrorJsonMsg(boolean show){
abstract void parseModel(JSONObject object) throws Exception;
/**
- * ���ݷ����Ƿ�ɹ�
+ * 数据返回是否成功
* @return
*/
- public boolean dataSuc(){
+ public boolean dataSuccess(){
return this.code == 1;
}
/**
- * ���������ص�json�е�msg����
+ * 服务器返回的json中的msg数据
* @return
*/
public String modelMessage(){
return msg;
}
-
-
-
-}
+}
\ No newline at end of file
diff --git a/src/com/it114/android/oneframework/core/model/DataModel.java b/src/com/it114/android/oneframework/core/model/DataModel.java
index 62dc8bc..63f7de5 100644
--- a/src/com/it114/android/oneframework/core/model/DataModel.java
+++ b/src/com/it114/android/oneframework/core/model/DataModel.java
@@ -7,7 +7,7 @@
*/
public class DataModel extends BaseModel {
@Override
- public boolean parseSuc() {
+ public boolean parseSuccess() {
return false;
}
diff --git a/src/com/it114/android/oneframework/core/model/HttpCache.java b/src/com/it114/android/oneframework/core/model/HttpCache.java
index fae9dd6..995064c 100644
--- a/src/com/it114/android/oneframework/core/model/HttpCache.java
+++ b/src/com/it114/android/oneframework/core/model/HttpCache.java
@@ -12,7 +12,7 @@ public class HttpCache extends BaseModel{
@Override
- public boolean parseSuc() {
+ public boolean parseSuccess() {
return false;
}
diff --git a/src/com/it114/android/oneframework/core/model/UserModel.java b/src/com/it114/android/oneframework/core/model/UserModel.java
index ef61c70..c6519ef 100644
--- a/src/com/it114/android/oneframework/core/model/UserModel.java
+++ b/src/com/it114/android/oneframework/core/model/UserModel.java
@@ -11,7 +11,7 @@ public class UserModel extends DataModel {
public String username;
@Override
- public boolean parseSuc() {
+ public boolean parseSuccess() {
return false;
}
diff --git a/src/com/it114/android/oneframework/core/util/FileUtil.java b/src/com/it114/android/oneframework/core/util/FileUtil.java
index d42bc2e..381e1da 100644
--- a/src/com/it114/android/oneframework/core/util/FileUtil.java
+++ b/src/com/it114/android/oneframework/core/util/FileUtil.java
@@ -11,7 +11,7 @@
public class FileUtil {
/**
- * �õ�app�����ļ��У�����ʹ���ⲿ�洢�豸
+ * 得到app缓存文件夹,优先使用外部存储设备
* @return
*/
public static File getCacheDir(){
diff --git a/src/com/loopj/android/http/Base64.java b/src/com/loopj/android/http/Base64.java
index ad4dc66..de15adb 100644
--- a/src/com/loopj/android/http/Base64.java
+++ b/src/com/loopj/android/http/Base64.java
@@ -16,9 +16,7 @@
package com.loopj.android.http;
-
-
-import com.zijiayou360.app.android.BuildConfig;
+import com.it114.android.oneframework.core.BuildConfig;
import java.io.UnsupportedEncodingException;