onny/nextcompanion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix no gps_tracking data available

Browse source
This commit is contained in:
hochi 2019-06-24 15:59:10 +02:00
parent 090e9aa8cb
commit 2ae7645c5a
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java
View file

@ -154,8 +154,7 @@ public class MainActivity extends AppCompatActivity implements AsyncTaskCallback
String bID = bike.getString("bike"); String bID = bike.getString("bike");
String stID = bike.getString("start_place"); String stID = bike.getString("start_place");
String lockE = bike.getString("electric_lock"); String lockE = bike.getString("electric_lock");
String gps = bike.getString("gps_tracking"); String[] bikeArray = {bID, stID, lockE};
String[] bikeArray = {bID, stID, lockE, gps};
intent.putExtra("bike", bikeArray); intent.putExtra("bike", bikeArray);
startActivity(intent); startActivity(intent);
} }

2
app/src/main/java/com/example/hochi/nextcompanion/ReturnActivity.java
View file

@ -24,7 +24,7 @@ public class ReturnActivity extends AppCompatActivity implements AsyncTaskCallba
//if GPS and electric lock, show the instruction //if GPS and electric lock, show the instruction
TextView tv = findViewById(R.id.gps_info); TextView tv = findViewById(R.id.gps_info);
LinearLayout la = findViewById(R.id.return_form_container); LinearLayout la = findViewById(R.id.return_form_container);
if(bikeArray[2].equals("true") && bikeArray[3].equals("true")) { if(bikeArray[2].equals("true")) {
tv.setVisibility(View.VISIBLE); tv.setVisibility(View.VISIBLE);
la.setVisibility(View.INVISIBLE); la.setVisibility(View.INVISIBLE);
} }

15
app/src/main/res/layout/activity_return.xml
View file

@ -20,13 +20,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView
android:id="@+id/gps_info"
android:gravity="center"
android:textSize="20sp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/indicator_electronic_gps_lock" />
<LinearLayout <LinearLayout
android:id="@+id/return_form_container" android:id="@+id/return_form_container"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -56,6 +49,14 @@
android:text="@string/action_return_submit" android:text="@string/action_return_submit"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/gps_info"
android:gravity="center"
android:textSize="20sp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/indicator_electronic_lock" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>