GO Horse

LoveGame_Project/AndroidManifest.xml

@@ -21,7 +21,7 @@
         <activity
             android:name="com.example.lovegame_project.Menu_main"
             android:label="@string/app_name" >
-              <intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -46,7 +46,6 @@
         <activity
             android:name="com.example.lovegame_project.Chat"
             android:label="@string/title_activity_chat" >
-
         </activity>
         <activity
             android:name="com.example.lovegame_project.DeviceList"
@@ -60,6 +59,10 @@
             android:name="com.example.lovegame_project.Instrucoes"
             android:label="@string/title_activity_instrucoes" >
         </activity>
+        <activity
+            android:name="com.example.lovegame_project.FimDeJogo"
+            android:label="@string/title_activity_fim_de_jogo" >
+        </activity>
     </application>
 
 </manifest>

LoveGame_Project/gen/com/example/lovegame_project/R.java

@@ -30,68 +30,76 @@ public static final class drawable {
         public static final int botao_scanear=0x7f020006;
         public static final int celular_bluetooth=0x7f020007;
         public static final int credito=0x7f020008;
-        public static final int ic_launcher=0x7f020009;
-        public static final int icone_final_48x48=0x7f02000a;
-        public static final int instrucao=0x7f02000b;
-        public static final int pergunta_tela=0x7f02000c;
-        public static final int tela_inicio=0x7f02000d;
+        public static final int fim_0a1_acertos=0x7f020009;
+        public static final int fim_2a5_acertos=0x7f02000a;
+        public static final int fim_6a8_acertos=0x7f02000b;
+        public static final int fim_9a10_acertos=0x7f02000c;
+        public static final int ic_launcher=0x7f02000d;
+        public static final int icone_final_48x48=0x7f02000e;
+        public static final int instrucao=0x7f02000f;
+        public static final int pergunta_tela=0x7f020010;
+        public static final int tela_inicio=0x7f020011;
     }
     public static final class id {
-        public static final int Nao=0x7f090013;
-        public static final int Pergunta=0x7f09000f;
-        public static final int Resposta=0x7f090010;
-        public static final int ScanButton=0x7f090015;
-        public static final int Sim=0x7f090012;
-        public static final int TextView01=0x7f090019;
-        public static final int Voltar=0x7f090011;
-        public static final int action_settings=0x7f09001f;
-        public static final int activateBtButton=0x7f090014;
-        public static final int botao_certo=0x7f090005;
+        public static final int Nao=0x7f090015;
+        public static final int Pergunta=0x7f090011;
+        public static final int Resposta=0x7f090012;
+        public static final int ScanButton=0x7f090017;
+        public static final int Sim=0x7f090014;
+        public static final int TextView01=0x7f09001b;
+        public static final int Voltar=0x7f090013;
+        public static final int action_settings=0x7f090021;
+        public static final int activateBtButton=0x7f090016;
+        public static final int botao_certo=0x7f090004;
         public static final int botao_errado=0x7f090007;
-        public static final int bt_comecar=0x7f09001e;
-        public static final int bt_creditos=0x7f09001c;
-        public static final int bt_enviar=0x7f090004;
-        public static final int bt_enviarSalvo=0x7f090017;
-        public static final int bt_instrucoes=0x7f09001d;
+        public static final int bt_comecar=0x7f090020;
+        public static final int bt_creditos=0x7f09001e;
+        public static final int bt_enviar=0x7f090003;
+        public static final int bt_enviarSalvo=0x7f090019;
+        public static final int bt_instrucoes=0x7f09001f;
         public static final int button1=0x7f090001;
         public static final int button_scan=0x7f09000c;
-        public static final int corpoTxt=0x7f09001a;
-        public static final int edit_resposta=0x7f090006;
-        public static final int leaveButton=0x7f090016;
+        public static final int corpoTxt=0x7f09001c;
+        public static final int edit_resposta=0x7f090005;
+        public static final int layout_fimdejogo=0x7f09000d;
+        public static final int leaveButton=0x7f090018;
         public static final int newDevicesTittle=0x7f09000a;
         public static final int new_devices=0x7f09000b;
-        public static final int nomeTxt=0x7f090018;
+        public static final int nomeTxt=0x7f09001a;
         public static final int pairedDevicesTittle=0x7f090008;
         public static final int paired_devices=0x7f090009;
         public static final int pergunta=0x7f090002;
-        public static final int resposta=0x7f090003;
+        public static final int resposta=0x7f090006;
         public static final int textView1=0x7f090000;
-        public static final int txtPreencher=0x7f09000e;
-        public static final int txtRoot2=0x7f09000d;
-        public static final int voltar=0x7f09001b;
+        public static final int texto_pontos=0x7f09000e;
+        public static final int txtPreencher=0x7f090010;
+        public static final int txtRoot2=0x7f09000f;
+        public static final int voltar=0x7f09001d;
     }
     public static final class layout {
         public static final int activity_achievements_menu=0x7f030000;
         public static final int activity_chat=0x7f030001;
         public static final int activity_creditos=0x7f030002;
         public static final int activity_device_list=0x7f030003;
-        public static final int activity_instrucoes=0x7f030004;
-        public static final int activity_love__game=0x7f030005;
-        public static final int activity_main=0x7f030006;
-        public static final int activity_mandar_pergunta=0x7f030007;
-        public static final int activity_menumain=0x7f030008;
-        public static final int list=0x7f030009;
+        public static final int activity_fim_de_jogo=0x7f030004;
+        public static final int activity_instrucoes=0x7f030005;
+        public static final int activity_love__game=0x7f030006;
+        public static final int activity_main=0x7f030007;
+        public static final int activity_mandar_pergunta=0x7f030008;
+        public static final int activity_menumain=0x7f030009;
+        public static final int list=0x7f03000a;
     }
     public static final class menu {
         public static final int achievements_menu=0x7f080000;
         public static final int chat=0x7f080001;
         public static final int creditos=0x7f080002;
         public static final int device_list=0x7f080003;
-        public static final int instrucoes=0x7f080004;
-        public static final int love__game=0x7f080005;
-        public static final int main=0x7f080006;
-        public static final int mandar_pergunta=0x7f080007;
-        public static final int menu_main=0x7f080008;
+        public static final int fim_de_jogo=0x7f080004;
+        public static final int instrucoes=0x7f080005;
+        public static final int love__game=0x7f080006;
+        public static final int main=0x7f080007;
+        public static final int mandar_pergunta=0x7f080008;
+        public static final int menu_main=0x7f080009;
     }
     public static final class raw {
         public static final int mydata=0x7f040000;
@@ -116,6 +124,7 @@ public static final class string {
          */
         public static final int title_activity_device_list=0x7f060009;
         public static final int title_activity_enviar_pergunta=0x7f060006;
+        public static final int title_activity_fim_de_jogo=0x7f060016;
         public static final int title_activity_instrucoes=0x7f060015;
         public static final int title_activity_main=0x7f060013;
         public static final int title_activity_mandar_pergunta=0x7f060007;

LoveGame_Project/res/layout/activity_chat.xml

@@ -17,20 +17,6 @@
         android:text="..."
         android:textColor="@android:color/white"
         android:textSize="18sp" />
-
-    <TextView
-        android:id="@+id/resposta"
-        android:layout_width="320dp"
-        android:layout_height="50dp"
-        android:layout_alignTop="@dimen/activity_vertical_margin"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp"
-        android:layout_marginTop="35dp"
-        android:layout_above="@+id/bt_enviar"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="18dp"
-        android:textColor="@android:color/white"
-        android:textSize="20dp" />
 
     <Button
         android:id="@+id/bt_enviar"
@@ -49,6 +35,7 @@
         android:layout_alignLeft="@+id/edit_resposta"
         android:layout_alignTop="@+id/bt_enviar"
         android:layout_marginLeft="42dp"
+        android:onClick="onClickCerto"
         android:background="@drawable/botao_certo" />
 
     <EditText
@@ -67,7 +54,20 @@
         android:layout_height="wrap_content"
         android:layout_alignWithParentIfMissing="true"
         android:layout_below="@+id/resposta"
+        android:onClick="onClickErrado"
         android:layout_marginLeft="230dp"
         android:background="@drawable/botao_errado" />
 
+    <TextView
+        android:id="@+id/resposta"
+        android:layout_width="320dp"
+        android:layout_height="50dp"
+        android:layout_above="@+id/bt_enviar"
+        android:layout_alignRight="@+id/pergunta"
+        android:layout_marginBottom="30dp"
+        android:gravity="center"
+        android:text="..."
+        android:textColor="@android:color/black"
+        android:textSize="20dp" />
+
 </RelativeLayout>

LoveGame_Project/res/layout/activity_fim_de_jogo.xml

@@ -0,0 +1,24 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_fimdejogo"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:background="@drawable/fim_6a8_acertos"
+    tools:context=".FimDeJogo" >
+
+    <TextView
+        android:id="@+id/texto_pontos"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="37dp"
+        android:gravity="center"
+        android:text="10 pontos"
+        android:textSize="25dp" />
+
+</RelativeLayout>

LoveGame_Project/res/menu/fim_de_jogo.xml

@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>

LoveGame_Project/res/values/strings.xml

@@ -29,5 +29,6 @@
     <string name="title_activity_main">MainActivity</string>
     <string name="title_activity_creditos">Creditos</string>
     <string name="title_activity_instrucoes">Instrucoes</string>
+    <string name="title_activity_fim_de_jogo">FimDeJogo</string>
 
 </resources>

LoveGame_Project/src/com/example/lovegame_project/BluetoothConnectionManager.java

@@ -73,11 +73,12 @@ public void run() {
 		if(btSocket != null)
 		{
 
+			JogoEmSi.get().setTurn(true);
+
 			Cliente cs = new Cliente(btSocket, false);
 			MinhasCoisas.setCliente(cs);
 			// Configuramos o primeiro a responder
 
-			JogoEmSi.get().setTurn(true);
 			try {
 				mBtServerSocket.close();
 

LoveGame_Project/src/com/example/lovegame_project/Chat.java

@@ -31,6 +31,20 @@ public class Chat extends Activity {
 	private ImageButton botaoErrado;
 	private ImageButton botaoCerto;
 
+	private boolean Jogou = false;
+
+	@Override
+	protected void onStart()
+	{
+		super.onStart();
+		if(!this.Jogou)
+		{
+			this.Jogou = true;
+		}else
+		{
+			finish();
+		}
+	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -63,7 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		}
 
 		ChangeVisualization(JogoEmSi.get().getTurn());
-
+		MinhasCoisas.Show(String.valueOf( JogoEmSi.get().getTurn()));
 	}
 	public void ChangePergunta(String pergunta)
 	{
@@ -153,10 +167,45 @@ public void SetResposta(String resposta)
 
 	public void onClickCerto(View v)
 	{
+		String msg = "Botao Certo/" + "thauan";
+		JogoEmSi.get().Send(msg);
+
+		JogoEmSi.get().setTurn(true);
+		JogoEmSi.get().rodada++;
+		JogoEmSi.get().pontos++;
+		JogoEmSi.get().TestarFim();
+
+		try{
+		MinhasCoisas.Show(String.valueOf(JogoEmSi.get().pontos) + " pontos");
+
+		this.textv_resposta.setText("");
+		ChangeVisualization(JogoEmSi.get().getTurn());
+		}catch(Exception e)
+		{
+			Log.i(TAG, "Erro ao intentar FimDeJogo");
+		}
 
+
 	}
 	public void onClickErrado(View v)
 	{
+		String msg = "Botao Errado/" + "thauan";
+		JogoEmSi.get().Send(msg);
+
+		JogoEmSi.get().setTurn(true);
+		JogoEmSi.get().rodada++;
+		JogoEmSi.get().TestarFim();
+
+		try{
+		MinhasCoisas.Show(String.valueOf(JogoEmSi.get().pontos) + " pontos");
+
+		this.textv_resposta.setText("");
+		ChangeVisualization(JogoEmSi.get().getTurn());
+		}catch(Exception e)
+		{
+			Log.i(TAG, "Erro ao intentar FimDeJogo");
+		}
+
 
 	}
 
@@ -170,18 +219,14 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	public void onClick_SendButton(View v)
 	{
 		Log.i(TAG, "tentativa de enviar mensagem");
-		EditText editText = (EditText) findViewById(R.id.edit_resposta);
-		JogoEmSi.get().Send(editText.getText().toString());
+		String mensagem = "Resposta/" + this.edit_resposta.getText().toString();
+		JogoEmSi.get().Send(mensagem);
 	}
-
-	public void MudarPergunta()
-	{
-
-	}
-
 	@Override
 	public void onDestroy()
 	{
 		super.onDestroy();
+		MinhasCoisas.getCliente().cancel();
+		JogoEmSi.get().Reset2();
 	}
 }

LoveGame_Project/src/com/example/lovegame_project/Cliente.java

@@ -107,12 +107,14 @@ public void run() {
 
 		}
 
-		byte[] bytes = new byte[100];
+
 
 		while(connected)
 		{
 			Log.i(TAG, "while - first of all");
-
+
+			byte[] bytes = new byte[100];
+
 			try {
 				mInputStream.read(bytes);
 				Log.i(TAG, "executou o metodo InputStream.read()");