Skip to content

Commit

Permalink
1、修复添加参数错误问题
Browse files Browse the repository at this point in the history
2、版本检查和下载分离
  • Loading branch information
Zzhengsr committed May 20, 2020
1 parent b49e936 commit 5eef069
Show file tree
Hide file tree
Showing 24 changed files with 495 additions and 331 deletions.
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

568 changes: 316 additions & 252 deletions .idea/workspace.xml

Large diffs are not rendered by default.

31 changes: 16 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ allprojects {
然后把 ZDloader 写上:
[![](https://jitpack.io/v/LillteZheng/AppUpdate.svg)](https://jitpack.io/#LillteZheng/AppUpdate)
```
implementation 'com.github.LillteZheng:AppUpdate:v1.2'
implementation 'com.github.LillteZheng:AppUpdate:v1.3'
```

**由于使用了 retrofit 和rxjava 等框架,所以,还需要在您的工程中添加以下关联,不然报错**
Expand All @@ -48,24 +48,25 @@ implementation 'com.github.LillteZheng:AppUpdate:v1.2'
## 一、检查版本

```
ZDown.with(this)
.url(jsonUrlTest)
.listener(new CheckListener<TestBean>(TestBean.class) {
@Override
public void onCheck(final TestBean data) {
}
@Override
public void onFail(String errorMsg) {
Log.d(TAG, "zsr onFail: " + errorMsg);
}
}).check();
ZDown.checkWith(this)
.url(jsonUrlTest)
.get()
.listener(new CheckListener<TestBean>() {
@Override
public void onCheck(final TestBean data) {
Log.d(TAG, "zsr onCheck: " + data);
}
@Override
public void onFail(String errorMsg) {
Log.d(TAG, "zsr onFail: " + errorMsg);
}
}).check();
```

在listener中,可以把要转换的数据写上,如果不想转换成实体 bean,直接 String.class 就是返回原始的字符串了。
checkWith 还支持写入参数,使用 params(..) ,支持 get() 和 post()


在检查完版本,可以使用如下代码下载文件:
Expand Down
4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android {
compileSdkVersion 28
buildToolsVersion "29.0.2"
defaultConfig {
applicationId "com.zhengsr.zupdate"
applicationId "com.zhengsr.appupdate"
minSdkVersion 19
targetSdkVersion 28
versionCode 1
Expand All @@ -17,6 +17,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
Expand All @@ -36,4 +37,5 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-scalars:2.4.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
implementation 'com.daimajia.numberprogressbar:library:1.4@aar'

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zhengsr.zupdate;
package com.zhengsr.appupdate;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zhengsr.zupdate">
package="com.zhengsr.appupdate">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand All @@ -12,7 +12,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name="com.zhengsr.appupdate.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zhengsr.zupdate;
package com.zhengsr.appupdate;

import android.app.Dialog;
import android.content.Context;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
package com.zhengsr.zupdate;
package com.zhengsr.appupdate;

import android.app.Notification;
import android.app.NotificationManager;
import android.graphics.BitmapFactory;
import android.os.Environment;
import android.support.v4.app.NotificationCompat;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.text.format.Formatter;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

import com.daimajia.numberprogressbar.NumberProgressBar;

import com.zhengsr.zdwon_lib.ZDown;
import com.zhengsr.zdwon_lib.bean.ZBean;
import com.zhengsr.zdwon_lib.callback.CheckListener;
import com.zhengsr.zdwon_lib.callback.TaskListener;
import com.zhengsr.zdwon_lib.utils.ZCommontUitls;


public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity";
// String fileUrlTest = "http://192.168.1.154:8089/xampp.exe";
Expand Down Expand Up @@ -48,9 +44,12 @@ protected void onCreate(Bundle savedInstanceState) {

public void check(View view) {

ZDown.with(this)


ZDown.checkWith(this)
.url(jsonUrlTest)
.listener(new CheckListener<TestBean>(TestBean.class) {
.get()
.listener(new CheckListener<TestBean>() {
@Override
public void onCheck(final TestBean data) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zhengsr.zupdate;
package com.zhengsr.appupdate;

/**
* @auther by zhengshaorui on 2020/3/22
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zhengsr.zupdate;
package com.zhengsr.appupdate;

import org.junit.Test;

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ allprojects {
repositories {
google()
jcenter()
maven { url 'https://jitpack.io' }

}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include ':app', ':update-lib'
rootProject.name='ZUpdate'

7 changes: 6 additions & 1 deletion update-lib/src/main/java/com/zhengsr/zdwon_lib/ZDown.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@

import com.zhengsr.zdwon_lib.callback.BaseListener;
import com.zhengsr.zdwon_lib.entrance.RequestManager;
import com.zhengsr.zdwon_lib.entrance.CheckRequest;
import com.zhengsr.zdwon_lib.entrance.imp.db.ZDBManager;
import com.zhengsr.zdwon_lib.entrance.imp.task.ZDownTask;

/**
* @auther by zhengshaorui on 2020/3/21
* describe: 一个对外的统一接口
*/
public class ZDown {

public static CheckRequest checkWith(Context context){
return CheckRequest.get(context);
}

public static RequestManager with(Context context){
ZDBManager.getInstance().config(context.getApplicationContext());
return RequestManager.getInstance().with(context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.zhengsr.zdwon_lib.callback.BaseListener;

import java.util.LinkedHashMap;
import java.util.Map;

/**
Expand Down Expand Up @@ -43,7 +44,7 @@ public class ZTaskBean {
/**
* post 的参数
*/
public Map<String,String> paramsMap;
public Map<String,String> paramsMap = new LinkedHashMap<>();
/**
* 是否允许后台更新
*/
Expand All @@ -63,4 +64,9 @@ public class ZTaskBean {
* 监听回调
*/
public BaseListener listener;

/**
* 是否为 get 请求,默认为true
*/
public boolean isGet = true;
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
package com.zhengsr.zdwon_lib.callback;

import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;

/**
* @auther by zhengshaorui on 2020/3/22
* describe: 检查版本的listener
*/
public abstract class CheckListener<T> implements BaseListener {

public Class<?> mclazz;
private Class<T> classType;
public CheckListener() {
try {
Type parentType = getClass().getGenericSuperclass();
Type type = ((ParameterizedType)parentType).getActualTypeArguments()[0];
classType = (Class<T>) type;
} catch (Exception e) {
e.printStackTrace();
}
}

public CheckListener(Class<?> mclazz) {
this.mclazz = mclazz;
public Class<T> getClassType() {
return classType;
}

public abstract void onCheck(T data);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package com.zhengsr.zdwon_lib.entrance;

import android.content.Context;

import com.zhengsr.zdwon_lib.bean.ZTaskBean;
import com.zhengsr.zdwon_lib.callback.CheckListener;
import com.zhengsr.zdwon_lib.entrance.imp.task.ZCheckTask;

import java.util.Map;

/**
* @author by zhengshaorui on 2019/9/6
* Describe:
*/
public class CheckRequest {

private ZTaskBean mBean;

public static CheckRequest get(Context context) {

return new CheckRequest(context);
}

private CheckRequest(Context context) {
mBean = new ZTaskBean();
mBean.context = context.getApplicationContext();
}

public CheckRequest url(String url) {
mBean.url = url;
return this;
}

public CheckRequest listener(CheckListener listener) {
mBean.listener = listener;
return this;
}

public CheckRequest paramsMap(Map<String, String> map) {
mBean.paramsMap.clear();
mBean.paramsMap.putAll(map);
return this;
}

public CheckRequest params(String key, String value) {
mBean.paramsMap.put(key, value);
return this;
}


public CheckRequest get() {
mBean.isGet = true;
return this;
}


public CheckRequest post() {
mBean.isGet = false;
return this;
}

public void check(){
mBean = new CheckParams().checkJsonUrl(mBean);
new ZCheckTask(mBean);
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.zhengsr.zdwon_lib.entrance;

import android.content.Context;
import android.util.Log;

import com.zhengsr.zdwon_lib.bean.ZTaskBean;
import com.zhengsr.zdwon_lib.callback.BaseListener;
import com.zhengsr.zdwon_lib.entrance.imp.task.ZCheckTask;
import com.zhengsr.zdwon_lib.callback.TaskListener;
import com.zhengsr.zdwon_lib.entrance.imp.task.ZDownTask;
import com.zhengsr.zdwon_lib.bean.ZTaskBean;
import com.zhengsr.zdwon_lib.widget.InvisiabelFragment;

import java.util.Map;
Expand Down Expand Up @@ -77,7 +75,7 @@ public RequestManager reFreshTime(int reFreshTime) {
return this;
}

public RequestManager listener(BaseListener listener){
public RequestManager listener(TaskListener listener){
mBean.listener = listener;
return this;
}
Expand Down Expand Up @@ -105,13 +103,8 @@ public RequestManager params(String key,String value){
}


/**
* 检查版本
*/
public void check(){
mBean = new CheckParams().checkJsonUrl(mBean);
new ZCheckTask(mBean);
}



/**
* 下载
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;


import com.zhengsr.zdwon_lib.bean.ZThreadBean;
Expand Down
Loading

0 comments on commit 5eef069

Please sign in to comment.