Merge branch 'master' into allwinner
# Conflicts: # app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java # app/src/main/java/com/aoleyun/sn/push/PushManager.java
This commit is contained in:
@@ -1536,7 +1536,7 @@ public class JgyUtils {
|
||||
packageInfo = pm.getPackageInfo(app_package, 0);
|
||||
} catch (PackageManager.NameNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
Log.e("fht", "forceDownload=" + e.getMessage());
|
||||
Log.e("forceDownload", "forceDownload=" + e.getMessage());
|
||||
}
|
||||
if (packageInfo != null) {
|
||||
long appVersionCode;
|
||||
@@ -1546,11 +1546,11 @@ public class JgyUtils {
|
||||
appVersionCode = packageInfo.versionCode;
|
||||
}
|
||||
if (app_version_code > appVersionCode) {
|
||||
Log.e("fht ", "download URL " + app_url);
|
||||
Log.e("forceDownload ", "download URL " + app_url);
|
||||
Utils.ariaDownload(mContext, app_url, jsonObject);
|
||||
}
|
||||
} else {
|
||||
Log.e("fht ", "download URL " + app_url);
|
||||
Log.e("forceDownload ", "download URL " + app_url);
|
||||
Utils.ariaDownload(mContext, app_url, jsonObject);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user