Skip to content

Commit ffa5e54

Browse files
committed
Remove ButterKnife
1 parent 93f235a commit ffa5e54

File tree

2 files changed

+37
-63
lines changed

2 files changed

+37
-63
lines changed

SampleCode/app/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ android {
2525
}
2626
}
2727

28+
buildFeatures {
29+
viewBinding = true
30+
}
31+
2832
buildTypes {
2933
release {
3034
shrinkResources false
@@ -94,8 +98,6 @@ dependencies {
9498
implementation 'androidx.recyclerview:recyclerview:1.2.1'
9599
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
96100
implementation 'androidx.annotation:annotation:1.3.0'
97-
implementation 'com.jakewharton:butterknife:10.0.0'
98-
annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
99101
implementation "androidx.core:core-ktx:1.8.0"
100102
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
101103
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

SampleCode/app/src/main/java/com/dji/sdk/sample/demo/utmiss/UTMISSActivity.java

Lines changed: 33 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,14 @@
33
import android.os.Bundle;
44
import android.text.TextUtils;
55
import android.view.View;
6-
import android.widget.Button;
7-
import android.widget.EditText;
8-
import android.widget.TextView;
96

107
import androidx.annotation.Nullable;
118
import androidx.appcompat.app.AppCompatActivity;
129

13-
import com.dji.sdk.sample.R;
10+
import com.dji.sdk.sample.databinding.ActivityUtmissBinding;
1411

1512
import java.io.File;
1613

17-
import butterknife.BindView;
18-
import butterknife.ButterKnife;
19-
import butterknife.OnClick;
2014
import dji.common.error.DJIError;
2115
import dji.sdk.utmiss.UTMISSFlightDataUploadStatus;
2216
import dji.sdk.utmiss.UTMISSManager;
@@ -26,33 +20,30 @@
2620

2721
public class UTMISSActivity extends AppCompatActivity {
2822

29-
TextView mTvDbPath;
30-
TextView mTvStatus;
31-
TextView mTvInfo;
32-
33-
EditText mEdtTokenKey;
34-
EditText mEdtManufactureId;
35-
EditText mEdtUasId;
36-
Button mBtnInit;
37-
3823
String dbPath;
3924

25+
private ActivityUtmissBinding binding;
26+
4027
@Override
4128
protected void onCreate(@Nullable Bundle savedInstanceState) {
4229
super.onCreate(savedInstanceState);
43-
setContentView(R.layout.activity_utmiss);
44-
ButterKnife.bind(this);
45-
initUI();
46-
}
30+
binding = ActivityUtmissBinding.inflate(getLayoutInflater());
31+
View view = binding.getRoot();
32+
setContentView(view);
33+
34+
binding.btnStart.setOnClickListener(new View.OnClickListener() {
35+
@Override
36+
public void onClick(View view) {
37+
start();
38+
}
39+
});
4740

48-
private void initUI(){
49-
mTvDbPath = findViewById(R.id.txt_db_path);
50-
mTvStatus = findViewById(R.id.txt_status);
51-
mTvInfo = findViewById(R.id.txt_info);
52-
mEdtTokenKey = findViewById(R.id.edt_token_key);
53-
mEdtManufactureId = findViewById(R.id.edt_manufactureId);
54-
mEdtUasId = findViewById(R.id.edt_uasId);
55-
mBtnInit = findViewById(R.id.btn_start);
41+
binding.btnStop.setOnClickListener(new View.OnClickListener() {
42+
@Override
43+
public void onClick(View view) {
44+
stop();
45+
}
46+
});
5647
init();
5748
}
5849

@@ -67,51 +58,35 @@ private void init() {
6758
showToast("dbPath dir create failed!");
6859
}
6960
}
70-
mTvDbPath.setText(String.format("db path->%s\nlog path->%s", dbPath, UTMISSManager.getInstance().getUtmissLogPath()));
71-
mEdtManufactureId.setText("test");
72-
mEdtUasId.setText("UAS-DEFAULT");
61+
binding.txtDbPath.setText(String.format("db path->%s\nlog path->%s", dbPath, UTMISSManager.getInstance().getUtmissLogPath()));
62+
binding.edtManufactureId.setText("test");
63+
binding.edtUasId.setText("UAS-DEFAULT");
7364
UTMISSFlightDataUploadStatus uploadStatus = UTMISSManager.getInstance().getUploadStatus();
74-
mTvStatus.setText(String.format("current status is %s", uploadStatus.toString()));
65+
binding.txtStatus.setText(String.format("current status is %s", uploadStatus.toString()));
7566
if (uploadStatus != UTMISSFlightDataUploadStatus.UNKNOWN) {
7667
changeUI();
7768
}
7869
}
7970

80-
81-
@OnClick({R.id.btn_start, R.id.btn_stop})
82-
public void onClick(View v) {
83-
switch (v.getId()) {
84-
case R.id.btn_start:
85-
start();
86-
break;
87-
case R.id.btn_stop:
88-
stop();
89-
break;
90-
default:
91-
throw new IllegalArgumentException("some btn click not implementation!");
92-
}
93-
}
94-
9571
private void stop() {
9672
UTMISSManager.getInstance().stopToUpload();
9773
changeInitBtnState(true);
9874
}
9975

100-
10176
private void start() {
102-
String tokenKey = mEdtTokenKey.getText().toString().trim();
77+
String tokenKey = binding.edtTokenKey.getText().toString().trim();
10378
if (TextUtils.isEmpty(tokenKey)) {
10479
showToast("pls enter token key first");
10580
return;
10681
}
10782

108-
String manufactureId = mEdtManufactureId.getText().toString().trim();
83+
String manufactureId = binding.edtManufactureId.getText().toString().trim();
10984
if (TextUtils.isEmpty(manufactureId)) {
11085
showToast("pls enter manufactureId first");
11186
return;
11287
}
11388

114-
String uasId = mEdtManufactureId.getText().toString().trim();
89+
String uasId = binding.edtManufactureId.getText().toString().trim();
11590
if (TextUtils.isEmpty(uasId)) {
11691
showToast("pls enter uasId first");
11792
return;
@@ -128,18 +103,15 @@ private void start() {
128103

129104
private void changeUI() {
130105
changeInitBtnState(false);
131-
UTMISSManager.getInstance().setUTMISSFlightDataUpdatedUploadStatusCallback(status -> mTvStatus.setText(String.format("current status is %s", status.toString())));
106+
UTMISSManager.getInstance().setUTMISSFlightDataUpdatedUploadStatusCallback(status -> binding.txtStatus.setText(String.format("current status is %s", status.toString())));
132107
}
133108

134109
private void changeInitBtnState(boolean enable) {
135-
mTvInfo.setVisibility(enable ? View.GONE : View.VISIBLE);
136-
mBtnInit.setEnabled(enable);
137-
mEdtTokenKey.setEnabled(enable);
138-
mEdtManufactureId.setEnabled(enable);
139-
mEdtUasId.setEnabled(enable);
110+
binding.txtInfo.setVisibility(enable ? View.GONE : View.VISIBLE);
111+
binding.btnStart.setEnabled(enable);
112+
binding.edtTokenKey.setEnabled(enable);
113+
binding.edtManufactureId.setEnabled(enable);
114+
binding.edtUasId.setEnabled(enable);
140115
}
141116

142-
143-
144-
145-
}
117+
}

0 commit comments

Comments
 (0)