add msg: download-complete

Author: vaenow

res/values-en/appupdate_strings.xml

@@ -7,6 +7,7 @@
     <string name="updating">Updating</string>
     <string name="update_cancel">Cancel</string>
     <string name="update_bg">Update in background</string>
+    <string name="download_complete">Download complete</string>
 
     <string name="update_error_title">Error</string>
     <string name="update_error_message">The current network is unavailable , please check your network settings.</string>

res/values-zh/appupdate_strings.xml

@@ -7,6 +7,7 @@
     <string name="updating">正在更新</string>
     <string name="update_cancel">取消</string>
     <string name="update_bg">转到后台更新</string>
+    <string name="download_complete">下载完毕</string>
 
     <string name="update_error_title">错误</string>
     <string name="update_error_message">当前网络不可用，请检查你的网络设置。</string>

res/values/appupdate_strings.xml

@@ -7,6 +7,7 @@
     <string name="updating">Updating</string>
     <string name="update_cancel">Cancel</string>
     <string name="update_bg">Update in background</string>
+    <string name="download_complete">Download complete</string>
 
     <string name="update_error_title">Error</string>
     <string name="update_error_message">The current network is unavailable , please check your network settings.</string>

src/android/DownloadApkThread.java

@@ -3,7 +3,6 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Handler;
 import android.os.Environment;
 import android.widget.ProgressBar;
 
@@ -28,22 +27,17 @@ public class DownloadApkThread implements Runnable {
     private String mSavePath;
     /* 记录进度条数量 */
     private int progress;
-    /* 更新进度条 */
-    private ProgressBar mProgress;
     /* 是否取消更新 */
     private boolean cancelUpdate = false;
     private AlertDialog mDownloadDialog;
     private DownloadHandler downloadHandler;
-    private MsgHelper msgHelper;
 
     public DownloadApkThread(Context mContext, ProgressBar mProgress, AlertDialog mDownloadDialog, HashMap<String, String> mHashMap) {
-        this.mProgress = mProgress;
         this.mDownloadDialog = mDownloadDialog;
         this.mHashMap = mHashMap;
 
-        this.msgHelper = new MsgHelper(mContext.getPackageName(), mContext.getResources());
         this.mSavePath = Environment.getExternalStorageDirectory() + "/" + "download"; // SD Path
-        this.downloadHandler = new DownloadHandler(mContext, mProgress, mSavePath, mHashMap);
+        this.downloadHandler = new DownloadHandler(mContext, mProgress, mDownloadDialog, this.mSavePath, mHashMap);
     }
 
 
@@ -95,8 +89,6 @@ private void downloadAndInstall() {
                     if (numread <= 0) {
                         // 下载完成
                         downloadHandler.sendEmptyMessage(Constants.DOWNLOAD_FINISH);
-                        mDownloadDialog.getButton(DialogInterface.BUTTON_NEGATIVE)
-                                .setText(msgHelper.getString(MsgHelper.UPDATE_COMPLETE));
                         break;
                     }
                     // 写入文件

src/android/DownloadHandler.java

@@ -1,6 +1,8 @@
 package com.vaenow.appupdate.android;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
@@ -25,8 +27,12 @@ public class DownloadHandler extends Handler {
     private String mSavePath;
     /* 保存解析的XML信息 */
     private HashMap<String, String> mHashMap;
+    private MsgHelper msgHelper;
+    private AlertDialog mDownloadDialog;
 
-    public DownloadHandler(Context mContext, ProgressBar mProgress, String mSavePath, HashMap<String, String> mHashMap) {
+    public DownloadHandler(Context mContext, ProgressBar mProgress, AlertDialog mDownloadDialog, String mSavePath, HashMap<String, String> mHashMap) {
+        this.msgHelper = new MsgHelper(mContext.getPackageName(), mContext.getResources());
+        this.mDownloadDialog = mDownloadDialog;
         this.mContext = mContext;
         this.mProgress = mProgress;
         this.mSavePath = mSavePath;
@@ -43,6 +49,8 @@ public void handleMessage(Message msg) {
             case Constants.DOWNLOAD_FINISH:
                 // 安装文件
                 installApk();
+                mDownloadDialog.getButton(DialogInterface.BUTTON_NEGATIVE)
+                        .setText(msgHelper.getString(MsgHelper.DOWNLOAD_COMPLETE));
                 break;
             default:
                 break;

src/android/MsgHelper.java

@@ -16,7 +16,7 @@ public class MsgHelper {
     public static String UPDATE_PROGRESS = "update_progress";
     public static String UPDATING = "updating";
     public static String UPDATE_BG = "update_bg";
-    public static String UPDATE_COMPLETE = "update_complete";
+    public static String DOWNLOAD_COMPLETE = "download_complete";
     public static String UPDATE_ERROR_TITLE = "update_error_title";
     public static String UPDATE_ERROR_MESSAGE = "update_error_message";
     public static String UPDATE_ERROR_YES_BTN = "update_error_yes_btn";

syncFromDemo.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# sync *.java
+cp -r ../cordova-plugin-app-update-demo/platforms/android/src/com/vaenow/appupdate/android/* src/android/
+
+# sync *.xml
+cp -r ../cordova-plugin-app-update-demo/platforms/android/res/values* res/
+
+# clean
+rm res/values/strings.xml
+