Commit 5f599c37 by 韩飞虎

我他妈全部搞定了

parent 68c3b027
...@@ -92,8 +92,6 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -92,8 +92,6 @@ public class SelectTimerActivity extends BaseActivity {
@OnClick(R.id.back_but) @OnClick(R.id.back_but)
public void onViewClicked() { public void onViewClicked() {
Intent intent = new Intent(SelectTimerActivity.this, SelectDeviceActivity.class); finish();
startActivity(intent);
} }
} }
\ No newline at end of file
package com.example.blu.toys.activity; package com.example.blu.toys.activity;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
...@@ -61,6 +63,15 @@ public class SetTimeActivity extends BaseActivity { ...@@ -61,6 +63,15 @@ public class SetTimeActivity extends BaseActivity {
RelativeLayout startBut; RelativeLayout startBut;
@BindView(R.id.will) @BindView(R.id.will)
TypefaceTextView will; TypefaceTextView will;
@BindView(R.id.settings)
ImageView settings;
@BindView(R.id.shop)
ImageView shop;
@BindView(R.id.rate)
ImageView mImageView03;
private ArrayList<String> hourList = new ArrayList<>(); private ArrayList<String> hourList = new ArrayList<>();
private ArrayList<String> sixList = new ArrayList<>(); private ArrayList<String> sixList = new ArrayList<>();
...@@ -328,6 +339,31 @@ public class SetTimeActivity extends BaseActivity { ...@@ -328,6 +339,31 @@ public class SetTimeActivity extends BaseActivity {
LogUtils.e("连接 成功-----开机"); LogUtils.e("连接 成功-----开机");
} }
@OnClick({R.id.settings})
public void settingsClick(){
Intent intent = new Intent(SetTimeActivity.this, SelectTimerActivity.class);
startActivity(intent);
}
@OnClick({R.id.shop})
public void shopClick(){
Uri uri = Uri.parse("http://stoplightgolight.com/product/stoplight-golight/");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
}
@OnClick({R.id.rate})
public void rateClick(){
Uri uri = Uri.parse("http://stoplightgolight.com/product/stoplight-golight/");
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
}
@OnClick({R.id.back_but, R.id.start_but}) @OnClick({R.id.back_but, R.id.start_but})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
......
...@@ -246,6 +246,7 @@ ...@@ -246,6 +246,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
...@@ -254,20 +255,22 @@ ...@@ -254,20 +255,22 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/shop"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_80" android:layout_height="@dimen/dp_80"
android:src="@mipmap/shopbutton" /> android:src="@mipmap/shopbutton" />
<ImageView <ImageView
android:id="@+id/settings"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_80" android:layout_height="@dimen/dp_80"
android:layout_marginLeft="@dimen/dp_8" android:layout_marginLeft="@dimen/dp_8"
android:layout_marginRight="@dimen/dp_8" android:layout_marginRight="@dimen/dp_8"
android:src="@mipmap/settingsbutton" /> android:src="@mipmap/settingsbutton" />
<ImageView <ImageView
android:id="@+id/rate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_80" android:layout_height="@dimen/dp_80"
android:src="@mipmap/ratebutton" /> android:src="@mipmap/ratebutton" />
......
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