3.120

CHANGELOG.txt

@@ -1,3 +1,10 @@
+3.120
+* 现 LAMDA 已支持本身作为代理
+* 新增获取系统最近 Activity 的接口
+* 修复一个协议中的 race condition (maybe)
+* 增加部分命令，移除 SQLite db view
+* 实验性的 H.264 投屏
+
 3.108
 * 优化网络断连处理逻辑
 * 增加 Redroid (remote android) 支持

lamda/__init__.py

@@ -2,4 +2,4 @@
 #
 # Distributed under MIT license.
 # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-__version__ = "3.108"
+__version__ = "3.120"

lamda/client.py

@@ -14,14 +14,13 @@
 import warnings
 import builtins
 import logging
-import atexit
 import grpc
 
 from urllib.parse import quote
 from collections import defaultdict
 from os.path import basename, dirname, expanduser, join as joinpath
+from google.protobuf.json_format import MessageToDict, MessageToJson
 from grpc_interceptor import ClientInterceptor
-from google.protobuf.json_format import MessageToDict
 from google.protobuf.message import Message
 from asn1crypto import pem, x509
 
@@ -71,6 +70,7 @@
                 "Point",
                 "Bound",
                 "load_proto",
+                "to_dict",
                 "Device",
                 "logger",
 ]
@@ -219,6 +219,11 @@ def load_proto(name):
     return grpc.protos_and_services(name)
 
 
+def to_dict(prot):
+    r = MessageToJson(prot, preserving_proto_field_name=True)
+    return json.loads(r)
+
+
 class BaseServiceStub(object):
     def __init__(self, stub):
         self.stub = stub
@@ -868,7 +873,7 @@ def query_launch_activity(self):
         """
         req = protos.ApplicationRequest(name=self.applicationId)
         r = self.stub.queryLaunchActivity(req)
-        return r
+        return to_dict(r)
     def is_permission_granted(self, permission):
         """
         检查是否已经授予应用某权限（应用需要运行时获取的权限）
@@ -984,6 +989,13 @@ def enumerate_all_pkg_names(self):
         """
         r = self.stub.enumerateAllPkgNames(protos.Empty())
         return r.names
+    def get_last_activities(self, count=3):
+        """
+        获取系统中最后一个活动的详细信息
+        """
+        req = protos.Integer(value=count)
+        r = self.stub.getLastActivities(req).activities
+        return list(map(to_dict, r))
     def start_activity(self, **activity):
         """
         启动 activity（任意, always return true）
@@ -1637,6 +1649,8 @@ def enumerate_all_pkg_names(self):
         return self.stub("Application").enumerate_all_pkg_names()
     def enumerate_running_processes(self):
         return self.stub("Application").enumerate_running_processes()
+    def get_last_activities(self, count=3):
+        return self.stub("Application").get_last_activities(count=count)
     def start_activity(self, **activity):
         return self.stub("Application").start_activity(**activity)
     def application(self, applicationId):
@@ -1807,7 +1821,8 @@ def __exit__(self, type, value, traceback):
                                    help="service ip address")
     parser.add_argument("-port", type=int, default=65000,
                                    help="service port")
-    parser.add_argument("-cert", type=str, default=None,
+    crt = os.environ.get("CERTIFICATE", None)
+    parser.add_argument("-cert", type=str, default=crt,
                                    help="ssl cert")
     args = parser.parse_args()
 

lamda/rpc/application.proto

@@ -29,13 +29,23 @@ message ApplicationActivityRequest {
     repeated string categories = 6;
     int64  flags            = 7;
     bool   debug            = 8;
+    string data             = 9;
 }
 
 message ApplicationActivityInfo {
     string package          = 1;
-    string component        = 2;
-    string action           = 3;
-    repeated string categories = 4;
+    string action           = 2;
+    string category         = 3;
+    string component        = 4;
+    google.protobuf.Struct extras = 5;
+    repeated string categories = 6;
+    int64  flags            = 7;
+    bool   debug            = 8;
+    string data             = 9;
+}
+
+message ApplicationActivityInfoList {
+    repeated ApplicationActivityInfo activities = 1;
 }
 
 message ApplicationPermissions {

lamda/rpc/services.proto

@@ -32,6 +32,7 @@ service Application {
     rpc getPermissions(ApplicationRequest) returns (ApplicationPermissions) {}
     rpc resetApplicationData(ApplicationRequest) returns (Boolean) {}
     rpc deleteApplicationCache(ApplicationRequest) returns (Boolean) {}
+    rpc getLastActivities(Integer) returns (ApplicationActivityInfoList) {}
     rpc startActivity(ApplicationActivityRequest) returns (Boolean) {}
     rpc applicationInfo(ApplicationRequest) returns (ApplicationInfo) {}
     rpc startApplication(ApplicationRequest) returns (Boolean) {}