版本升级页面

app/build.gradle

@@ -36,6 +36,7 @@ android {
             buildConfigField "String", "API_PATH", rootProject.ext.release.apiName
             buildConfigField "String", "FILEAPI_HOST", rootProject.ext.release.fileApiHost
             buildConfigField "String", "FILEAPI_PATH", rootProject.ext.release.fileApiName
+            buildConfigField "String", "prjectName", rootProject.ext.release.prjectName
         }
         debug {
 //            debuggable true // 是否调试
@@ -47,6 +48,7 @@ android {
             buildConfigField "String", "API_PATH", rootProject.ext.debug.apiName
             buildConfigField "String", "FILEAPI_HOST", rootProject.ext.debug.fileApiHost
             buildConfigField "String", "FILEAPI_PATH", rootProject.ext.debug.fileApiName
+            buildConfigField "String", "prjectName", rootProject.ext.debug.prjectName
         }
     }
 
@@ -124,6 +126,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
     implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0'
+    implementation 'cn.yhq:android-dialog:1.6.0'
 }
 
 // SH1: 84:DD:2A:D6:4A:63:12:6B:06:9F:24:38:1F:57:32:8F:4D:5F:EE:78

app/src/main/AndroidManifest.xml

@@ -144,9 +144,12 @@
             android:configChanges="orientation|screenSize"
             android:theme="@style/ThemeNoTitleBar" />
 
+        <activity android:name="com.hw.nativeapp.ui.activity.SettingActivity"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.hw.airportwine.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:replace="android:authorities,android:exported">

app/src/main/java/com/hw/nativeapp/config/Contents.java

@@ -7,7 +7,7 @@ public class Contents {
     public static final String TOKEN_HEAD = "Authorization";
 
     //APPID  - 升级使用
-    public static final String APPID = "AIR_PORT_ID";
+    public static final String APPID = "self_key";
 
     //临时存储key
     //登录验证码uuid

app/src/main/java/com/hw/nativeapp/httpnet/ApiService.java

@@ -34,7 +34,7 @@ public interface ApiService {
             );
 
     //版本升级
-    @POST(COMMON + "/system/appversion/upgrade-by-appid")
+    @POST(COMMON + "/system/appVersion/check")
     Observable<ResponseData<UpdateVerAskBean>> version(
             @Body UpdateVerReqBean bean,
             @Query("t") Long currtime

app/src/main/java/com/hw/nativeapp/httpnet/entity/UpdateVerAskBean.java

@@ -6,7 +6,8 @@ public class UpdateVerAskBean {
     public String  versionCode;
     public String  versionName;
     public String  note;
-    public String  pkgUrl;
+    public String  downloadUrl;
+    public Integer fileSize;
 
 
 }

app/src/main/java/com/hw/nativeapp/httpnet/entity/UpdateVerReqBean.java

@@ -5,13 +5,7 @@ public class UpdateVerReqBean {
     /**
      * APPID
      */
-    public String appId;
-
-    /**
-     * 应用名称
-     */
-    public String name;
-
+    public String appKeyId;
 
     /**
      * 版本名称

app/src/main/java/com/hw/nativeapp/ui/activity/SettingActivity.java

@@ -0,0 +1,150 @@
+package com.hw.nativeapp.ui.activity;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.blankj.utilcode.util.SPUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.hw.nativeapp.BuildConfig;
+import com.hw.nativeapp.MApplication;
+import com.hw.nativeapp.R;
+import com.hw.nativeapp.config.Contents;
+import com.hw.nativeapp.httpnet.ErrorConsumer;
+import com.hw.nativeapp.httpnet.ResponseConsumer;
+import com.hw.nativeapp.httpnet.entity.UpdateVerAskBean;
+import com.hw.nativeapp.httpnet.entity.UpdateVerReqBean;
+import com.hw.nativeapp.update.UpdateHandler;
+import com.hw.nativeapp.utils.ActivityUtils;
+import com.hw.nativeapp.utils.RxUtil;
+
+import java.math.BigDecimal;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import cn.yhq.dialog.core.DialogBuilder;
+import cn.yhq.dialog.core.IDialog;
+
+/**
+ * 设置页面
+ * SettingActivity
+ *
+ * @author Geh
+ * @Admonish This is the ancestral code from Geh, please check!
+ * @time 2021/6/30 22:49
+ */
+public class SettingActivity extends BaseActivity {
+
+
+    @BindView(R.id.tx_appversion)
+    TextView txAppversion;
+    @BindView(R.id.tx_serial)
+    TextView txSerial;
+    @BindView(R.id.tx_projectName)
+    TextView projectName;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting);
+    }
+
+    @Override
+    public void initView() {
+        try {
+            PackageManager manager = this.getPackageManager();
+            PackageInfo packageInfo = manager.getPackageInfo(this.getPackageName(), 0);
+            txAppversion.setText(packageInfo.versionName + "." + packageInfo.versionCode);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        projectName.setText("(" + BuildConfig.prjectName + ")");
+    }
+
+
+    @OnClick({ R.id.btn_update})
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.btn_update:
+                update();
+                break;
+
+        }
+    }
+
+    private void update(){
+        try {
+            UpdateVerReqBean bean = new UpdateVerReqBean();
+            bean.appKeyId = Contents.APPID;
+            PackageManager manager = this.getPackageManager();
+            PackageInfo packageInfo = manager.getPackageInfo(this.getPackageName(), 0);
+            bean.versionName = packageInfo.versionName;
+            bean.versionCode = packageInfo.versionCode;
+            MApplication.getApiService().version(bean,System.currentTimeMillis()/1000)
+                    .compose(RxUtil.applyObservableAsync())
+                    .subscribe(new ResponseConsumer<UpdateVerAskBean>() {
+                        @Override
+                        public void onSuccess(UpdateVerAskBean data) {
+                            if (!data.isUpload){
+                                ToastUtils.showLong("当前为最新版本");
+                            }else {
+                                showUpdate(data,packageInfo);
+                            }
+                        }
+                    },new ErrorConsumer());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    private void showUpdate(UpdateVerAskBean bean,PackageInfo packageInfo){
+        String note = "版本:" + packageInfo.versionName + "." + packageInfo.versionCode + "->" +
+                 bean.versionName + "." + bean.versionCode + "\n" +
+                "版本描述:" + bean.note;
+
+        DialogBuilder.alertDialog(this).setMessage(note)
+                .setOnPositiveButtonClickListener((dialog, which) ->
+                        startDownload(bean.downloadUrl,bean.fileSize))
+                .create().show();
+    }
+
+    private void startDownload(String downUrl, Integer fileSize){
+
+        DialogBuilder.ProgressHandler progressHandler =
+                new DialogBuilder.ProgressHandler();
+
+        IDialog dialogBuilder = DialogBuilder.progressDialog(this).progressHandler(progressHandler).show();
+
+        UpdateHandler updateHandler = new UpdateHandler(SettingActivity.this,downUrl);
+        updateHandler.setOnListener(new UpdateHandler.OnDownloadListener() {
+                    @Override
+                    public void complate() {
+                        dialogBuilder.dismiss();
+                    }
+
+                    @Override
+                    public void progress(int soFarBytes, int totalBytes) {
+                        if (totalBytes <= 0){
+                            totalBytes = fileSize;
+                        }
+                        BigDecimal a = BigDecimal.valueOf(soFarBytes);
+                        BigDecimal b = BigDecimal.valueOf(totalBytes);
+
+                        int pprogress = a.divide(b,2,BigDecimal.ROUND_HALF_UP)
+                                .multiply(BigDecimal.valueOf(100))
+                                .intValue();
+                        progressHandler.setProgress(pprogress);
+                    }
+                });
+                updateHandler.start();
+
+
+    }
+
+}

app/src/main/java/com/hw/nativeapp/update/UpdateHandler.java

@@ -0,0 +1,129 @@
+package com.hw.nativeapp.update;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.core.content.FileProvider;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.hw.nativeapp.utils.FileUtils;
+import com.hw.nativeapp.utils.StringUtils;
+import com.liulishuo.filedownloader.BaseDownloadTask;
+import com.liulishuo.filedownloader.FileDownloadListener;
+import com.liulishuo.filedownloader.FileDownloader;
+import com.liulishuo.filedownloader.util.FileDownloadUtils;
+
+import java.io.File;
+
+
+public class UpdateHandler {
+
+    public static final String TAG = UpdateHandler.class.getName();
+
+    private String downloadUrl;
+    private String downloadLocalPath;
+    private Context context;
+    private OnDownloadListener onDownloadListener;
+
+    public UpdateHandler(Context context , String downloadUrl){
+        this.downloadUrl = downloadUrl;
+        this.context = context;
+    }
+
+    public interface OnDownloadListener {
+        void complate();
+        void progress(int soFarBytes, int totalBytes);
+    }
+
+    public void setOnListener(OnDownloadListener listener) {
+        this.onDownloadListener = listener;
+    }
+
+
+    public void start(){
+        if (StringUtils.isEmpty(this.downloadUrl)){
+            ToastUtils.showLong("下载地址为空");
+        }
+        this.downloadLocalPath = FileDownloadUtils.getDefaultSaveRootPath() + File.separator + "tmpdir1" + File.separator +
+                "download.apk";
+        if (FileUtils.isFileExists(this.downloadLocalPath)){
+            FileUtils.deleteFile(this.downloadLocalPath);
+        }
+        Log.d("download", "下载地址 ---->" + this.downloadUrl );
+        Log.d("download", "存储路径 ---->" + this.downloadLocalPath );
+        FileDownloader.getImpl().create(this.downloadUrl)
+                .setPath(this.downloadLocalPath)
+                .setListener(new FileDownloadListener() {
+                    @Override
+                    protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                        Log.d("download", "pending ---->");
+                    }
+
+                    @Override
+                    protected void connected(BaseDownloadTask task, String etag, boolean isContinue, int soFarBytes, int totalBytes) {
+                        Log.d("download", "connected ---->");
+                    }
+
+                    @Override
+                    protected void progress(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                        Log.d("download", "progress ---->" + soFarBytes + ":" + totalBytes);
+                        onDownloadListener.progress(soFarBytes, totalBytes);
+                    }
+
+                    @Override
+                    protected void blockComplete(BaseDownloadTask task) {
+                        Log.d("download", "blockComplete ---->");
+                    }
+
+                    @Override
+                    protected void retry(final BaseDownloadTask task, final Throwable ex, final int retryingTimes, final int soFarBytes) {
+                        Log.d("download", "retry ---->");
+                    }
+
+                    @Override
+                    protected void completed(BaseDownloadTask task) {
+                        Log.d("download", "completed ---->");
+                        onDownloadListener.complate();
+                        installApk();
+                    }
+
+                    @Override
+                    protected void paused(BaseDownloadTask task, int soFarBytes, int totalBytes) {
+                        Log.d("download", "paused ---->");
+                    }
+
+                    @Override
+                    protected void error(BaseDownloadTask task, Throwable e) {
+                        Log.d("download", "error ---->");
+                    }
+
+                    @Override
+                    protected void warn(BaseDownloadTask task) {
+                        Log.d("download", "warn ---->");
+                    }
+                }).start();
+    }
+
+    private void installApk(){
+
+        File apkFile = new File(this.downloadLocalPath);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Log.w(TAG, "版本大于 N ，开始使用 fileProvider 进行安装");
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            Uri contentUri = FileProvider.getUriForFile(
+                    this.context
+                    , "com.hw.great.provider"
+                    , apkFile);
+            intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
+        } else {
+            Log.w(TAG, "正常进行安装");
+            intent.setDataAndType(Uri.fromFile(apkFile), "application/vnd.android.package-archive");
+        }
+        this.context.startActivity(intent);
+    }
+}

app/src/main/java/com/hw/nativeapp/utils/UpgradeUtils.java

@@ -23,8 +23,7 @@ public class UpgradeUtils {
     public static  void upgrade(Context context){
         try {
             UpdateVerReqBean bean = new UpdateVerReqBean();
-            bean.appId = Contents.APPID;
-            bean.name = context.getResources().getString(R.string.app_name);
+            bean.appKeyId = Contents.APPID;
             PackageManager manager = context.getPackageManager();
             PackageInfo packageInfo = manager.getPackageInfo(context.getPackageName(), 0);
             bean.versionName = packageInfo.versionName;
@@ -56,7 +55,7 @@ public class UpgradeUtils {
                 .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
                 .setPositionButton("确定", (dialog, which) -> {
                     dialog.dismiss();
-                    startDownload(context, bean.pkgUrl);
+                    startDownload(context, bean.downloadUrl);
                 })
                 .create()
                 .show();

app/src/main/res/layout/activity_setting.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F4F4F4"
+    android:orientation="vertical">
+<LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_margin="@dimen/dp_10"
+    android:background="@drawable/bg_corners_01">
+
+
+
+
+    <View
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#E9E9E9" />
+
+    <LinearLayout
+        android:id="@+id/btn_update"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_10"
+        android:gravity="center"
+        android:background="@drawable/bg_corners_01"
+        android:orientation="horizontal">
+
+
+        <TextView
+            android:layout_marginStart="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="版本检测"
+            android:textColor="#484848"
+            android:textSize="23sp" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+        <ImageView
+
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:background="@mipmap/arrow_right" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#E9E9E9" />
+
+</LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="版本号:">
+
+            </TextView>
+            <TextView
+                android:id="@+id/tx_appversion"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="1.0.0.1">
+
+            </TextView>
+        </LinearLayout>
+        <LinearLayout
+            android:gravity="center"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="序列号:">
+
+            </TextView>
+            <TextView
+                android:id="@+id/tx_serial"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="00000000000">
+
+            </TextView>
+            <TextView
+                android:id="@+id/tx_projectName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="(测试)">
+            </TextView>
+        </LinearLayout>
+    </LinearLayout>
+
+
+
+
+</FrameLayout>

config.gradle

@@ -21,7 +21,7 @@ ext {
             "apiName"      : '""',
             "fileApiHost"      : '""',
             "fileApiName"      : '""',
-
+            "prjectName" : '"正式"',
             // 高德地图
             "AMAP_API_KEY" : "565ad55bec6d286e33a95a9ff1911b55",
 
@@ -33,6 +33,7 @@ ext {
             "apiName"      : '"serviceapi"',
             "fileApiHost"      : '"https://fileupload.hw.hongweisoft.com"',
             "fileApiName"      : '""',
+            "prjectName" : '"测试"',
 
             // 高德地图
             "AMAP_API_KEY" : "565ad55bec6d286e33a95a9ff1911b55",