Commit 5bb8e26e by chengchong

加上了pm0000

parent 7370633a
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>
......
...@@ -89,8 +89,6 @@ public class SetTimeActivity extends BaseActivity { ...@@ -89,8 +89,6 @@ public class SetTimeActivity extends BaseActivity {
private TimeBean getBottomTime() { private TimeBean getBottomTime() {
TimeBean timeBean = new TimeBean(); TimeBean timeBean = new TimeBean();
amPmList.add("AM");
amPmList.add("PM");
String hour = wheelHour_dw.getSeletedItem(); String hour = wheelHour_dw.getSeletedItem();
...@@ -247,6 +245,9 @@ public class SetTimeActivity extends BaseActivity { ...@@ -247,6 +245,9 @@ public class SetTimeActivity extends BaseActivity {
@Override @Override
public void initData() { public void initData() {
amPmList.add("AM");
amPmList.add("PM");
Date time = new Date(); Date time = new Date();
int hour = LocalDateUtils.getHour(time); int hour = LocalDateUtils.getHour(time);
int minute = LocalDateUtils.getSecond(time); int minute = LocalDateUtils.getSecond(time);
...@@ -316,7 +317,7 @@ public class SetTimeActivity extends BaseActivity { ...@@ -316,7 +317,7 @@ public class SetTimeActivity extends BaseActivity {
wheelSecond.setSeletion(indexSecond); wheelSecond.setSeletion(indexSecond);
//amPM //amPM
mAmPm.setOffset(3); mAmPm.setOffset(1);
mAmPm.setItems(amPmList); mAmPm.setItems(amPmList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment