Skip to content

Commit

Permalink
Structure string requests + dirty showing finished
Browse files Browse the repository at this point in the history
  • Loading branch information
felixhofmann committed Mar 4, 2018
1 parent f1b3353 commit f8cd007
Show file tree
Hide file tree
Showing 9 changed files with 296 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
import homeds.htl.at.homedsjee.fragment.MediaOverviewFragment;
import homeds.htl.at.homedsjee.fragment.NewsEditFragment;
import homeds.htl.at.homedsjee.fragment.NewsOverviewFragment;
import homeds.htl.at.homedsjee.fragment.StructureDetailFragment;
import homeds.htl.at.homedsjee.fragment.StructurePlanFragment;

public class MainActivity extends AppCompatActivity implements HomeScreenFragment.OnFragmentInteractionListener,
NewsEditFragment.OnFragmentInteractionListener,NewsOverviewFragment.OnFragmentInteractionListener,
StructurePlanFragment.OnFragmentInteractionListener,MediaOverviewFragment.OnFragmentInteractionListener {
StructurePlanFragment.OnFragmentInteractionListener,MediaOverviewFragment.OnFragmentInteractionListener,
StructureDetailFragment.OnFragmentInteractionListener {

public static MainActivity instance;
@Override
Expand Down Expand Up @@ -71,4 +73,13 @@ public void openMediaOverviewFragment(){
fm.beginTransaction().replace(R.id.container_main,mediaOverviewFragment,null).commit();
}

public void openStructureDetailFragment(Bundle bundle){
StructureDetailFragment structureDetailFragmen = new StructureDetailFragment();
structureDetailFragmen.setArguments(bundle);

FragmentManager fm = getSupportFragmentManager();
fm.beginTransaction().replace(R.id.container_main,structureDetailFragmen,null).commit();

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import android.view.View;
import android.view.ViewGroup;

import org.json.JSONObject;

import java.util.LinkedList;

import homeds.htl.at.homedsjee.entity.Structure;
Expand All @@ -16,9 +18,9 @@

public class StructurePlanAdapter extends RecyclerView.Adapter<StructurePlanViewHolder> {

LinkedList<Structure> structures = new LinkedList<>();
LinkedList<JSONObject> structures = new LinkedList<>();

public StructurePlanAdapter(LinkedList<Structure> structures){this.structures = structures;}
public StructurePlanAdapter(LinkedList<JSONObject> structures){this.structures = structures;}
@Override
public StructurePlanViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View v = LayoutInflater.from(parent.getContext()).inflate(android.R.layout.simple_list_item_1,parent,false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;

import homeds.htl.at.homedsjee.R;
import homeds.htl.at.homedsjee.activity.MainActivity;
import homeds.htl.at.homedsjee.apiClient.RequestHelper;
import homeds.htl.at.homedsjee.enumeration.RequestTypeEnum;
import okhttp3.Response;

/**
* A simple {@link Fragment} subclass.
Expand All @@ -29,7 +33,7 @@ public class HomeScreenFragment extends android.support.v4.app.Fragment {
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;

RequestHelper rh = new RequestHelper();
private OnFragmentInteractionListener mListener;

public HomeScreenFragment() {
Expand Down Expand Up @@ -69,10 +73,29 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
// Inflate the layout for this fragment
View v = inflater.inflate(R.layout.fragment_home_screen, container, false);

String url = "http://10.0.2.2:8080/homeds/rs/status/";
rh.executeRequest(RequestTypeEnum.GET,null,url);


ImageView ivUp = v.findViewById(R.id.ivServerUp);
ivUp.setVisibility(View.INVISIBLE);
ImageView ivDown = v.findViewById(R.id.ivServerDown);
ivDown.setVisibility(View.INVISIBLE);
ImageButton ibNewsView = v.findViewById(R.id.ibNewsView);
ImageButton ibStructurePlan = v.findViewById(R.id.ibStructurePlan);
ImageButton ibMediaOverview = v.findViewById(R.id.ibMediaOverview);

try {
String hallo = getResponseWithWait();
} catch (InterruptedException e) {
e.printStackTrace();
}
if (rh.getResponseCode() == 200 ){
ivUp.setVisibility(View.VISIBLE);
}else{
ivDown.setVisibility(View.VISIBLE);
}

ibNewsView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Expand Down Expand Up @@ -134,4 +157,12 @@ public interface OnFragmentInteractionListener {
// TODO: Update argument type and name
void onFragmentInteraction(Uri uri);
}

public String getResponseWithWait() throws InterruptedException {

while(rh.getResponseBody() == null){
Thread.sleep(100);
}
return rh.getResponseBody();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package homeds.htl.at.homedsjee.fragment;

import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.app.Fragment;
import android.text.method.ScrollingMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Scroller;
import android.widget.TextView;

import homeds.htl.at.homedsjee.R;

/**
* A simple {@link Fragment} subclass.
* Activities that contain this fragment must implement the
* {@link StructureDetailFragment.OnFragmentInteractionListener} interface
* to handle interaction events.
* Use the {@link StructureDetailFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class StructureDetailFragment extends android.support.v4.app.Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";

// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;

private OnFragmentInteractionListener mListener;

public StructureDetailFragment() {
// Required empty public constructor
}

/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment StructureDetailFragment.
*/
// TODO: Rename and change types and number of parameters
public static StructureDetailFragment newInstance(String param1, String param2) {
StructureDetailFragment fragment = new StructureDetailFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View v = inflater.inflate(R.layout.fragment_structure_detail, container, false);
Bundle bundle = this.getArguments();
TextView tvStructureDetailStiring = v.findViewById(R.id.tvStructureDetailString);
tvStructureDetailStiring.setMovementMethod(new ScrollingMovementMethod());
String detail = bundle.getString("actStructure");

tvStructureDetailStiring.setText(detail);
return v;
}

// TODO: Rename method, update argument and hook method into UI event
public void onButtonPressed(Uri uri) {
if (mListener != null) {
mListener.onFragmentInteraction(uri);
}
}

@Override
public void onAttach(Context context) {
super.onAttach(context);
if (context instanceof OnFragmentInteractionListener) {
mListener = (OnFragmentInteractionListener) context;
} else {
throw new RuntimeException(context.toString()
+ " must implement OnFragmentInteractionListener");
}
}

@Override
public void onDetach() {
super.onDetach();
mListener = null;
}

/**
* This interface must be implemented by activities that contain this
* fragment to allow an interaction in this fragment to be communicated
* to the activity and potentially other fragments contained in that
* activity.
* <p>
* See the Android Training lesson <a href=
* "http://developer.android.com/training/basics/fragments/communicating.html"
* >Communicating with Other Fragments</a> for more information.
*/
public interface OnFragmentInteractionListener {
// TODO: Update argument type and name
void onFragmentInteraction(Uri uri);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,20 @@
import android.view.View;
import android.view.ViewGroup;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

import java.time.LocalDate;
import java.util.HashMap;
import java.util.LinkedList;

import homeds.htl.at.homedsjee.R;
import homeds.htl.at.homedsjee.adapter.NewsAdapter;
import homeds.htl.at.homedsjee.adapter.StructurePlanAdapter;
import homeds.htl.at.homedsjee.apiClient.RequestHelper;
import homeds.htl.at.homedsjee.entity.Structure;
import homeds.htl.at.homedsjee.enumeration.RequestTypeEnum;

/**
* A simple {@link Fragment} subclass.
Expand All @@ -34,7 +42,7 @@ public class StructurePlanFragment extends android.support.v4.app.Fragment {
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;

RequestHelper rh = new RequestHelper();
private OnFragmentInteractionListener mListener;

public StructurePlanFragment() {
Expand Down Expand Up @@ -76,9 +84,35 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,

RecyclerView rvStructurePlan = v.findViewById(R.id.rvStructurePlan);

LinkedList<Structure> splan = new LinkedList<>();
HashMap<String,String> params = new HashMap<>();
params.put("layoutId","-1");
String url ="http://10.0.2.2:8080/homeds/rs/crawler/";
rh.executeRequest(RequestTypeEnum.GET,params,url);


LinkedList<JSONObject> structureparts = new LinkedList<>();
JSONArray jsonArray = null;

try {
String response = getResponseWithWait();
jsonArray = new JSONArray(response);
for (int i = 0; i < jsonArray.length(); i++) {

JSONObject jsonObject = jsonArray.getJSONObject(i);

structureparts.add(jsonObject);

}
} catch (JSONException e) {
e.printStackTrace();
}catch (InterruptedException e) {
e.printStackTrace();
}




StructurePlanAdapter structurePlanAdapter = new StructurePlanAdapter(splan);
StructurePlanAdapter structurePlanAdapter = new StructurePlanAdapter(structureparts);
rvStructurePlan.setAdapter(structurePlanAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
Expand Down Expand Up @@ -124,4 +158,12 @@ public interface OnFragmentInteractionListener {
// TODO: Update argument type and name
void onFragmentInteraction(Uri uri);
}

public String getResponseWithWait() throws InterruptedException {

while(rh.getResponseBody() == null){
Thread.sleep(100);
}
return rh.getResponseBody();
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package homeds.htl.at.homedsjee.viewholder;

import android.os.Bundle;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;

import org.json.JSONException;
import org.json.JSONObject;

import homeds.htl.at.homedsjee.activity.MainActivity;
import homeds.htl.at.homedsjee.entity.Structure;

Expand All @@ -19,14 +23,20 @@ public StructurePlanViewHolder(View itemView) {
t2 = itemView.findViewById(android.R.id.text2);;
}

public void updateUI(final Structure structure){
t1.setText(String.valueOf(structure.getName()));
t2.setText(String.valueOf( "Unterstrukturen: " + structure.getSubStructuresCount()));
public void updateUI(final JSONObject structure){
try {
t1.setText(structure.getString("layout"));
} catch (JSONException e) {
e.printStackTrace();
}

this.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

Bundle bundle = new Bundle();
String struct = structure.toString();
bundle.putSerializable("actStructure",struct);
MainActivity.getInstance().openStructureDetailFragment(bundle);
}
});
}
Expand Down
Loading

0 comments on commit f8cd007

Please sign in to comment.