Changeset 3a0d468 in galcon-client

Timestamp:

Jun 20, 2010, 6:29:03 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

a4f5200, b87af8a

Parents:

9d030cb

Message:

Added code to connect to the game server.

Files:

• AndroidManifest.xml (modified) (1 diff)
• res/values/strings.xml (modified) (1 diff)
• src/com/example/helloandroid/ClientThread.java (added)
• src/com/example/helloandroid/Connection.java (added)
• src/com/example/helloandroid/Game.java (modified) (4 diffs)
• src/com/example/helloandroid/GameView.java (modified) (5 diffs)
• src/com/example/helloandroid/MessageType.java (added)

AndroidManifest.xml

@@ -11 +11 @@
     </application>
     <uses-sdk android:minSdkVersion="7" />
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

res/values/strings.xml

@@ -8 +8 @@
     <string name="menu_pause">Pause</string>
     <string name="menu_resume">Resume</string>
-    <string name="menu_easy">Easy</string>
-    <string name="menu_medium">Medium</string>
-    <string name="menu_hard">Hard</string>
+    <string name="menu_connect">Connect</string>
     
     <string name="mode_ready">Lunar Lander\nPress Up To Play</string>

src/com/example/helloandroid/Game.java

@@ -11 +11 @@
 
 public class Game extends Activity {
-    private static final int MENU_EASY = 1;
-
-    private static final int MENU_HARD = 2;
-
-    private static final int MENU_MEDIUM = 3;
-
-    private static final int MENU_PAUSE = 4;
-
-    private static final int MENU_RESUME = 5;
-
-    private static final int MENU_START = 6;
-
-    private static final int MENU_STOP = 7;
+    private static final int MENU_PAUSE = 1;
+    private static final int MENU_RESUME = 2;
+    private static final int MENU_START = 3;
+    private static final int MENU_STOP = 4;
+    private static final int MENU_CONNECT = 5;
 
     /** A handle to the thread that's actually running the animation. */
-    private DrawingThread mThread;
+    public DrawingThread mThread;
 
     /** A handle to the View in which the game is running. */
     private GameView mGameView;
 
+    private ClientThread client;
+    
     /**
      * Invoked during init to give the Activity a chance to set up its Menu.
@@ -45 +39 @@
         menu.add(0, MENU_PAUSE, 0, R.string.menu_pause);
         menu.add(0, MENU_RESUME, 0, R.string.menu_resume);
-        menu.add(0, MENU_EASY, 0, R.string.menu_easy);
-        menu.add(0, MENU_MEDIUM, 0, R.string.menu_medium);
-        menu.add(0, MENU_HARD, 0, R.string.menu_hard);
+        menu.add(0, MENU_CONNECT, 0, R.string.menu_connect);
 
         return true;
@@ -66 +58 @@
                 return true;
             case MENU_STOP:
-                mThread.setState(DrawingThread.STATE_LOSE,
-                        getText(R.string.message_stopped));
+                mThread.setState(DrawingThread.STATE_LOSE, getText(R.string.message_stopped));
                 return true;
             case MENU_PAUSE:
@@ -75 +66 @@
                 mThread.unpause();
                 return true;
+            case MENU_CONNECT:
+                mThread.connectionStarted = true;
+                client = new ClientThread("192.168.1.6", 1337, this);
+                                client.start();
+                                mThread.doStart();
+                                return true;
         }
 

src/com/example/helloandroid/GameView.java

@@ -81 +81 @@
         
         int mFleetSize;
+        
+        public boolean connectionStarted;
+        public String connMessage;
 
         public DrawingThread(SurfaceHolder surfaceHolder, Context context,
@@ -107 +110 @@
             
             mFleetSize = 50;
+            
+            connectionStarted = false;
+            connMessage = "";
         }
 
@@ -346 +352 @@
                 }
                 }
-                
+        
+                //draw the fleet size bar on the bottom of the screen
                 float textSize = mTextPaint.getTextSize();
                 mTextPaint.setTextSize(24);
@@ -355 +362 @@
                 
                 mTextPaint.setTextSize(textSize);
-                
+        
                 mLinePaint.setColor(Color.YELLOW);
                 canvas.drawRoundRect(new RectF(70, mCanvasHeight-15, mCanvasWidth-70, mCanvasHeight-5), 5, 5, mLinePaint);
@@ -361 +368 @@
                 mLinePaint.setColor(Color.GREEN);
                 canvas.drawRoundRect(new RectF(70, mCanvasHeight-15, 70+(mCanvasWidth-140)*mFleetSize/100, mCanvasHeight-5), 5, 5, mLinePaint);
+                
+                //draw connection info
+                if(connectionStarted) {
+                        canvas.drawText(connMessage, (mCanvasWidth-mTextPaint.measureText(connMessage))/2, mCanvasHeight-200-(metrics.ascent+metrics.descent), mTextPaint);
+                }
         }