diff --git a/app/build.gradle b/app/build.gradle index b275cbc..0ef1411 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'io.reactivex.rxjava2:rxjava:2.2.6' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 35fc138..2ac7277 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ + diff --git a/app/src/main/java/com/example/pc/caseproject/HeartActivity.kt b/app/src/main/java/com/example/pc/caseproject/HeartActivity.kt index d23cb91..3a2fa82 100644 --- a/app/src/main/java/com/example/pc/caseproject/HeartActivity.kt +++ b/app/src/main/java/com/example/pc/caseproject/HeartActivity.kt @@ -21,6 +21,10 @@ import android.view.MenuItem import android.widget.Toast import android.widget.Toast.LENGTH_LONG import android.support.v7.widget.Toolbar +import android.view.View +import android.widget.Button +import butterknife.BindView +import butterknife.OnClick import kotlinx.android.synthetic.main.activity_heart.* @@ -52,8 +56,17 @@ class HeartActivity : AppCompatActivity(), CPRButton.PulseUpdateListener, AEDUti cprButton.pulseUpdateListener = this cprButton.isClickable = false cprButton.background = resources.getDrawable(R.drawable.cpr_button_static) + val reward_button = findViewById(R.id.reward_Button) as Button + pauseButton.setOnClickListener { cprButton.stop() } cprButton.setOnClickListener { cprButton.start() } + + reward_button.setOnClickListener { + val intent = Intent(this, RewardActivity::class.java) + intent.putExtra("user_flag", 0) + startActivity(intent) + } + text911() } diff --git a/app/src/main/java/com/example/pc/caseproject/MainActivity.java b/app/src/main/java/com/example/pc/caseproject/MainActivity.java index e5bd340..608c575 100644 --- a/app/src/main/java/com/example/pc/caseproject/MainActivity.java +++ b/app/src/main/java/com/example/pc/caseproject/MainActivity.java @@ -35,6 +35,7 @@ public class MainActivity extends AppCompatActivity { Button aedButton; @BindView(R.id.toolbar) Toolbar toolbar; + private ArrayList missingPermissions; private String[] permissions = {Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.SEND_SMS}; diff --git a/app/src/main/java/com/example/pc/caseproject/RewardActivity.java b/app/src/main/java/com/example/pc/caseproject/RewardActivity.java new file mode 100644 index 0000000..0d3efa6 --- /dev/null +++ b/app/src/main/java/com/example/pc/caseproject/RewardActivity.java @@ -0,0 +1,28 @@ +package com.example.pc.caseproject; + +import android.media.Image; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.widget.ImageView; + +import com.bumptech.glide.Glide; + +public class RewardActivity extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_reward); + ImageView reward_image = (ImageView) findViewById(R.id.reward_money); + int flag = -1; + flag = getIntent().getIntExtra("user_flag", 1); + if(flag == 0) { + Glide.with(this).load(R.drawable.reward_).into(reward_image); + } + else if(flag == 1) { + Glide.with(this).load(R.drawable.reward_suppoter).into(reward_image); + } + else { + Glide.with(this).load(R.drawable.mylocation).into(reward_image); + } + } +} diff --git a/app/src/main/java/com/example/pc/caseproject/SOSActivity.java b/app/src/main/java/com/example/pc/caseproject/SOSActivity.java index 7738086..5b58799 100644 --- a/app/src/main/java/com/example/pc/caseproject/SOSActivity.java +++ b/app/src/main/java/com/example/pc/caseproject/SOSActivity.java @@ -1,5 +1,6 @@ package com.example.pc.caseproject; +import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; @@ -9,6 +10,9 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.view.View; +import android.widget.Button; import android.widget.TextView; import android.widget.Toolbar; @@ -24,6 +28,9 @@ import java.util.List; import java.util.Locale; +import butterknife.BindView; +import butterknife.OnClick; + public class SOSActivity extends AppCompatActivity implements OnMapReadyCallback { String sender_address, aed_address, date, sender_token, nowAddress; @@ -79,6 +86,14 @@ protected void onCreate(Bundle savedInstanceState) { myAddress = findViewById(R.id.aedAddress); myAddress.setText(nowAddress); + Button reward_Button = (Button) findViewById(R.id.reward_Button); + reward_Button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(view.getContext(), RewardActivity.class); + intent.putExtra("user_flag", 1); + view.getContext().startActivity(intent);} + }); FragmentManager fm = getSupportFragmentManager(); SupportMapFragment f = (SupportMapFragment) fm.findFragmentById(R.id.map); @@ -100,6 +115,14 @@ public boolean onSupportNavigateUp() { return true; } +// @OnClick(R.id.reward_Button) +// public void onRewardButtonClicked(View v) { +// Log.d("reward", "dd"); +// Intent intent = new Intent(this, RewardActivity.class); +// intent.putExtra("user_flag", 1); +// startActivity(intent); +// } + @Override public void onMapReady(final GoogleMap map) { diff --git a/app/src/main/res/drawable/reward_.png b/app/src/main/res/drawable/reward_.png new file mode 100644 index 0000000..6976fd4 Binary files /dev/null and b/app/src/main/res/drawable/reward_.png differ diff --git a/app/src/main/res/drawable/reward_heart.png b/app/src/main/res/drawable/reward_heart.png new file mode 100644 index 0000000..88fe25b Binary files /dev/null and b/app/src/main/res/drawable/reward_heart.png differ diff --git a/app/src/main/res/drawable/reward_money.png b/app/src/main/res/drawable/reward_money.png new file mode 100644 index 0000000..66ffcb7 Binary files /dev/null and b/app/src/main/res/drawable/reward_money.png differ diff --git a/app/src/main/res/drawable/reward_money2.png b/app/src/main/res/drawable/reward_money2.png new file mode 100644 index 0000000..b9cfe76 Binary files /dev/null and b/app/src/main/res/drawable/reward_money2.png differ diff --git a/app/src/main/res/drawable/reward_suppoter.png b/app/src/main/res/drawable/reward_suppoter.png new file mode 100644 index 0000000..71a7690 Binary files /dev/null and b/app/src/main/res/drawable/reward_suppoter.png differ diff --git a/app/src/main/res/layout/activity_heart.xml b/app/src/main/res/layout/activity_heart.xml index 3647935..73b6887 100644 --- a/app/src/main/res/layout/activity_heart.xml +++ b/app/src/main/res/layout/activity_heart.xml @@ -73,6 +73,17 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/buttonWrapper" /> +