Skip to content

Commit fb0cbbd

Browse files
neilyheneilyhe
committed
升级gradle版本
1 parent 9f5edd9 commit fb0cbbd

30 files changed

+397
-639
lines changed

‎.github/workflows/opensource.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
- run: |
2929
rm -rf sdkdemo-config.json
3030
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/sdkdemo/sdkdemo-config.json.asc > sdkdemo-config.json
31-
- name: set up JDK 11
31+
- name: set up JDK 17
3232
uses: actions/setup-java@v1
3333
with:
34-
java-version: 11
34+
java-version: 17
3535
# - name: Setup cmake
3636
# uses: jwlawson/actions-setup-cmake@v1.5
3737
# with:
@@ -41,7 +41,7 @@ jobs:
4141
cmake --version
4242
4343
- name: Cache Gradle packages
44-
uses: actions/cache@v2
44+
uses: actions/cache@v4
4545
with:
4646
path: |
4747
~/.gradle/caches

‎app/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ rootProject.ext.configPath = "../app-config.json"
99
apply from: "../parse_json.gradle"
1010

1111
android {
12+
namespace 'com.tencent.iot.explorer.link'
13+
buildFeatures {
14+
buildConfig true
15+
}
1216
signingConfigs {
1317
config {
1418
storeFile file('../opensource_keystore.jks')

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.tencent.iot.explorer.link">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET" />
76
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/AddOptionsDialog.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,7 @@ public void onItemClicked(int postion) {
8888

8989
@Override
9090
public void onClick(View v) {
91-
switch (v.getId())
92-
{
93-
case R.id.inside_layout:
94-
return;
95-
}
91+
if (v.getId() == R.id.inside_layout) return;
9692
dismiss();
9793
if (onDismisListener != null) {
9894
onDismisListener.onDismissed();

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/DevModeSetDialog.java‎

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class DevModeSetDialog extends IosCenterStyleDialog {
4040
private Context context;
4141
private List<KeyBooleanValue> content = new ArrayList<>();
4242
private TextView title;
43-
private TextView currentProgress;
4443
private String titleStr;
4544
private ImageView increase;
4645
private ImageView decrease;
@@ -90,7 +89,6 @@ public void initView() {
9089
bar = view.findViewById(R.id.bar_score_progrss);
9190
decrease = view.findViewById(R.id.iv_decrease);
9291
increase = view.findViewById(R.id.iv_increase);
93-
currentProgress = view.findViewById(R.id.progress);
9492
tvGr = view.findViewById(R.id.tv_gr);
9593
tvEq = view.findViewById(R.id.tv_eq);
9694
tvLt = view.findViewById(R.id.tv_lt);
@@ -186,48 +184,43 @@ public void onItemClicked(int postion, KeyBooleanValue option) {
186184

187185
@Override
188186
public void onClick(View v) {
189-
switch (v.getId())
190-
{
191-
case R.id.tv_ok:
192-
if (onDismisListener != null && adapter != null) {
193-
onDismisListener.onSaveClicked();
194-
}
195-
break;
196-
case R.id.tv_cancel:
197-
if (onDismisListener != null) {
198-
onDismisListener.onCancelClicked();
199-
}
200-
break;
201-
case R.id.iv_increase:
202-
if (progress >= bar.getMaxProgress()) {
203-
return;
204-
}
205-
206-
progress += modeInt.getStep();
207-
bar.setProgress(progress);
187+
int id = v.getId();
188+
if (id == R.id.tv_ok) {
189+
if (onDismisListener != null && adapter != null) {
190+
onDismisListener.onSaveClicked();
191+
}
192+
} else if (id == R.id.tv_cancel) {
193+
if (onDismisListener != null) {
194+
onDismisListener.onCancelClicked();
195+
}
196+
} else if (id == R.id.iv_increase) {
197+
if (progress >= bar.getMaxProgress()) {
208198
return;
209-
case R.id.iv_decrease:
210-
if (progress <= bar.getMinProgress()) {
211-
return;
212-
}
213-
214-
progress -= modeInt.getStep();
215-
bar.setProgress(progress);
216-
return;
217-
case R.id.layout_inside:
218-
return;
219-
case R.id.tv_gr:
220-
modeInt.setOp(OpValue.OP_GR);
221-
resetStartEqBtnStatus();
222-
return;
223-
case R.id.tv_eq:
224-
modeInt.setOp(OpValue.OP_EQ);
225-
resetStartEqBtnStatus();
226-
return;
227-
case R.id.tv_lt:
228-
modeInt.setOp(OpValue.OP_LT);
229-
resetStartEqBtnStatus();
199+
}
200+
progress += modeInt.getStep();
201+
bar.setProgress(progress);
202+
return;
203+
} else if (id == R.id.iv_decrease) {
204+
if (progress <= bar.getMinProgress()) {
230205
return;
206+
}
207+
progress -= modeInt.getStep();
208+
bar.setProgress(progress);
209+
return;
210+
} else if (id == R.id.layout_inside) {
211+
return;
212+
} else if (id == R.id.tv_gr) {
213+
modeInt.setOp(OpValue.OP_GR);
214+
resetStartEqBtnStatus();
215+
return;
216+
} else if (id == R.id.tv_eq) {
217+
modeInt.setOp(OpValue.OP_EQ);
218+
resetStartEqBtnStatus();
219+
return;
220+
} else if (id == R.id.tv_lt) {
221+
modeInt.setOp(OpValue.OP_LT);
222+
resetStartEqBtnStatus();
223+
return;
231224
}
232225
dismiss();
233226
}

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/InputBirthdayDialog.java‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -125,22 +125,17 @@ public void onItemSelected(WheelPicker picker, Object data, int position) {
125125

126126
@Override
127127
public void onClick(View v) {
128-
switch (v.getId()) {
129-
case R.id.tv_ok:
130-
if (onDismisListener != null) {
131-
onDismisListener.onOkClicked(yearPicker.getCurrentItemPosition() + MIN_YEAR,
132-
monthPicker.getCurrentItemPosition() + 1, dayPicker.getCurrentItemPosition() + 1);
133-
}
134-
break;
135-
case R.id.tip_layout:
136-
return;
137-
case R.id.tv_cancel:
138-
case R.id.outside_dialog_layout:
139-
if (onDismisListener != null) {
140-
onDismisListener.onCancelClicked();
141-
}
142-
default:
143-
break;
128+
if (v.getId() == R.id.tv_ok) {
129+
if (onDismisListener != null) {
130+
onDismisListener.onOkClicked(yearPicker.getCurrentItemPosition() + MIN_YEAR,
131+
monthPicker.getCurrentItemPosition() + 1, dayPicker.getCurrentItemPosition() + 1);
132+
}
133+
}else if (v.getId() == R.id.tip_layout) {
134+
return;
135+
}else if (v.getId() == R.id.tv_cancel || v.getId() == R.id.outside_dialog_layout) {
136+
if (onDismisListener != null) {
137+
onDismisListener.onCancelClicked();
138+
}
144139
}
145140
dismiss();
146141
}

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/MoreOptionDialog.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,12 @@ public void onItemClicked(int postion) {
7575

7676
@Override
7777
public void onClick(View v) {
78-
switch (v.getId())
79-
{
80-
case R.id.inside_layout:
81-
return;
82-
case R.id.tv_space:
83-
if (onDismisListener != null) {
84-
onDismisListener.onGoClicked();
85-
}
86-
break;
78+
if (v.getId()== R.id.inside_layout){
79+
return;
80+
}else if (v.getId()== R.id.tv_space){
81+
if (onDismisListener != null) {
82+
onDismisListener.onGoClicked();
83+
}
8784
}
8885
dismiss();
8986
if (onDismisListener != null) {

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/SelectWoringTimeDialog.java‎

Lines changed: 67 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -295,83 +295,79 @@ private void showView(View view) {
295295

296296
@Override
297297
public void onClick(View v) {
298-
switch (v.getId())
299-
{
300-
case R.id.layout_defination_default:
301-
workTimeMode.setTimeType(0);
302-
resetModeTime();
298+
int id = v.getId();
299+
if (id == R.id.layout_defination_default) {
300+
workTimeMode.setTimeType(0);
301+
resetModeTime();
302+
showView(startLayout);
303+
return;
304+
} else if (id == R.id.iv_back_dialog_defination_time_by_user) {
305+
// 点击返回按钮，不会改变界面状态，也不会改变之前的显示状况
306+
showView(startLayout);
307+
return;
308+
} else if (id == R.id.layout_defination_by_user) {
309+
// 点击自定义不一定使用自定义，当点击自定义的时候不切换状态
310+
showView(definationTimeLayout);
311+
return;
312+
} else if (id == R.id.iv_back_dialog_defination_day_by_user) {
313+
showView(startLayout);
314+
return;
315+
} else if (id == R.id.tv_cancel) {
316+
if (definationTimeLayout.getVisibility() == View.VISIBLE) {
303317
showView(startLayout);
304-
return;
305-
case R.id.iv_back_dialog_defination_time_by_user:
306-
// 点击返回按钮，不会改变界面状态，也不会改变之前的显示状况
318+
} else if (definationDayLayout.getVisibility() == View.VISIBLE) {
307319
showView(startLayout);
308-
return;
309-
case R.id.layout_defination_by_user:
310-
// 点击自定义不一定使用自定义，当点击自定义的时候不切换状态
311-
showView(definationTimeLayout);
312-
return;
313-
case R.id.iv_back_dialog_defination_day_by_user:
314-
showView(startLayout);
315-
return;
316-
case R.id.tv_cancel:
317-
if (definationTimeLayout.getVisibility() == View.VISIBLE) {
318-
showView(startLayout);
319-
} else if (definationDayLayout.getVisibility() == View.VISIBLE) {
320-
showView(startLayout);
321-
dayAdapter.setSelectOption(tmpStatusSaved);
322-
tmpStatusSaved.clear();
323-
} else if (startLayout.getVisibility() == View.VISIBLE) {
324-
dismiss();
320+
dayAdapter.setSelectOption(tmpStatusSaved);
321+
tmpStatusSaved.clear();
322+
} else if (startLayout.getVisibility() == View.VISIBLE) {
323+
dismiss();
324+
}
325+
} else if (id == R.id.tv_ok) {
326+
if (definationTimeLayout.getVisibility() == View.VISIBLE) {
327+
WorkTimeMode tag = new WorkTimeMode();
328+
tag.setStartTimeHour(startHourPicker.getCurrentItemPosition());
329+
tag.setStartTimerMin(startMinPicker.getCurrentItemPosition());
330+
tag.setEndTimeHour(endHourPicker.getCurrentItemPosition());
331+
tag.setEndTimeMin(endMinPicker.getCurrentItemPosition());
332+
if (!WorkTimeMode.Companion.ifTimeLegal(tag)) {
333+
T.show(getContext().getString(R.string.end_time_earlier_start_time));
334+
return;
325335
}
326-
break;
327-
case R.id.tv_ok:
328-
if (definationTimeLayout.getVisibility() == View.VISIBLE) {
329-
WorkTimeMode tag = new WorkTimeMode();
330-
tag.setStartTimeHour(startHourPicker.getCurrentItemPosition());
331-
tag.setStartTimerMin(startMinPicker.getCurrentItemPosition());
332-
tag.setEndTimeHour(endHourPicker.getCurrentItemPosition());
333-
tag.setEndTimeMin(endMinPicker.getCurrentItemPosition());
334-
if (!WorkTimeMode.Companion.ifTimeLegal(tag)) {
335-
T.show(getContext().getString(R.string.end_time_earlier_start_time));
336-
return;
337-
}
338-
339-
if (WorkTimeMode.Companion.isAllDay(tag)) {
340-
workTimeMode.setTimeType(0);
341-
resetModeTime();
342-
showView(startLayout);
343-
return;
344-
}
345-
// 点击保存，界面处于自定义选择框时，保存当前选择的内容
346-
workTimeMode.setTimeType(1);
347-
setModeTime(startHourPicker.getCurrentItemPosition(), startMinPicker.getCurrentItemPosition(),
348-
endHourPicker.getCurrentItemPosition(), endMinPicker.getCurrentItemPosition());
349-
showView(startLayout);
350-
} else if (definationDayLayout.getVisibility() == View.VISIBLE) {
351-
String days = WorkTimeMode.Companion.convetDaySet2Days(dayAdapter.getIndex());
352-
int dayType = WorkTimeMode.Companion.getDayType(days);
353-
if (dayType < 0) {
354-
T.show(context.getString(R.string.at_least_select_one_day));
355-
return;
356-
} else {
357-
workTimeMode.setWorkDayType(dayType);
358-
workTimeMode.setWorkDays(days);
359-
adapter.setIndex(new HashSet<Integer>() {{
360-
add(workTimeMode.getWorkDayType());
361-
}});
362-
adapter.notifyDataSetChanged();
363-
}
336+
337+
if (WorkTimeMode.Companion.isAllDay(tag)) {
338+
workTimeMode.setTimeType(0);
339+
resetModeTime();
364340
showView(startLayout);
365-
} else if (onDismisListener != null && startLayout.getVisibility() == View.VISIBLE) {
366-
onDismisListener.onSaveClicked(workTimeMode);
367-
dismiss();
341+
return;
342+
}
343+
// 点击保存，界面处于自定义选择框时，保存当前选择的内容
344+
workTimeMode.setTimeType(1);
345+
setModeTime(startHourPicker.getCurrentItemPosition(), startMinPicker.getCurrentItemPosition(),
346+
endHourPicker.getCurrentItemPosition(), endMinPicker.getCurrentItemPosition());
347+
showView(startLayout);
348+
} else if (definationDayLayout.getVisibility() == View.VISIBLE) {
349+
String days = WorkTimeMode.Companion.convetDaySet2Days(dayAdapter.getIndex());
350+
int dayType = WorkTimeMode.Companion.getDayType(days);
351+
if (dayType < 0) {
352+
T.show(context.getString(R.string.at_least_select_one_day));
353+
return;
354+
} else {
355+
workTimeMode.setWorkDayType(dayType);
356+
workTimeMode.setWorkDays(days);
357+
adapter.setIndex(new HashSet<Integer>() {{
358+
add(workTimeMode.getWorkDayType());
359+
}});
360+
adapter.notifyDataSetChanged();
368361
}
369-
break;
370-
case R.id.outside_dialog_layout:
362+
showView(startLayout);
363+
} else if (onDismisListener != null && startLayout.getVisibility() == View.VISIBLE) {
364+
onDismisListener.onSaveClicked(workTimeMode);
371365
dismiss();
372-
break;
373-
case R.id.layout_all:
374-
break;
366+
}
367+
} else if (id == R.id.outside_dialog_layout) {
368+
dismiss();
369+
} else if (id == R.id.layout_all) {
370+
// do nothing
375371
}
376372
}
377373
};

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/ShareOptionDialog.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,15 @@ public void initView() {
3636

3737
@Override
3838
public void onClick(View v) {
39-
switch (v.getId())
40-
{
41-
case R.id.layout_copy_link:
42-
if (onDismisListener != null) {
43-
onDismisListener.onCopyLinkClicked();
44-
}
45-
break;
46-
case R.id.layout_wechat_share:
47-
if (onDismisListener != null) {
48-
onDismisListener.onShareWechatClicked();
49-
}
50-
break;
39+
int id = v.getId();
40+
if (id == R.id.layout_copy_link) {
41+
if (onDismisListener != null) {
42+
onDismisListener.onCopyLinkClicked();
43+
}
44+
} else if (id == R.id.layout_wechat_share) {
45+
if (onDismisListener != null) {
46+
onDismisListener.onShareWechatClicked();
47+
}
5148
}
5249
dismiss();
5350
}

0 commit comments

Comments
 (0)