fix shell run fail issue in windows

Author: chendianbo

doc/README.assets/2.png

@@ -24,7 +24,7 @@
 
 # --------------------------------------------------------------------------------------------------------------------------
 def doTopInfo():
-    AdbUtils.printlnDump()
+    AdbUtils.dumpTop()
 
 
 def doPullPackage(projPath, pkg):
@@ -146,9 +146,26 @@ def doDump(env_path, _mode):
         LoggerUtils.println(e)
 
 
+def doListPrint(tag, apps):
+    LoggerUtils.light('\n[' + tag + ']: ')
+    if CmnUtils.isEmpty(apps):
+        LoggerUtils.w('[' + tag + ']: None')
+        return
+    for app in apps:
+        LoggerUtils.println('[' + tag + ']: ' + app)
+
+def doList():
+    apps = AdbUtils.getInstallAppsWithSystem()
+    doListPrint('Sys', apps)
+    apps = AdbUtils.getInstallAppsWithThird()
+    doListPrint('App', apps)
+    apps = AdbUtils.getInstallAppsWithDisable()
+    doListPrint('Disabled', apps)
+
 def run():
     """
     wing -adb top
+    wing -adb list
     wing -adb pull <package name>
     wing -adb stop <package name>
     wing -adb clear <package name>
@@ -161,6 +178,7 @@ def run():
     if typ == 'stop': return doStopApp(envPath, za.get(3))
     if typ == 'clear': return doClearApp(envPath, za.get(3))
     if typ == 'dump': return doDump(envPath, za.get(3))
+    if typ == 'list': return doList()
     assert 0, 'Unsupported type: ' + typ
 
 

extend/extend_adb.py

@@ -5,6 +5,7 @@
                 wing init workspace2 tag_1.0 release.xml
        sync [f] sync code from remote from manifests
             f:  Force switch to new branch, discard all local changes
+       -update  update to the latest version
 
     wing git commands:
        -status  Check if the local code has changed
@@ -44,6 +45,8 @@
                 pull target apk from Android device
             dump {ui/sys/log}
                 get all running services and log info from Android device
+            list
+                get all install app list
 
     wing project commands:
        -create [type name]

res/help.txt

@@ -74,7 +74,7 @@ def doInstall():
     try:
         if os.path.isdir(g_wing_path): FileUtils.remove(g_wing_path)
         FileUtils.copyDir(g_this_path, g_wing_path)
-        # if os.path.isdir(g_wing_path + os.sep + '.git'): FileUtils.remove(g_wing_path + os.sep + '.git')
+        if os.path.isdir(g_wing_path + os.sep + '.git'): FileUtils.remove(g_wing_path + os.sep + '.git')
         if os.path.isdir(g_wing_path + os.sep + '.idea'): FileUtils.remove(g_wing_path + os.sep + '.idea')
         LoggerUtils.println('copy bins ...')
         if CmnUtils.isOsWindows():

setup.py

@@ -7,7 +7,7 @@
 #          adb shell content call ...
 # @date:   2023.08.10 14:40:50
 
-import sys, os
+import sys, os, re
 
 from utils.utils_import import ImportUtils
 from utils.utils_cmn import CmnUtils
@@ -81,7 +81,7 @@ def getFileTimestamp(f):
         try:
             ret = AdbUtils.doAdbCmd(cmd)
             if None == ret: return 0
-            LoggerUtils.println(ret)
+            # LoggerUtils.println(ret)
             ret = ret.strip()
             if len(ret) <= 0 or not ret.isdigit(): return 0
             return int(ret)
@@ -123,14 +123,18 @@ def pull(src, des):
     def push(src, des):
         src = os.path.abspath(src)
         ts1 = AdbUtils.getFileTimestamp(des)
-        des2 = des + os.sep + os.path.basename(src)
-        ts2 = AdbUtils.getFileTimestamp(des2)
+        if os.path.basename(src) != os.path.basename(des):
+            des2 = des + os.sep + os.path.basename(src)
+            ts2 = AdbUtils.getFileTimestamp(des2)
+        else:
+            des2 = None
 
         AdbUtils.doAdbCmd('push "%s" "%s"' % (src, des))
         tsNew = AdbUtils.getFileTimestamp(des)
         if 0 != tsNew and ts1 <= tsNew: return True
-        tsNew = AdbUtils.getFileTimestamp(des2)
-        if 0 != tsNew and ts2 <= tsNew: return True
+        if des2 is not None:
+            tsNew = AdbUtils.getFileTimestamp(des2)
+            if 0 != tsNew and ts2 <= tsNew: return True
         return False
 
     @staticmethod
@@ -171,7 +175,9 @@ def isInstalled(pkgName):
     def install(apkFile):
         ret = AdbUtils.doAdbCmd('install -r "%s"' % apkFile)
         if None == ret: return False
-        return 0 <= ret.lower().find('success')
+        if 0 <= ret.lower().find('success'): return True
+        print(ret)
+        return False
 
     @staticmethod
     def uninstall(pkgName):
@@ -226,6 +232,11 @@ def __getInstallApps__(apps, cmd):
             apps.add(item)
         return True
 
+    @staticmethod
+    def launchApp(pkgName, runSteps=1):
+        cmd = "shell monkey -p %s -c android.intent.category.LAUNCHER %d" % (pkgName, runSteps)
+        return AdbUtils.doAdbCmd(cmd)
+
     @staticmethod
     def startActivity(pkgName, activityName, tName, tVal, args):
         """
@@ -272,11 +283,11 @@ def sendBroadcast(action, tName, tVal, args):
     #     return AdbUtils.doAdbCmd(cmd)
 
     @staticmethod
-    def callProvider(authorities, tName, tVal, args):
-        astring = ''
-        for k, v in args.items():
-            astring += ' --extra %s:s:%s' % (k, v)
-        cmd = 'shell content call --uri content://%s --method abg --extra %s:i:%d%s' % (authorities, tName, tVal, astring)
+    def callProvider(authorities, method, arg, extras):
+        extrastring = ''
+        for k, v in extras.items():
+            extrastring += '--extra %s:s:%s ' % (k, v)
+        cmd = 'shell content call --uri content://%s --method %s --arg %s %s' % (authorities, method, arg, extrastring)
         return AdbUtils.doAdbCmd(cmd)
 
     @staticmethod
@@ -474,6 +485,44 @@ def printlnDump():
             LoggerUtils.println('Top Activity: ')
             for pkg, line in activities.items(): LoggerUtils.println('\tpackage: ' + pkg + ', ' + line)
 
+    @staticmethod
+    def __do_parser_package_name__(s):
+        items = s.split('\n')
+        for item in items:
+            item = item.strip()
+            matches = re.findall(r'\s[A-Za-z0-9_.]+/', item)
+            if CmnUtils.isEmpty(matches): continue
+            return matches[0][:-1].strip()
+        return None
+
+    @staticmethod
+    def dumpTop():
+        # top windows
+        wret = AdbUtils.doAdbCmd('shell dumpsys window | grep mCurrentFocus')
+        LoggerUtils.println(None if CmnUtils.isEmpty(wret) else wret.strip())
+        # top activity
+        aret = AdbUtils.doAdbCmd('shell "dumpsys activity activities | grep mResumedActivity"')
+        if CmnUtils.isEmpty(aret):
+            aret = AdbUtils.doAdbCmd('shell "dumpsys activity activities | grep ResumedActivity"')
+        LoggerUtils.println(None if CmnUtils.isEmpty(aret) else aret.strip())
+
+        LoggerUtils.println(' ')
+        if CmnUtils.isEmpty(wret):
+            LoggerUtils.w("Top window none")
+        elif 0 <= wret.find('error:'):
+            LoggerUtils.w("dump top window fail")
+        else:
+            #  mCurrentFocus=Window{3222263 u0 com.sdu.didi.gsui/com.sdu.didi.gsui.main.MainActivity}
+            LoggerUtils.println('Top Window App: ' + AdbUtils.__do_parser_package_name__(wret))
+
+        if CmnUtils.isEmpty(aret):
+            LoggerUtils.w("Top activity none")
+        elif 0 <= aret.find('error:'):
+            LoggerUtils.w("dump top activity fail")
+        else:
+            #  mResumedActivity: ActivityRecord{38e7b1 u0 com.sdu.didi.gsui/.main.MainActivity t4265}
+            LoggerUtils.println('Top Activity App: ' + AdbUtils.__do_parser_package_name__(aret))
+
 
 def run():
     pass

utils/utils_adb.py

@@ -120,8 +120,11 @@ def doCmd(cmd):
             line = ''
             while True:
                 l = p.stdout.readline()
-                if not l: break
-                l = l.decode().strip()
+                # if not l: break
+                if CmnUtils.isEmpty(l):
+                    if p.poll() is not None: break
+                    continue
+                l = l.decode().strip('\r\n')
                 if len(l) <= 0: continue
                 line += l + '\n'
             return line
@@ -139,8 +142,11 @@ def doCmd2File(cmd, fname, ignoreEmpty=True):
             with open(fname, 'w') as f:
                 while True:
                     line = p.stdout.readline()
-                    if not line: break
-                    line = line.decode().strip()
+                    # if not line: break
+                    if CmnUtils.isEmpty(line):
+                        if p.poll() is not None: break
+                        continue
+                    line = line.decode().strip('\r\n')
                     if len(line) <= 0: continue
                     f.write(line + '\n')
             return True
@@ -160,6 +166,7 @@ def doCmdEx(cmd):
         outResults = ''
         errResults = ''
         cmd = CmnUtils.formatCommand(cmd)
+        # print(cmd)
         if cmd is None: return outResults, errResults
 
         try:
@@ -184,14 +191,18 @@ def doCmdEx(cmd):
     def doCmdCall(cmd):
         isWin = CmnUtils.isOsWindows()
         cmd = CmnUtils.formatCommand(cmd)
+        # print(cmd)
         if cmd is None: return True
 
         try:
             p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             while True:
                 line = p.stdout.readline()
-                if not line: break
-                line = line.decode().strip()
+                # if not line: break
+                if CmnUtils.isEmpty(line):
+                    if p.poll() is not None: break
+                    continue
+                line = line.decode().strip('\r\n')
                 if len(line) <= 0: continue
                 if isWin:
                     l1 = line.replace('\n', '').replace('\r', '')

utils/utils_cmn.py

@@ -248,6 +248,30 @@ def replaceLine(typ, fileName, kv):
         # save
         with open(fileName, 'wb') as f: f.writelines(newLines)
 
+    @staticmethod
+    def listFiles(path):
+        for dirpath, dirnames, filenames in os.walk(path): return filenames
+        return []
+
+    @staticmethod
+    def listAll(path):
+        for dirpath, dirnames, filenames in os.walk(path): return dirnames + filenames
+        return []
+
+    @staticmethod
+    def findLastModifyFile(path, pre=None, tail=None):
+        ff = FileUtils.listFiles(path)
+        if None == ff: return None
+        lastTs = 0
+        lastFile = None
+        for f in ff:
+            if not CmnUtils.isEmpty(pre) and not f.startswith(pre): continue
+            if not CmnUtils.isEmpty(tail) and not f.endswith(tail): continue
+            ts = FileUtils.getModifyTime(path + os.sep + f)
+            if ts < lastTs: continue
+            lastTs = ts
+            lastFile = path + os.sep + f
+        return lastFile
 
 def run():
     print(FileUtils.sizeToString(20))

utils/utils_file.py

@@ -29,9 +29,9 @@
     pass
 
 # wing version, wing -v
-g_ver = '1.2.0'
+g_ver = '1.2.3'
 # wing publish time, wing -v
-g_date = '2024.01.01'
+g_date = '2024.03.18'
 g_git_host = '[email protected]:63e5fbe89dee9309492bc30c'
 g_git_wing_remote = 'platform/wing'
 g_git_wing_branch = 'master'
@@ -80,14 +80,17 @@ def formatArgument(arg): return arg.replace('\\', '/') if isOsWindows() else arg
 def doCmd(cmd):
     cmd = formatCommand(cmd)
     if cmd is None: return ''
-
+    # println(cmd)
     try:
         p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         lines = ''
         while True:
             line = p.stdout.readline()
-            if not line: break
-            line = line.decode().strip()
+            # if not line: break
+            if isEmpty(line):
+                if p.poll() is not None: break
+                continue
+            line = line.decode().strip('\r\n')
             if 0 < len(line): lines += line + '\n'
         return lines
     except Exception as e:
@@ -98,19 +101,19 @@ def doCmd(cmd):
 def doCmdCall(cmd):
     cmd = formatCommand(cmd)
     if cmd is None: return True
-
+    # println(cmd)
     try:
         p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        isWin = isOsWindows()
+        # isWin = isOsWindows()
         while True:
             line = p.stdout.readline()
-            if not line: break
-            line = line.decode().strip()
+            # if not line: break
+            if isEmpty(line):
+                if p.poll() is not None: break
+                continue
+            line = line.decode().strip('\r\n')
             if len(line) <= 0: continue
-            if isWin:
-                l1 = line.replace('\n', '').replace('\r', '')
-                if len(l1) <= 0: continue
-            print(line)
+            println(line)
         return p.returncode is None or p.returncode == 0 or p.returncode == '0'
     except Exception as e:
         println(e)