Ver Fonte

[WallPadAddService]
1. 주차위치 안맞는거현장가서 확인하고 맞춤

jglee há 2 semanas atrás
pai
commit
ca6247d399

+ 43 - 6
WallPadAddService/src/main/java/kr/co/icontrols/wallpadaddservice/screen/CarInfoMainScreen.java

@@ -684,18 +684,51 @@ public class CarInfoMainScreen extends WpadScreen {
                 }
             }
 
-            drawRect = new DrawRect(this.getContext(), 170 + TempTextBox_Size);
+            drawRect = new DrawRect(this.getContext(), 170 + TempTextBox_Size  + 90);
             this.getLayout().addView(drawRect);
 
-            LocationText = new WpadTextView(this.getContext(), false, 720, 60, Gravity.LEFT, Color.WHITE, Common.fontsize._36, false, 0);
-            ViewRegistration(this.getLayout(), LocationText, Common.ImgPosition.GetX(160), Common.ImgPosition.GetY(120));
+            //2025.02.14 입주민 요청 글씨크기 변경
+            //2025.02.14 입주민 요청 좌표 X축으로 이동 요청
+            LocationText = new WpadTextView(this.getContext(), false, 720, 60, Gravity.LEFT, Color.WHITE, Common.fontsize._28, false, 0);
+            ViewRegistration(this.getLayout(), LocationText, Common.ImgPosition.GetX(160 + 110), Common.ImgPosition.GetY(120));
             LocationText.setText("기둥번호: " + ParkedVehicleInfoArray.get(nIndex).location_text);
 
             Log.d(TAG, "[updateParkedVehicleInfo] m_Nexpa_Menu [" + m_Nexpa_Menu + "]");
             if (m_Nexpa_Menu == 0) {
+                //jglee - 2025.02.10. 차량 위치 정보 가져오기
+                //현재 테헤란에서는 이 위치가 맞지 않는다.
                 car_position = new WpadImageView(this.getContext(), TOUCH_KIND.NONE, 73, 77, R.drawable.parking_sign_pink, R.drawable.parking_sign_pink_1, CarInfoMainID.image.LOCATION_TEXT_BG);
-                ViewRegistration(this.getLayout(), car_position, (ParkedVehicleInfoArray.get(nIndex).loc_x + 110), ParkedVehicleInfoArray.get(nIndex).loc_y - 72);
+
+                float covert_x = 0;//(float) (ParkedVehicleInfoArray.get(nIndex).loc_x * 1.3846);
+                float convert_y = 0;// (float) (ParkedVehicleInfoArray.get(nIndex).loc_y * 1.3636);
+                try
+                {
+                    //좌표 사이즈
+                    //Y : 2.2978 보다 내려달람
+/*                    covert_x = (float) (ParkedVehicleInfoArray.get(nIndex).loc_x * 1.3846);
+                    convert_y = (float) (ParkedVehicleInfoArray.get(nIndex).loc_y * 2.7978); //2.13 : 2.2978 (조금 더 내려야 함 피드백), 2.17 너무 내려감*/
+
+                    covert_x = (float) (ParkedVehicleInfoArray.get(nIndex).loc_x * 1.3846); // 1.3846 ->
+                    convert_y = (float) (ParkedVehicleInfoArray.get(nIndex).loc_y * 2.2978 + 0.05);
+                    ViewRegistration(this.getLayout(), car_position, ((int)covert_x+ 110), (int)convert_y - 72);
+                }
+                catch (Exception e)
+                {
+                    ViewRegistration(this.getLayout(), car_position, (ParkedVehicleInfoArray.get(nIndex).loc_x + 110), ParkedVehicleInfoArray.get(nIndex).loc_y - 72);
+                }
+
                 Log.d(TAG, "[updateParkedVehicleInfo] ParkedVehicleInfoArray.get(" + nIndex + ").loc_x : " + ParkedVehicleInfoArray.get(nIndex).loc_x + " , ParkedVehicleInfoArray.get(" + nIndex + ").loc_y : " + ParkedVehicleInfoArray.get(nIndex).loc_y);
+                Log.d(TAG, "[updateParkedVehicleInfo] Convert ParkedVehicleInfoArray.get(" + nIndex + ").loc_x : " + (int)covert_x + " , ParkedVehicleInfoArray.get(" + nIndex + ").loc_y : " + (int)convert_y);
+
+
+
+
+                //이미지
+                //ViewRegistration(this.getLayout(), parking_loc_img, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(112));
+                //ViewRegistration(layout, Background_Map, Common.ImgPosition.GetX(142), Common.ImgPosition.GetY(110));
+                //기존 이클립스 코드
+                //car_posion = new WpadImageView(this.getContext(), TOUCH_KIND.NONE , 57, 60, R.drawable.parking_sign_pink, R.drawable.parking_sign_pink_1, CarInfoMainID.image.LOCATION_TEXT_BG);
+                //ViewRegistration(this.getLayout(), car_posion, m_CarArray.get(CurIdx).loc_x + 26, m_CarArray.get(CurIdx).loc_y);
 
                 if (ParkingSystemType == PARKING_KIND.IES_100) car_position.setVisibility(View.INVISIBLE);
 
@@ -805,7 +838,8 @@ public class CarInfoMainScreen extends WpadScreen {
             } catch (RuntimeException re) {
                 LogUtil.errorLogInfo("", TAG, re);
             } catch (Exception e) {
-                //e.printStackTrace();            
+                //e.printStackTrace();
+                Log.d(TAG, "Url : " + m_Url + ", Issue : " + e.toString());
                 LogUtil.errorLogInfo("", TAG, e);
             }
             finally {
@@ -865,6 +899,9 @@ public class CarInfoMainScreen extends WpadScreen {
 
         int Size;
 
+        int top_margin = 0;
+        int left_margin = 90;
+
         /**
          * @param size 네모의 가로 길이
          **/
@@ -888,7 +925,7 @@ public class CarInfoMainScreen extends WpadScreen {
             mLinePaint.setColor(Color.parseColor("#000000"));
             mLinePaint.setAlpha(150);
             canvas.translate(WpadScale.getWidth(X_Base), WpadScale.getHeight(Y_Base + (Y_Coordinate)));
-            canvas.drawRect(0, 0, (float) WpadScale.getWidth(Size), (float) WpadScale.getHeight(RectHeight), mLinePaint);
+            canvas.drawRect(Common.ImgPosition.GetX(left_margin), 0, (float) WpadScale.getWidth(Size), (float) WpadScale.getHeight(RectHeight), mLinePaint);
         }
     }
 }