Skip to content

polysoft-nafmii / polysoft-android

Go to a project
Commit 73bf4761 by amateur
Options

1

1 parent 2e1d44da
Inline Side-by-side
Showing 5 changed files with 19 additions and 25 deletions
app/build.gradle
...@@ -17,7 +17,6 @@ android { ...@@ -17,7 +17,6 @@ android {
flavorDimensions "versionCode" flavorDimensions "versionCode"
flavorDimensions "versionName" flavorDimensions "versionName"
buildConfigField "String", "UNZIP_KEY", "\"UNZIP_ASSETS_1\""
buildConfigField "String", "ASSETS_DIST_DIR", "\"\"" buildConfigField "String", "ASSETS_DIST_DIR", "\"\""
buildConfigField "String", "API_HOST", "\"http://10.10.81.189/nafmii/app/\"" buildConfigField "String", "API_HOST", "\"http://10.10.81.189/nafmii/app/\""
buildConfigField "String", "IMG_API", "\"http://10.10.81.172/group1/\"" buildConfigField "String", "IMG_API", "\"http://10.10.81.172/group1/\""
...@@ -100,6 +99,7 @@ android { ...@@ -100,6 +99,7 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
resValue "string", "app_name", "NAFMII之窗" resValue "string", "app_name", "NAFMII之窗"
buildConfigField "String", "UNZIP_KEY", "\"UNZIP_RELEASE_V1\""
buildConfigField "String", "H5_VERSION", "\"1.0.0\"" buildConfigField "String", "H5_VERSION", "\"1.0.0\""
buildConfigField "String", "ASSETS_DIST_DIR", "\"release\"" buildConfigField "String", "ASSETS_DIST_DIR", "\"release\""
buildConfigField "String", "WX_APPID", "\"wx9e7f89e43fc75dae\"" buildConfigField "String", "WX_APPID", "\"wx9e7f89e43fc75dae\""
...@@ -127,6 +127,7 @@ android { ...@@ -127,6 +127,7 @@ android {
resValue "string", "app_name", "NAFMII之窗-qp" resValue "string", "app_name", "NAFMII之窗-qp"
applicationIdSuffix "qp" applicationIdSuffix "qp"
versionNameSuffix ".2" versionNameSuffix ".2"
buildConfigField "String", "UNZIP_KEY", "\"UNZIP_PRE_V1\""
buildConfigField "String", "H5_VERSION", "\"1.0.8\"" buildConfigField "String", "H5_VERSION", "\"1.0.8\""
buildConfigField "String", "ASSETS_DIST_DIR", "\"pre\"" buildConfigField "String", "ASSETS_DIST_DIR", "\"pre\""
buildConfigField "String", "WX_APPID", "\"wx0c80bdc32795951b\"" buildConfigField "String", "WX_APPID", "\"wx0c80bdc32795951b\""
...@@ -149,6 +150,7 @@ android { ...@@ -149,6 +150,7 @@ android {
resValue "string", "app_name", "NAFMII之窗-uat" resValue "string", "app_name", "NAFMII之窗-uat"
applicationIdSuffix "uat" applicationIdSuffix "uat"
versionNameSuffix ".2" versionNameSuffix ".2"
buildConfigField "String", "UNZIP_KEY", "\"UNZIP_UAT_V1\""
buildConfigField "String", "H5_VERSION", "\"1.0.8\"" buildConfigField "String", "H5_VERSION", "\"1.0.8\""
buildConfigField "String", "ASSETS_DIST_DIR", "\"uat\"" buildConfigField "String", "ASSETS_DIST_DIR", "\"uat\""
buildConfigField "String", "WX_APPID", "\"wxb9dd952e6522ef31\"" buildConfigField "String", "WX_APPID", "\"wxb9dd952e6522ef31\""
...@@ -170,6 +172,7 @@ android { ...@@ -170,6 +172,7 @@ android {
resValue "string", "app_name", "NAFMII之窗-dev" resValue "string", "app_name", "NAFMII之窗-dev"
applicationIdSuffix "dev" applicationIdSuffix "dev"
versionNameSuffix ".4" versionNameSuffix ".4"
buildConfigField "String", "UNZIP_KEY", "\"UNZIP_DEV_V1\""
buildConfigField "String", "H5_VERSION", "\"1.0.8\"" buildConfigField "String", "H5_VERSION", "\"1.0.8\""
buildConfigField "String", "ASSETS_DIST_DIR", "\"dev\"" buildConfigField "String", "ASSETS_DIST_DIR", "\"dev\""
buildConfigField "String", "WX_APPID", "\"wx06a3b88ecb27f0d8\"" buildConfigField "String", "WX_APPID", "\"wx06a3b88ecb27f0d8\""
......
app/src/main/java/com/polysoft/nafmii/fragment/dialog/DownloadDialog.java
package com.polysoft.nafmii.fragment.dialog; package com.polysoft.nafmii.fragment.dialog;
import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.webkit.MimeTypeMap;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -18,7 +14,6 @@ import androidx.fragment.app.DialogFragment; ...@@ -18,7 +14,6 @@ import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import com.polysoft.nafmii.net.OkhttpApi; import com.polysoft.nafmii.net.OkhttpApi;
import com.polysoft.nafmii.utils.FileProviderUtils;
import com.polysoft.nafmii.utils.FileUtils; import com.polysoft.nafmii.utils.FileUtils;
import com.polysoft.nafmii.utils.ToastUtils; import com.polysoft.nafmii.utils.ToastUtils;
import com.whaty.nafmii.R; import com.whaty.nafmii.R;
...@@ -100,12 +95,12 @@ public class DownloadDialog extends DialogFragment { ...@@ -100,12 +95,12 @@ public class DownloadDialog extends DialogFragment {
private void openFile(File file) { private void openFile(File file) {
Intent intent = new Intent(Intent.ACTION_VIEW); // Intent intent = new Intent(Intent.ACTION_VIEW);
Uri fileUri = FileProviderUtils.getUriForFile(getContext(), file); // Uri fileUri = FileProviderUtils.getUriForFile(getContext(), file);
String extension = MimeTypeMap.getFileExtensionFromUrl(fileUri.toString()); // String extension = MimeTypeMap.getFileExtensionFromUrl(fileUri.toString());
String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); // String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
intent.setDataAndType(fileUri, mimeType); // intent.setDataAndType(fileUri, mimeType);
getActivity().startActivity(intent); // getActivity().startActivity(intent);
} }
} }
app/src/main/java/com/polysoft/nafmii/fragment/dialog/UpdateDialog.java
...@@ -33,12 +33,6 @@ import java.io.File; ...@@ -33,12 +33,6 @@ import java.io.File;
public class UpdateDialog extends DialogFragment implements View.OnClickListener { public class UpdateDialog extends DialogFragment implements View.OnClickListener {
public static UpdateDialog show(FragmentManager mgr, UpdateVersion info) { public static UpdateDialog show(FragmentManager mgr, UpdateVersion info) {
// if (null == info) {
// info = new UpdateVersion();
// info.setIsForce("0");
// info.setvNumber("2.1.1");
// info.setLocation("https://cos.pgyer.com/319735d279de31ab4aea67d07c0706e3.apk?sign=34fa92d8e78cc084322dc868a10299ab&t=1634904770&response-content-disposition=attachment%3Bfilename%3DNAFMII%E4%B9%8B%E7%AA%97-qp_2.1.apk");
// }
UpdateDialog dialog = new UpdateDialog(); UpdateDialog dialog = new UpdateDialog();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("data", JSON.toJSONString(info)); bundle.putString("data", JSON.toJSONString(info));
......
app/src/main/java/com/polysoft/nafmii/utils/ZipUtils.java
...@@ -15,6 +15,11 @@ import java.util.zip.ZipInputStream; ...@@ -15,6 +15,11 @@ import java.util.zip.ZipInputStream;
public class ZipUtils { public class ZipUtils {
public static void unZipDistAssets() { public static void unZipDistAssets() {
String unzipKeyFlag = BuildConfig.UNZIP_KEY;
boolean isUnzip = SpUtils.getBoolean(unzipKeyFlag, true);
if (isUnzip) {
FileUtils.deletes(FileUtils.getDistDir());
}
// 已经存在，则不解压 或者 线上版本不需要解压 // 已经存在，则不解压 或者 线上版本不需要解压
if (FileUtils.getIndex().exists() || BuildConfig.ONLINE) { if (FileUtils.getIndex().exists() || BuildConfig.ONLINE) {
return; return;
...@@ -28,6 +33,7 @@ public class ZipUtils { ...@@ -28,6 +33,7 @@ public class ZipUtils {
} }
is = CtxUtils.openAssetsFile(distpath); is = CtxUtils.openAssetsFile(distpath);
unZip(is, distDir); unZip(is, distDir);
SpUtils.putBoolean(unzipKeyFlag, false);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
......
app/src/main/java/com/whaty/nafmii/MyApplication.java
...@@ -3,9 +3,7 @@ package com.whaty.nafmii; ...@@ -3,9 +3,7 @@ package com.whaty.nafmii;
import android.app.Application; import android.app.Application;
import com.polysoft.nafmii.utils.CtxUtils; import com.polysoft.nafmii.utils.CtxUtils;
import com.polysoft.nafmii.utils.ExecutorUtils;
import com.polysoft.nafmii.utils.ZipUtils; import com.polysoft.nafmii.utils.ZipUtils;
import com.tencent.tauth.Tencent;
import cn.jpush.android.api.JPushInterface; import cn.jpush.android.api.JPushInterface;
import me.jessyan.autosize.AutoSizeConfig; import me.jessyan.autosize.AutoSizeConfig;
...@@ -26,13 +24,11 @@ public class MyApplication extends Application { ...@@ -26,13 +24,11 @@ public class MyApplication extends Application {
builder.setDebug(BuildConfig.DEBUG); builder.setDebug(BuildConfig.DEBUG);
WebViewCacheInterceptorInst.getInstance().init(builder); WebViewCacheInterceptorInst.getInstance().init(builder);
JPushInterface.setDebugMode(true); JPushInterface.setDebugMode(BuildConfig.DEBUG);
JPushInterface.init(this); JPushInterface.init(this);
ExecutorUtils.io(() -> { // ExecutorUtils.io(() -> {
ZipUtils.unZipDistAssets(); ZipUtils.unZipDistAssets();
}); // });
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!