Skip to content

Commit 7202d74

Browse files
author
chunle.wei
committed
代码格式化.(增加阿里云镜像仓库;gradle成员变量抽取;BaseActivity抽取;)
1 parent 5f66fb7 commit 7202d74

39 files changed

+91
-76
lines changed

app/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ plugins {
66
id 'kotlin-android-extensions'
77
}
88

9+
def version_name = rootProject.version_name
10+
def version_code = rootProject.version_code
11+
def custom_channel_code = "0" //自定义的标识渠道的编码.
12+
913
android {
1014
// compileSdk 32 //为抽取变量,改为compileSdkVersion.
1115
compileSdkVersion "$COMPILE_SDK_VERSION"
@@ -16,8 +20,8 @@ android {
1620
minSdkVersion "$MIN_SDK_VERSION"
1721
// targetSdk 32 //为抽取变量,改为targetSdkVersion.
1822
targetSdkVersion "$TARGET_SDK_VERSION"
19-
versionName rootProject.ext.version_name
20-
versionCode rootProject.ext.version_code
23+
versionName version_name //原:rootProject.ext.version_name
24+
versionCode version_code //原:rootProject.ext.version_code
2125

2226
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2327

@@ -58,6 +62,7 @@ android {
5862
// VIVO_APPID : "vivo的APPID",
5963
// HONOR_APPID : "Honor的APP ID"
6064
]
65+
buildConfigField 'int', 'CUSTOM_CHANNEL_CODE', custom_channel_code //在"BuildConfig.java"中构建静态常量.
6166
}
6267

6368
//[Native:关注点三]
@@ -98,7 +103,7 @@ android {
98103

99104
buildTypes {
100105
release {
101-
buildConfigField("boolean", "LOG_DEBUG", "false") //在BuildConfig中构建静态常量.
106+
buildConfigField("boolean", "LOG_DEBUG", "false") //在"BuildConfig.java"中构建静态常量.
102107
debuggable false //默认false,表示APK运行时,不可以在AS端Logcat通过[进程名]来筛选查看指定进程的日志.
103108
minifyEnabled false //是否开启混淆.
104109
zipAlignEnabled false //是否压缩优化.
@@ -107,7 +112,7 @@ android {
107112
signingConfig signingConfigs.wei //签名配置通过signingConfigs中的wei来签名.
108113
}
109114
debug {
110-
buildConfigField("boolean", "LOG_DEBUG", "true") //在BuildConfig中构建静态常量.
115+
buildConfigField("boolean", "LOG_DEBUG", "true") //在"BuildConfig.java"中构建静态常量.
111116
debuggable true //默认true,表示APK运行时,可以在AS端Logcat通过[进程名]来筛选查看指定进程的日志.
112117
minifyEnabled false //是否开启混淆.
113118
zipAlignEnabled false //是否压缩优化.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.wcl.testdemo.init;
2+
3+
import androidx.appcompat.app.AppCompatActivity;
4+
5+
public class BaseActivity extends AppCompatActivity {
6+
}

app/src/main/java/com/wcl/testdemo/init/SplashActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.wcl.testdemo.R;
1212
import com.wcl.testdemo.utils.ScreenUtils;
1313

14-
import androidx.appcompat.app.AppCompatActivity;
14+
import com.wcl.testdemo.init.BaseActivity;
1515
import butterknife.BindView;
1616
import butterknife.ButterKnife;
1717

@@ -36,7 +36,7 @@
3636
* 使用Animation.setTarget(View)为View加载动画;
3737
* 使用Animation.start()开启动画;
3838
*/
39-
public class SplashActivity extends AppCompatActivity {
39+
public class SplashActivity extends BaseActivity {
4040

4141
/**
4242
* Comment:开屏界面背景图.

app/src/main/java/com/wcl/testdemo/init/TestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import java.util.ArrayList;
1818

19-
import androidx.appcompat.app.AppCompatActivity;
19+
import com.wcl.testdemo.init.BaseActivity;
2020
import androidx.recyclerview.widget.LinearLayoutManager;
2121
import androidx.recyclerview.widget.RecyclerView;
2222

@@ -26,7 +26,7 @@
2626
* @Version 1.0
2727
* @Description 测试Demo的主入口.
2828
*/
29-
public class TestActivity extends AppCompatActivity implements TestAdapter.OnItemClickListener {
29+
public class TestActivity extends BaseActivity implements TestAdapter.OnItemClickListener {
3030

3131
/**
3232
* Comment:列表即将展示的数据.

app/src/main/java/com/wcl/testdemo/test/test00_javabase/activity/JavaBaseActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.wcl.testdemo.test.test00_javabase.test03.EncryptDecryptTestActivity;
1616
import com.wcl.testdemo.utils.MyTestNativeUtils;
1717

18-
import androidx.appcompat.app.AppCompatActivity;
18+
import com.wcl.testdemo.init.BaseActivity;
1919
import butterknife.BindView;
2020
import butterknife.ButterKnife;
2121
import butterknife.OnClick;
@@ -26,7 +26,7 @@
2626
* @Version
2727
* @Description 测试: Java基础.
2828
*/
29-
public class JavaBaseActivity extends AppCompatActivity {
29+
public class JavaBaseActivity extends BaseActivity {
3030

3131
/**
3232
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test00_javabase/test00/JsonTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.List;
1616
import java.util.Map;
1717

18-
import androidx.appcompat.app.AppCompatActivity;
18+
import com.wcl.testdemo.init.BaseActivity;
1919
import butterknife.BindView;
2020
import butterknife.ButterKnife;
2121
import butterknife.OnClick;
@@ -26,7 +26,7 @@
2626
* @Version
2727
* @Description Json测试界面.
2828
*/
29-
public class JsonTestActivity extends AppCompatActivity {
29+
public class JsonTestActivity extends BaseActivity {
3030

3131
/**
3232
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test00_javabase/test01/CacheTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import java.util.Objects;
2424

25-
import androidx.appcompat.app.AppCompatActivity;
25+
import com.wcl.testdemo.init.BaseActivity;
2626
import butterknife.BindView;
2727
import butterknife.ButterKnife;
2828
import butterknife.OnClick;
@@ -33,7 +33,7 @@
3333
* @Version
3434
* @Description 缓存测试界面
3535
*/
36-
public class CacheTestActivity extends AppCompatActivity {
36+
public class CacheTestActivity extends BaseActivity {
3737

3838
/**
3939
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test00_javabase/test02/SocketClientActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.io.ObjectOutputStream;
1717
import java.net.Socket;
1818

19-
import androidx.appcompat.app.AppCompatActivity;
19+
import com.wcl.testdemo.init.BaseActivity;
2020
import butterknife.BindView;
2121
import butterknife.ButterKnife;
2222
import butterknife.OnClick;
@@ -29,7 +29,7 @@
2929
* @Version
3030
* @Description 双人局域网聊天(客户端)
3131
*/
32-
class SocketClientActivity extends AppCompatActivity {
32+
class SocketClientActivity extends BaseActivity {
3333

3434
public static final String INTENT_SERVICE_IP = "INTENT_SERVICE_IP";
3535

app/src/main/java/com/wcl/testdemo/test/test00_javabase/test02/SocketServiceActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.net.ServerSocket;
1919
import java.net.Socket;
2020

21-
import androidx.appcompat.app.AppCompatActivity;
21+
import com.wcl.testdemo.init.BaseActivity;
2222
import butterknife.BindView;
2323
import butterknife.ButterKnife;
2424
import butterknife.OnClick;
@@ -35,7 +35,7 @@
3535
* (*)客户端退出时,服务端的接收线程未关闭.
3636
* (*)ServerSocket和Socket的关闭释放.
3737
*/
38-
class SocketServiceActivity extends AppCompatActivity {
38+
class SocketServiceActivity extends BaseActivity {
3939

4040
public static final int SERVICE_PORT = 9999;
4141
@BindView(R.id.tv_title)

app/src/main/java/com/wcl/testdemo/test/test00_javabase/test02/SocketTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.wcl.testdemo.test.test00_javabase.test02;
22

3-
import androidx.appcompat.app.AppCompatActivity;
3+
import com.wcl.testdemo.init.BaseActivity;
44
import butterknife.BindView;
55
import butterknife.ButterKnife;
66
import butterknife.OnClick;
@@ -28,7 +28,7 @@
2828
* @Version
2929
* @Description 测试Socket.
3030
*/
31-
public class SocketTestActivity extends AppCompatActivity {
31+
public class SocketTestActivity extends BaseActivity {
3232

3333
/**
3434
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test00_javabase/test03/EncryptDecryptTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.io.InputStream;
2020
import java.util.List;
2121

22-
import androidx.appcompat.app.AppCompatActivity;
22+
import com.wcl.testdemo.init.BaseActivity;
2323
import butterknife.BindView;
2424
import butterknife.ButterKnife;
2525
import butterknife.OnClick;
@@ -30,7 +30,7 @@
3030
* @Version
3131
* @Description 加密解密测试界面.
3232
*/
33-
public class EncryptDecryptTestActivity extends AppCompatActivity {
33+
public class EncryptDecryptTestActivity extends BaseActivity {
3434

3535
/**
3636
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test01_androidbase/activity/AndroidBaseActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import java.util.List;
4646

4747
import androidx.annotation.NonNull;
48-
import androidx.appcompat.app.AppCompatActivity;
48+
import com.wcl.testdemo.init.BaseActivity;
4949
import androidx.core.app.NotificationCompat;
5050
import butterknife.BindView;
5151
import butterknife.ButterKnife;
@@ -59,7 +59,7 @@
5959
* @Version
6060
* @Description 测试: Android基础.
6161
*/
62-
public class AndroidBaseActivity extends AppCompatActivity {
62+
public class AndroidBaseActivity extends BaseActivity {
6363

6464
/**
6565
* Comment: 请求码:通过系统文件选择器,选择文件的结果.

app/src/main/java/com/wcl/testdemo/test/test01_androidbase/test03/SaveFileActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.io.IOException;
2828
import java.io.InputStream;
2929

30-
import androidx.appcompat.app.AppCompatActivity;
30+
import com.wcl.testdemo.init.BaseActivity;
3131
import butterknife.BindView;
3232
import butterknife.ButterKnife;
3333
import butterknife.OnClick;
@@ -38,7 +38,7 @@
3838
* @Version
3939
* @Description 测试文件的持久化保存.
4040
*/
41-
public class SaveFileActivity extends AppCompatActivity {
41+
public class SaveFileActivity extends BaseActivity {
4242

4343
/**
4444
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test01_androidbase/test08/DialogTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.blankj.utilcode.util.ToastUtils;
2121
import com.wcl.testdemo.R;
2222

23-
import androidx.appcompat.app.AppCompatActivity;
23+
import com.wcl.testdemo.init.BaseActivity;
2424
import butterknife.BindView;
2525
import butterknife.ButterKnife;
2626
import butterknife.OnClick;
@@ -34,7 +34,7 @@
3434
* (1)测试各种弹窗.
3535
* (2)控制源生Dialog的宽高和位置(顶部/底部/中间).
3636
*/
37-
public class DialogTestActivity extends AppCompatActivity {
37+
public class DialogTestActivity extends BaseActivity {
3838

3939
/**
4040
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test02_4components/activity/TestComponentsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.wcl.testdemo.R;
1212
import com.wcl.testdemo.test.test02_4components.test00.ServiceTestActivity;
1313

14-
import androidx.appcompat.app.AppCompatActivity;
14+
import com.wcl.testdemo.init.BaseActivity;
1515
import butterknife.BindView;
1616
import butterknife.ButterKnife;
1717
import butterknife.OnClick;
@@ -22,7 +22,7 @@
2222
* @Version
2323
* @Description 测试: 四大组件相关.
2424
*/
25-
public class TestComponentsActivity extends AppCompatActivity {
25+
public class TestComponentsActivity extends BaseActivity {
2626

2727
/**
2828
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test02_4components/test00/ServiceTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.blankj.utilcode.util.ToastUtils;
1414
import com.wcl.testdemo.R;
1515

16-
import androidx.appcompat.app.AppCompatActivity;
16+
import com.wcl.testdemo.init.BaseActivity;
1717
import butterknife.BindView;
1818
import butterknife.ButterKnife;
1919
import butterknife.OnClick;
@@ -24,7 +24,7 @@
2424
* @Version
2525
* @Description Service相关测试.
2626
*/
27-
public class ServiceTestActivity extends AppCompatActivity {
27+
public class ServiceTestActivity extends BaseActivity {
2828

2929
/**
3030
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test03_view/activity/TestViewActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.wcl.testdemo.test.test03_view.test00.ScreenThemeActivity;
1010
import com.wcl.testdemo.test.test03_view.test01_customview.activity.CustomViewTestActivity;
1111

12-
import androidx.appcompat.app.AppCompatActivity;
12+
import com.wcl.testdemo.init.BaseActivity;
1313
import butterknife.BindView;
1414
import butterknife.ButterKnife;
1515
import butterknife.OnClick;
@@ -20,7 +20,7 @@
2020
* @Version
2121
* @Description 测试: 视图相关.
2222
*/
23-
public class TestViewActivity extends AppCompatActivity {
23+
public class TestViewActivity extends BaseActivity {
2424

2525
/**
2626
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test03_view/test00/ScreenThemeActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Locale;
2121
import java.util.Map;
2222

23-
import androidx.appcompat.app.AppCompatActivity;
23+
import com.wcl.testdemo.init.BaseActivity;
2424
import butterknife.BindView;
2525
import butterknife.ButterKnife;
2626
import butterknife.OnClick;
@@ -34,7 +34,7 @@
3434
* (4)获取屏幕方向.
3535
* (3)获取状态栏高度.
3636
*/
37-
public class ScreenThemeActivity extends AppCompatActivity {
37+
public class ScreenThemeActivity extends BaseActivity {
3838

3939
/**
4040
* Comment: 启动Activity时Intent的键,值为Activity状态.

app/src/main/java/com/wcl/testdemo/test/test03_view/test01_customview/activity/CustomViewTestActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.wcl.testdemo.R;
1212
import com.wcl.testdemo.test.test03_view.test01_customview.test00.TestToggleButtonActivity;
1313

14-
import androidx.appcompat.app.AppCompatActivity;
14+
import com.wcl.testdemo.init.BaseActivity;
1515
import butterknife.BindView;
1616
import butterknife.ButterKnife;
1717
import butterknife.OnClick;
@@ -22,7 +22,7 @@
2222
* @Version
2323
* @Description 自定义控件, 测试界面.
2424
*/
25-
public class CustomViewTestActivity extends AppCompatActivity {
25+
public class CustomViewTestActivity extends BaseActivity {
2626

2727
/**
2828
* Comment: 用来输出测试结果的控制台.

app/src/main/java/com/wcl/testdemo/test/test03_view/test01_customview/test00/TestToggleButtonActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import com.blankj.utilcode.util.ToastUtils;
88
import com.wcl.testdemo.R;
99

10-
import androidx.appcompat.app.AppCompatActivity;
10+
import com.wcl.testdemo.init.BaseActivity;
1111

1212
/**
1313
* @Author WCL
1414
* @Date 2023/6/27 18:14
1515
* @Version
1616
* @Description 测试自定义控件ToggleButton的界面.
1717
*/
18-
public class TestToggleButtonActivity extends AppCompatActivity {
18+
public class TestToggleButtonActivity extends BaseActivity {
1919

2020
@Override
2121
protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/wcl/testdemo/test/test04_device/activity/TestDeviceActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.wcl.testdemo.R;
1414
import com.wcl.testdemo.utils.FindIpUtils;
1515

16-
import androidx.appcompat.app.AppCompatActivity;
16+
import com.wcl.testdemo.init.BaseActivity;
1717
import butterknife.BindView;
1818
import butterknife.ButterKnife;
1919
import butterknife.OnClick;
@@ -24,7 +24,7 @@
2424
* @Version
2525
* @Description 测试: 设备相关.
2626
*/
27-
public class TestDeviceActivity extends AppCompatActivity {
27+
public class TestDeviceActivity extends BaseActivity {
2828

2929
/**
3030
* Comment: 用来输出测试结果的控制台.

0 commit comments

Comments
 (0)