Merge pull request #550 from INJAE/JEON

Edit some text
injae · Dec 8, 2017 · a89785e · a89785e
2 parents c1ca6ae + 694623d
commit a89785e
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 15 deletions.
diff --git a/AndroidCryptonite/app/src/main/java/Function/Client_File_Download.java b/AndroidCryptonite/app/src/main/java/Function/Client_File_Download.java
@@ -157,7 +157,7 @@ protected void onProgressUpdate(Integer... values) {
                 break;
             case 3:
                 progressDialog.dismiss();
-                new C_Toast(context).showToast("Please send your loaction.", Toast.LENGTH_LONG);
+                new C_Toast(context).showToast("Unable to download (location verification failed)", Toast.LENGTH_LONG);
                 break;
             case 4:
                 progressDialog.dismiss();

diff --git a/Cryptonite/img/DClose2.png b/Cryptonite/img/DClose2.png
diff --git a/Cryptonite/img/DCloseR2.png b/Cryptonite/img/DCloseR2.png
diff --git a/Cryptonite/img/Developers2.png b/Cryptonite/img/Developers2.png
diff --git a/Cryptonite/map.html b/Cryptonite/map.html
@@ -15,13 +15,15 @@
 	var LatLng = {lat: 37.56, lng: 126.97};
 	var marker;
 	var circle;
-	var radius=100;
+	var radius=200;
+	var SWLatLng = {lat: 37.2089, lng: 126.97603};
+	var myLatLng = {lat: 37.503392, lng: 127.0432756};
 
       function initialize() {
 
         var myOptions = {
           center: LatLng,
-          zoom: 17,
+          zoom: 15,
           mapTypeId: google.maps.MapTypeId.ROADMAP
         };
 
@@ -125,7 +127,7 @@
     <div id="map_canvas" style="width:100%; height:100%"></div>
 	<input type="hidden" id="lat" value="37.56"/>
 	<input type="hidden" id="Lng" value="126.97"/>
-	<input type="hidden" id="radius" value="100"/>
+	<input type="hidden" id="radius" value="200"/>
 
   </body>
 </html> 
diff --git a/Cryptonite/src/Client/Client_FileSelector.java b/Cryptonite/src/Client/Client_FileSelector.java
@@ -35,7 +35,7 @@ public Client_FileSelector() { }
 	// Methods
 	public void fileFinderON()
 	{
-		  FileDialog fd = new FileDialog( this, "���� ����", FileDialog.LOAD);
+		  FileDialog fd = new FileDialog( this, "파일 선택", FileDialog.LOAD);
 		  fd.setMultipleMode(true);
 		  fd.setVisible(true);
 		  _selectedFiles = fd.getFiles();					// ���ϰ�ü �޾ƿ��°�

diff --git a/Cryptonite/src/Client/Client_File_Download.java b/Cryptonite/src/Client/Client_File_Download.java
@@ -72,7 +72,7 @@ public void requestFile(String path, String targetpath, SecretKey key)
 			System.out.println(tmpfileSize);
 			if (tmpfileSize.equals("distance"))	//GPS return value
 			{
-				showMessage("Fail", "Please Send your location using Android Cryptonite.");
+				showMessage("Fail", "Unable to download (location verification failed)");
 				return;
 			}
 			else if(tmpfileSize.equals("timeover"))	//GPS return value

diff --git a/Cryptonite/src/Client/GoogleMaps.java b/Cryptonite/src/Client/GoogleMaps.java
@@ -161,13 +161,61 @@ public void handleEvent(Event arg0) {
         browser.setBounds(452, 10, 432, 263);
 
         Label lblat = new Label(comp, SWT.NONE);
-        lblat.setBounds(633, 279, 107, 15);
+        lblat.setBounds(633, 275, 107, 20);
         lblat.setText("37.56");
 
         Label lblng = new Label(comp, SWT.NONE);
-        lblng.setBounds(772, 279, 112, 15);
+        lblng.setBounds(772, 275, 112, 20);
         lblng.setText("126.97");
 
+        Button btn = new Button(comp, SWT.NONE);
+        btn.setBounds(633, 0, 20, 20);
+        btn.setText("1");
+        btn.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent arg0) {
+				// TODO Auto-generated method stub
+				browser.execute("map.setCenter(SWLatLng);");
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent arg0) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseDown(MouseEvent arg0) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+
+        Button btn2 = new Button(comp, SWT.NONE);
+        btn2.setBounds(653, 0, 20, 20);
+        btn2.setText("2");
+        btn2.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseUp(MouseEvent arg0) {
+				// TODO Auto-generated method stub
+				browser.execute("map.setCenter(myLatLng);");
+			}
+
+			@Override
+			public void mouseDoubleClick(MouseEvent arg0) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseDown(MouseEvent arg0) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+
 
         browser.addListener(SWT.MouseUp, new Listener() {
 
@@ -197,20 +245,20 @@ public void run() {
 		});
 
         Label lblUseGpsEncrypt = new Label(comp, SWT.NONE);
-        lblUseGpsEncrypt.setBounds(229, 191, 125, 15);
+        lblUseGpsEncrypt.setBounds(200, 191, 160, 20);
         lblUseGpsEncrypt.setText("Use GPS encrypt files : ");
 
 
         Button btnCheckButton = new Button(comp, SWT.CHECK);
-        btnCheckButton.setBounds(360, 191, 13, 16);
+        btnCheckButton.setBounds(360, 193, 13, 16);
 
         Label lblSetRadius = new Label(comp, SWT.NONE);
-        lblSetRadius.setBounds(462, 279, 86, 15);
+        lblSetRadius.setBounds(450, 275, 100, 20);
         lblSetRadius.setText("Set Radius (m): ");
 
         text_radius = new Text(comp, SWT.BORDER);
-        text_radius.setText("100");
-        text_radius.setBounds(554, 279, 47, 21);
+        text_radius.setText("200");
+        text_radius.setBounds(554, 275, 47, 20);
         text_radius.addModifyListener(new ModifyListener() {
 
 			@Override
@@ -225,11 +273,11 @@ public void modifyText(ModifyEvent arg0) {
 		});
 
         Label lblLat = new Label(comp, SWT.NONE);
-        lblLat.setBounds(607, 279, 20, 15);
+        lblLat.setBounds(607, 275, 30, 20);
         lblLat.setText("lat :");
 
         Label lblLng = new Label(comp, SWT.NONE);
-        lblLng.setBounds(746, 279, 20, 15);
+        lblLng.setBounds(746, 275, 30, 20);
         lblLng.setText("lng:");
 
         btnCheckButton.addSelectionListener(new SelectionAdapter() {