Skip to content

Commit 88df506

Browse files
thinaaronthinaaron
committed
cannel 拼写错误
1 parent 70acb0b commit 88df506

7 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎app/src/main/java/net/coding/program/BaseActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ protected void showDialog(String title, String msg, DialogInterface.OnClickListe
193193
}
194194

195195
protected void showDialog(String title, String msg, DialogInterface.OnClickListener clickOk,
196-
DialogInterface.OnClickListener clickCannel) {
197-
showDialog(title, msg, clickOk, clickCannel, "确定", "取消");
196+
DialogInterface.OnClickListener clickCancel) {
197+
showDialog(title, msg, clickOk, clickCancel, "确定", "取消");
198198
}
199199

200200
// protected void showListDialog() {
@@ -203,14 +203,14 @@ protected void showDialog(String title, String msg, DialogInterface.OnClickListe
203203
// }
204204

205205
protected void showDialog(String title, String msg, DialogInterface.OnClickListener clickOk,
206-
DialogInterface.OnClickListener clickCannel,
206+
DialogInterface.OnClickListener clickCancel,
207207
String okButton,
208208
String cannelButton) {
209209
AlertDialog.Builder builder = new AlertDialog.Builder(this);
210210
AlertDialog dialog = builder.setTitle(title)
211211
.setMessage(msg)
212212
.setPositiveButton(okButton, clickOk)
213-
.setNegativeButton(cannelButton, clickCannel)
213+
.setNegativeButton(cannelButton, clickCancel)
214214
.show();
215215
dialogTitleLineColor(dialog);
216216
}

‎app/src/main/java/net/coding/program/common/DatePickerFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public class DatePickerFragment extends DialogFragment implements DatePickerDial
2323

2424
public static final String PARAM_MAX_TODYA = "PARAM_MAX_TODYA";
2525
public static final String PARAM_DATA = "date";
26-
// SetTimeType mTimeType = SetTimeType.Cannel;
26+
// SetTimeType mTimeType = SetTimeType.Cancel;
2727
// 小米手机不管按那个按钮都会调用 onDataSet，只好在click事件里面做标记
2828
// enum SetTimeType {
29-
// Cannel, Set, Clear;
29+
// Cancel, Set, Clear;
3030
// };
3131
private DateSet mDateSet;
3232

‎app/src/main/java/net/coding/program/common/PushReceiver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public void onTextMessage(Context context, XGPushTextMessage message) {
6363
if (jsonCustom.has("cancel")) {
6464
String cancelString = jsonCustom.optString("cancel");
6565
if (cancelString.equals("message")) {
66-
cannel(context, true);
66+
cancel(context, true);
6767
} else {
68-
cannel(context, false);
68+
cancel(context, false);
6969
}
7070

7171
return;
@@ -99,7 +99,7 @@ public void onTextMessage(Context context, XGPushTextMessage message) {
9999
}
100100
}
101101

102-
private void cannel(Context ctx, boolean cannelMessage) {
102+
private void cancel(Context ctx, boolean cannelMessage) {
103103
String message = URLSpanNoUnderline.PATTERN_URL_MESSAGE;
104104
Pattern pattern = Pattern.compile(message);
105105
NotificationManager notificationManager = (NotificationManager)

‎app/src/main/java/net/coding/program/model/Merge.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public String getHttpRefuse() {
194194
return getHostPublicHead("/refuse");
195195
}
196196

197-
public String getHttpCannel() {
197+
public String getHttpCancel() {
198198
return getHostPublicHead("/cancel");
199199
}
200200

‎app/src/main/java/net/coding/program/project/detail/merge/MergeDetailActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class MergeDetailActivity extends BackActivity {
5858
@ViewById
5959
View actionRefuse;
6060
@ViewById
61-
View actionCannel;
61+
View actionCancel;
6262
@ViewById
6363
ExpandableStickyListHeadersListView listView;
6464

@@ -139,14 +139,14 @@ private void updateBottomBarStyle() {
139139
}
140140
}
141141

142-
private void setActionStyle(boolean refuse, boolean accept, boolean cannel) {
143-
if (!refuse && !accept && !cannel) {
142+
private void setActionStyle(boolean refuse, boolean accept, boolean cancel) {
143+
if (!refuse && !accept && !cancel) {
144144
actionLayout.setVisibility(View.GONE);
145145
} else {
146146
actionLayout.setVisibility(View.VISIBLE);
147147
actionAccept.setVisibility(accept ? View.VISIBLE : View.GONE);
148148
actionRefuse.setVisibility(refuse ? View.VISIBLE : View.GONE);
149-
actionCannel.setVisibility(cannel ? View.VISIBLE : View.GONE);
149+
actionCancel.setVisibility(cancel ? View.VISIBLE : View.GONE);
150150
}
151151
}
152152

@@ -167,11 +167,11 @@ public void onClick(DialogInterface dialog, int which) {
167167
}
168168

169169
@Click
170-
protected final void actionCannel() {
170+
protected final void actionCancel() {
171171
showDialog(mMerge.getTitle(), "确定要取消吗？", new DialogInterface.OnClickListener() {
172172
@Override
173173
public void onClick(DialogInterface dialog, int which) {
174-
String host = mMerge.getHttpCannel();
174+
String host = mMerge.getHttpCancel();
175175
postNetwork(host, HOST_MERGE_CANNEL);
176176
}
177177
});

‎app/src/main/java/net/coding/program/setting/UpdateTipActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public void onClick(View v) {
6363
}
6464

6565
if (mUpdateInfo.required == 1 || mUpdateInfo.required == 0) {
66-
Button buttonCannel = (Button) findViewById(R.id.cancel);
67-
buttonCannel.setVisibility(View.VISIBLE);
68-
buttonCannel.setOnClickListener(new View.OnClickListener() {
66+
Button buttonCancel = (Button) findViewById(R.id.cancel);
67+
buttonCancel.setVisibility(View.VISIBLE);
68+
buttonCancel.setOnClickListener(new View.OnClickListener() {
6969
@Override
7070
public void onClick(View v) {
7171

‎app/src/main/res/layout/activity_merge_detail.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
android:textColor="@color/font_white" />
5757

5858
<TextView
59-
android:id="@+id/actionCannel"
59+
android:id="@+id/actionCancel"
6060
android:layout_width="0dp"
6161
android:layout_height="40dp"
6262
android:layout_weight="1"

0 commit comments

Comments
 (0)