Skip to content

Commit 2ebf095

Browse files
committed
update
2 parents 0735bdb + 86e13e2 commit 2ebf095

File tree

73 files changed

+30
-959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+30
-959
lines changed

.idea/modules.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ android {
2626
abiFilters 'armeabi', 'x86' // 'armeabi-v7a', 'x86_64', 'arm64-v8a'
2727
}
2828
vectorDrawables.useSupportLibrary = true
29+
30+
//打包时排除私有项目、android系统库和第三方库中非指定语言的资源文件
31+
resConfigs "zh", "en"
2932
}
3033

3134
signingConfigs {
@@ -45,11 +48,6 @@ android {
4548
debuggable false
4649
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4750
signingConfig signingConfigs.config
48-
android.applicationVariants.all { variant ->
49-
variant.outputs.all {
50-
outputFileName = "WanAndroid-release.apk"
51-
}
52-
}
5351
}
5452

5553
debug {
@@ -86,7 +84,7 @@ android {
8684
//自定义release apk的输出路径和名称
8785
android.applicationVariants.all { variant ->
8886
def curBuildType = variant.buildType.name
89-
def apkName = "app-release.apk"
87+
def apkName = "app-release-" + System.currentTimeMillis() + ".apk"
9088
variant.outputs.all { output ->
9189
//只对release包起作用,如果不是release包则不变更输出路径,否则可能导致AS无法自动安装debug包
9290
if(curBuildType == "release"){
@@ -98,12 +96,10 @@ android {
9896
}
9997
}
10098

101-
10299
dependencies {
103100
implementation fileTree(dir: 'libs', include: ['*.jar'])
104101

105102
implementation project(':commonlib')
106-
implementation project(':permission')
107103

108104
//android support
109105
implementation 'androidx.appcompat:appcompat:1.1.0'

app/release/output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"v1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"v1.6","enabled":true,"outputFile":"app-release-1575189812348.apk","fullName":"release","baseName":"release"},"path":"app-release-1575189812348.apk","properties":{}}]

app/src/main/java/com/example/hy/wanandroid/adapter/CoinsRankAdapter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.chad.library.adapter.base.BaseQuickAdapter;
66
import com.chad.library.adapter.base.BaseViewHolder;
77
import com.example.hy.wanandroid.R;
8-
import com.example.hy.wanandroid.entity.Coin;
98
import com.example.hy.wanandroid.entity.UserCoin;
109

1110
import java.util.List;

app/src/main/java/com/example/hy/wanandroid/adapter/VpAdapter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.example.hy.wanandroid.adapter;
22
import java.util.List;
33

4-
import javax.inject.Inject;
5-
64
import androidx.annotation.Nullable;
75
import androidx.fragment.app.Fragment;
86
import androidx.fragment.app.FragmentManager;

app/src/main/java/com/example/hy/wanandroid/base/activity/BaseActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.example.hy.wanandroid.event.ReLoadEvent;
1919

2020
import androidx.appcompat.app.AppCompatActivity;
21-
import androidx.appcompat.app.AppCompatDelegate;
2221
import androidx.core.content.ContextCompat;
2322
import butterknife.ButterKnife;
2423
import butterknife.Unbinder;

app/src/main/java/com/example/hy/wanandroid/base/view/IView.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.example.hy.wanandroid.base.view;
22

33
import android.app.Activity;
4-
import android.content.Context;
54

65
/**
76
* 通用View接口

app/src/main/java/com/example/hy/wanandroid/config/App.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void onCreate() {
4848
mAppComponent = DaggerAppComponent.builder().appModule(new AppModule(this)).build();
4949
initLitepal();
5050
initBugly();
51-
//initLeakCanary();
51+
initLeakCanary();
5252
Loading.beginBuildCommit()
5353
.addErrorView(R.layout.error_view)
5454
.addLoadingView(R.layout.loading_view)

app/src/main/java/com/example/hy/wanandroid/config/Constant.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import android.os.Environment;
33

44
import com.example.commonlib.utils.FileUtil;
5-
import com.example.hy.wanandroid.R;
65

76
import java.io.File;
87

@@ -21,7 +20,6 @@ public class Constant {
2120

2221
//common, 1~10
2322
public static final int REQUEST_LOGIN = 1;
24-
public static final int REQUEST_WRITE_EXTERNAL = 2;
2523
public static final String KEY_URL_APK = "urlApk";
2624
public static final String KEY_DOWNLOAD_ID = "downloadId";
2725
public static String NEW_VERSION_URL = "";

app/src/main/java/com/example/hy/wanandroid/contract/mine/CoinRankContract.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.example.hy.wanandroid.contract.mine;
22

33
import com.example.hy.wanandroid.base.view.IView;
4-
import com.example.hy.wanandroid.entity.Coin;
54
import com.example.hy.wanandroid.entity.UserCoin;
65

76
import java.util.List;

0 commit comments

Comments
 (0)