Merge pull request #18 from Tencent/support_android10

Support android10

Author: web-aaron

doc/environment/InstallStepByStep.md

@@ -69,8 +69,12 @@ int CBloodLengthRegTmplMatch::Predict(const cv::Mat &oSrcImg, tagBloodLengthRegR
 
     // obtain roi region of image
     cv::Rect oROI;
-    ResizeRect(m_oROI, static_cast<float>(oSrcImg.cols) / IMAGE_WIDTH,
-        static_cast<float>(oSrcImg.rows) / IMAGE_HEIGHT, oROI);
+	int longEdge = oSrcImg.rows;
+	if (oSrcImg.cols > oSrcImg.rows) {
+		longEdge = oSrcImg.cols;
+	}
+    ResizeRect(m_oROI, static_cast<float>(longEdge) / IMAGE_WIDTH,
+        static_cast<float>(longEdge) / IMAGE_WIDTH, oROI);
     ExpandRect(oROI, static_cast<int>(oSrcImg.cols * m_fExpandWidth),
         static_cast<int>(oSrcImg.rows * m_fExpandHeight), oROI);
     oData.m_oROI = oROI;

log/Agent/.gitignore

@@ -324,11 +324,11 @@ int CLocationRegTmplMatch::SetROI(const cv::Rect &oRect, int nImgWidth, int nImg
     if (nImgWidth > nImgHeight)
     {
         ResizeRect(oRect, static_cast<float>(nImgWidth) / IMAGE_LONG_SIDE,
-                   static_cast<float>(nImgHeight) / IMAGE_SHORT_SIDE, oROI);
+                   static_cast<float>(nImgWidth) / IMAGE_LONG_SIDE, oROI);
     }
     else
     {
-        ResizeRect(oRect, static_cast<float>(nImgWidth) / IMAGE_SHORT_SIDE,
+        ResizeRect(oRect, static_cast<float>(nImgHeight) / IMAGE_LONG_SIDE,
                    static_cast<float>(nImgHeight) / IMAGE_LONG_SIDE, oROI);
     }
 
@@ -662,13 +662,21 @@ int Detect(int nID, const cv::Mat &oSrcImg, const cv::Mat &oTmplImg, const cv::R
     stTmpl.fThreshold = fThreshold;
     stTmpl.oTmplImg = oResizeTmplImg(oResizeSrcRect);
 
+	// it should recalculate position in source image according to template position
+	cv::Rect oRealLocation;
+	oRealLocation.x = static_cast<int>(oResizeSrcImg.cols * oResizeSrcRect.x / oResizeTmplImg.cols);
+	oRealLocation.y = static_cast<int>(oResizeSrcImg.rows * oResizeSrcRect.y / oResizeTmplImg.rows);
+	oRealLocation.width = static_cast<int>(oResizeSrcImg.cols * oResizeSrcRect.width / oResizeTmplImg.cols);
+	oRealLocation.height = static_cast<int>(oResizeSrcImg.rows * oResizeSrcRect.height / oResizeTmplImg.rows);
+
     tagLocationRegParam stParam;
     stParam.strAlgorithm = "Detect";
     stParam.fMinScale = 0.8f;
     stParam.fMaxScale = 1.2f;
     stParam.nScaleLevel = 9;
     stParam.nMatchCount = 1;
-    stParam.oLocation = oResizeSrcRect;
+    //stParam.oLocation = oResizeSrcRect;
+	stParam.oLocation = oRealLocation;
     stParam.fExpandWidth = fExpandWidth;
     stParam.fExpandHeight = fExpandHeight;
     stParam.oVecTmpls.push_back(stTmpl);

log/GameRecognize/.gitignore

@@ -0,0 +1,4 @@
+from .demo.PlatformWeTest import PlatformWeTest
+
+def GetInstance():
+    return PlatformWeTest()

log/IOService/.gitignore

@@ -0,0 +1,97 @@
+import cv2
+import time
+import logging
+
+from demo.Initializer import Initializer
+from demo.PlatformWeTest import PlatformWeTest, setup_logging
+
+logger = logging.getLogger(__name__)
+
+def __test_move(GAME_HEIGHT=640):
+    # test move
+    device_action = PlatformWeTest("127.0.0.1")
+    ret, desc = device_action.init(is_portrait=False, long_edge=GAME_HEIGHT, standalone=True)
+    if ret is False:
+        logger.info("device action init fail")
+        device_action.deinit()
+        return
+
+    di, _ = device_action.get_device_info()
+    __width = GAME_HEIGHT * 1.0 / di.display_height * di.display_width
+    start_x, start_y, end_x, end_y = 1, 1, __width - 1, GAME_HEIGHT-1
+
+    steps_w = 20
+    steps = int((end_x - start_x) * 1.0 / steps_w)
+    steps_h = int((end_y - start_y) / steps)
+
+    logger.info("{},{} -> {},{}, steps={}".format(start_x, start_y, end_x, end_y, steps))
+
+    device_action.touch_reset()
+    device_action.touch_down(start_x, start_y, 0)
+    device_action.touch_down(end_x, start_y, 1)
+    for i in range(0, steps):
+        time.sleep(0.2)
+        device_action.touch_move(start_x + i * steps_w, start_y + i * steps_h, 0)
+        device_action.touch_move(end_x - i * steps_w, start_y + i * steps_h, 1)
+
+    device_action.touch_up(0)
+    device_action.touch_up(1)
+    time.sleep(0.2*steps+2)
+
+device_action = None
+def _onMouseEvent(event, x, y, flags, param):
+    global device_action
+    if event & cv2.EVENT_LBUTTONUP:  # cv2.EVENT_LBUTTONUP=4
+        if device_action:
+            st = time.time()
+            device_action.touch_down(x, y, 0)
+            device_action.touch_up(0)
+            print(time.time()-st)
+            
+def __test_image(GAME_HEIGHT = 640):
+    global device_action
+    device_action = PlatformWeTest("127.0.0.1", Initializer.TOUCH_SEVER_PORT, Initializer.CLOUD_SCREEN_PORT)
+    ret, desc = device_action.init(is_portrait=True, long_edge=GAME_HEIGHT)
+    if ret is False:
+        logger.info("device action init fail")
+        device_action.deinit()
+        return
+    
+    device_action.touch_reset()
+    index = 0
+    while True:
+        err, image = device_action.get_image()
+        if err == 0 and image is not None:
+            #logger.info("index={} orientation: {}".format(index, device_action.get_rotation()))
+            try:
+                #cv2.imwrite("test_{}.jpg".format(index), image)
+                cv2.imshow('test1', image)
+                if index == 0:
+                    cv2.setMouseCallback('test1', _onMouseEvent)
+                cv2.waitKey(1)
+            except:
+                pass
+            index = index + 1
+        else:
+            logger.info("error: {}".format(err))
+
+        time.sleep(1)
+
+def __test_getinfo(GAME_HEIGHT = 640):
+    # test get touch info
+    device_action = PlatformWeTest("127.0.0.1", Initializer.TOUCH_SEVER_PORT, Initializer.CLOUD_SCREEN_PORT)
+    ret, desc = device_action.init(is_portrait=False, long_edge=GAME_HEIGHT, standalone=True)
+    if ret is False:
+        logger.info("device action init fail")
+        device_action.deinit()
+        return
+
+    device_info, _ = device_action.get_device_info()
+    logger.info("{}".format(device_info))
+
+
+if __name__ == "__main__":
+    setup_logging(default_path="demo/logging.json")
+
+    __test_image()
+    #__test_move()

log/ManageCenter/.gitignore

@@ -1,51 +1,51 @@
-{
-    "version": 1,
-    "disable_existing_loggers": false,
-    "formatters": {
-        "simple": {
-            "format": "%(asctime)s- [%(threadName)s] - %(filename)s:%(lineno)d - %(message)s"
-        }
-    },
-
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-            "level": "DEBUG",
-            "formatter": "simple",
-            "stream": "ext://sys.stdout"
-        },
-
-        "info_file_handler": {
-            "class": "logging.handlers.RotatingFileHandler",
-            "level": "INFO",
-            "formatter": "simple",
-            "filename": "info.log",
-            "maxBytes": 10485760,
-            "backupCount": 20,
-            "encoding": "utf8"
-        },
-
-        "error_file_handler": {
-            "class": "logging.handlers.RotatingFileHandler",
-            "level": "ERROR",
-            "formatter": "simple",
-            "filename": "errors.log",
-            "maxBytes": 10485760,
-            "backupCount": 20,
-            "encoding": "utf8"
-        }
-    },
-
-    "loggers": {
-        "my_module": {
-            "level": "ERROR",
-            "handlers": ["console"],
-            "propagate": "no"
-        }
-    },
-
-    "root": {
-        "level": "INFO",
-        "handlers": ["console", "info_file_handler", "error_file_handler"]
-    }
-}
+{
+    "version": 1,
+    "disable_existing_loggers": false,
+    "formatters": {
+        "simple": {
+            "format": "%(asctime)s - %(threadName)s:%(filename)s:%(funcName)s:%(lineno)d - %(message)s"
+        }
+    },
+
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "level": "DEBUG",
+            "formatter": "simple",
+            "stream": "ext://sys.stdout"
+        },
+
+        "info_file_handler": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "INFO",
+            "formatter": "simple",
+            "filename": "info.log",
+            "maxBytes": 10485760,
+            "backupCount": 20,
+            "encoding": "utf8"
+        },
+
+        "error_file_handler": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "ERROR",
+            "formatter": "simple",
+            "filename": "errors.log",
+            "maxBytes": 10485760,
+            "backupCount": 20,
+            "encoding": "utf8"
+        }
+    },
+
+    "loggers": {
+        "my_module": {
+            "level": "ERROR",
+            "handlers": ["console"],
+            "propagate": "no"
+        }
+    },
+
+    "root": {
+        "level": "INFO",
+        "handlers": ["console", "info_file_handler", "error_file_handler"]
+    }
+}

log/UIMatch/.gitignore

@@ -0,0 +1,15 @@
+export run_base=/data/local/tmp
+
+# if not running as root, trick dalvik into using an alternative dex cache
+if [ ${USER_ID} -ne 0 ]; then
+  tmp_cache=${run_base}/wetest/dalvik-cache
+
+  if [ ! -d ${tmp_cache} ]; then
+    mkdir -p ${tmp_cache}
+  fi
+
+  export ANDROID_DATA=${run_base}/wetest
+fi
+
+export CLASSPATH=$run_base/wetest/inputserver.jar
+exec app_process $run_base/wetest com.tencent.wetest.inputserver.InputMain "$@"