From 69bf02bdd6b70469a9d56810f61e86e6bac97cb6 Mon Sep 17 00:00:00 2001 From: WVector <1964414877@qq.com> Date: Thu, 13 Jul 2017 11:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=BF=87=E5=A4=9A=EF=BC=8C=E7=95=8C=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../vector/appupdatedemo/MainActivity.java | 11 ++-- update-app/build.gradle | 2 +- .../com/vector/update_app/DialogActivity.java | 2 - .../update_app/view/AutoScrollView.java | 54 +++++++++++++++++++ .../main/res/layout/lib_update_app_dialog.xml | 17 ++++-- 6 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 update-app/src/main/java/com/vector/update_app/view/AutoScrollView.java diff --git a/README.md b/README.md index b57116c..523133a 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ ```gradle dependencies { - compile 'com.qianwen:update-app:3.2.5' + compile 'com.qianwen:update-app:3.2.6' } ``` diff --git a/app/src/main/java/com/vector/appupdatedemo/MainActivity.java b/app/src/main/java/com/vector/appupdatedemo/MainActivity.java index ae3a740..da6d5a5 100644 --- a/app/src/main/java/com/vector/appupdatedemo/MainActivity.java +++ b/app/src/main/java/com/vector/appupdatedemo/MainActivity.java @@ -251,10 +251,15 @@ protected UpdateAppBean parseJson(String json) { .setApkFileUrl(jsonObject.optString("apk_file_url")) //大小 .setTargetSize(jsonObject.optString("target_size")) - //更新内容 - .setUpdateLog(jsonObject.optString("update_log")) + //更新内容 测试更新内容过多 + .setUpdateLog("1，添加删除信用卡接口\n2，添加vip认证\n3，区分自定义消费，一个小时不限制。\n4，添加放弃任务接口，小时内不生成。\n5，消费任务手动生成。" + + "1，添加删除信用卡接口\n2，添加vip认证\n3，区分自定义消费，一个小时不限制。\n4，添加放弃任务接口，小时内不生成。\n5，消费任务手动生成。" + + "1，添加删除信用卡接口\n2，添加vip认证\n3，区分自定义消费，一个小时不限制。\n4，添加放弃任务接口，小时内不生成。\n5，消费任务手动生成。" + + "1，添加删除信用卡接口\n2，添加vip认证\n3，区分自定义消费，一个小时不限制。\n4，添加放弃任务接口，小时内不生成。\n5，消费任务手动生成。" + + "1，添加删除信用卡接口\n2，添加vip认证\n3，区分自定义消费，一个小时不限制。\n4，添加放弃任务接口，小时内不生成。\n5，消费任务手动生成。" + + "1，添加删除信用卡接口\n2，添加vip认证\n3，区分自定义消费，一个小时不限制。\n4，添加放弃任务接口，小时内不生成。\n5，消费任务手动生成。") //是否强制更新 - .setConstraint(true); + .setConstraint(false); //设置md5 // .setNewMd5(jsonObject.optString("new_md5ddfdfdf")); } catch (JSONException e) { diff --git a/update-app/build.gradle b/update-app/build.gradle index e2dcedb..95c896f 100644 --- a/update-app/build.gradle +++ b/update-app/build.gradle @@ -41,7 +41,7 @@ publish { userOrg = 'qianwen'//bintray.com用户名 groupId = 'com.qianwen'//jcenter上的路径 artifactId = 'update-app'//项目名称 - publishVersion = '3.2.5'//版本号 + publishVersion = '3.2.6'//版本号 desc = 'App update tools' website = 'https://github.com/WVector/AppUpdateDemo' } diff --git a/update-app/src/main/java/com/vector/update_app/DialogActivity.java b/update-app/src/main/java/com/vector/update_app/DialogActivity.java index 849fa32..8a7b13d 100644 --- a/update-app/src/main/java/com/vector/update_app/DialogActivity.java +++ b/update-app/src/main/java/com/vector/update_app/DialogActivity.java @@ -206,8 +206,6 @@ private void installApp() { if (!TextUtils.isEmpty(mUpdateApp.getNewMd5()) && appFile.exists() && Md5Util.getFileMD5(appFile).equalsIgnoreCase(mUpdateApp.getNewMd5())) { - - Uri fileUri = FileProvider.getUriForFile(this, getApplicationContext().getPackageName() + ".fileProvider", appFile); Intent intent = new Intent(Intent.ACTION_VIEW); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/update-app/src/main/java/com/vector/update_app/view/AutoScrollView.java b/update-app/src/main/java/com/vector/update_app/view/AutoScrollView.java new file mode 100644 index 0000000..084963e --- /dev/null +++ b/update-app/src/main/java/com/vector/update_app/view/AutoScrollView.java @@ -0,0 +1,54 @@ +package com.vector.update_app.view; + +import android.app.Activity; +import android.content.Context; +import android.util.AttributeSet; +import android.util.DisplayMetrics; +import android.view.Display; +import android.widget.ScrollView; + +/** + * Created by Vector + * on 2017/7/13 0013. + */ + +public class AutoScrollView extends ScrollView { + private Context mContext; + + public AutoScrollView(Context context) { + super(context); + init(context); + } + + public AutoScrollView(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + + } + + public AutoScrollView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + private void init(Context context) { + mContext = context; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + try { + //最大高度显示为屏幕内容高度的一半 + Display display = ((Activity) mContext).getWindowManager().getDefaultDisplay(); + DisplayMetrics d = new DisplayMetrics(); + display.getMetrics(d); + //此处是关键，设置控件高度不能超过屏幕高度一半（在此替换成自己需要的高度） + heightMeasureSpec = MeasureSpec.makeMeasureSpec(d.heightPixels / 3, MeasureSpec.AT_MOST); + + } catch (Exception e) { + e.printStackTrace(); + } + //重新计算控件高、宽 + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } +} diff --git a/update-app/src/main/res/layout/lib_update_app_dialog.xml b/update-app/src/main/res/layout/lib_update_app_dialog.xml index c09ec7c..4a46ca6 100644 --- a/update-app/src/main/res/layout/lib_update_app_dialog.xml +++ b/update-app/src/main/res/layout/lib_update_app_dialog.xml @@ -34,15 +34,22 @@ android:textColor="@android:color/black" android:textSize="15sp"/> - + android:scrollbars="none"> + + + +