diff --git a/scripts/project_init.py b/scripts/project_init.py index 19e993a..0ab37fa 100644 --- a/scripts/project_init.py +++ b/scripts/project_init.py @@ -45,6 +45,7 @@ class ProjectInit(Task): # 拉取最新代码 repo.remotes.origin.pull() + print("当前分支:" + repo.active_branch.name) pass else: raise Exception(f"No commit to {self.context.repo_commit}") diff --git a/scripts/project_update.py b/scripts/project_update.py index 906a114..4384357 100644 --- a/scripts/project_update.py +++ b/scripts/project_update.py @@ -94,7 +94,9 @@ def update_gradle_property(content, key, new_value): return updated_content +LAUNCHER_CODE_PATH = f"LauncherCode/src/com/launchercode".replace("/", os.sep) GAME_ACTIVITY_PATH = f"LauncherCode/src/com/launchercode/GameActivity.kt".replace("/", os.sep) +GAME_ACTIVITY_PATH_2 = f"LauncherCode/src/com/launchercode/activity/GameActivity.kt".replace("/", os.sep) ANDROID_MANIFEST_PATH = f"lawnchair/AndroidManifest.xml".replace("/", os.sep) STRING_PATH = f"LauncherCode/res/values/strings.xml".replace("/", os.sep) LAUNCER_STRING_PATH = f"LauncherCode/src/com/launchercode/LauncherStringsValue.kt".replace("/", os.sep) @@ -178,7 +180,8 @@ storePassword=123456 dst_path = os.path.join(self.context.temp_project_path, f"lawnchair{os.sep}assets") - for file in list(filter(lambda f: not (f == "google_fonts.json" or f == "pag_wallpaper_slide.pag"), os.listdir(dst_path))): + for file in list(filter(lambda f: not (f == "google_fonts.json" or f == "pag_wallpaper_slide.pag"), + os.listdir(dst_path))): FileUtils.delete(os.path.join(dst_path, file), True) pass @@ -297,6 +300,8 @@ plugins { image_list = list(map(lambda f: Path(f).stem, os.listdir(target_root_path))) for file in os.listdir(dst): + if file == ".DS_Store": + continue temp_tar = os.path.join(dst, file) temp_dst = os.path.join(target_root_path, file) file_name = Path(file).stem @@ -355,7 +360,20 @@ plugins { open(os.path.join(self.context.temp_project_path, LAUNCER_STRING_PATH), "w", encoding="utf-8").write(text) pass + def update_code_dir(self): + # code_path = os.path.join(self.context.temp_project_path, GAME_ACTIVITY_PATH) + # for i in os.listdir(code_path): + # os + pass + def execute(self): + self.update_code_dir() + global GAME_ACTIVITY_PATH + path = os.path.join(self.context.temp_project_path, GAME_ACTIVITY_PATH) + if not os.path.exists(path): + GAME_ACTIVITY_PATH = GAME_ACTIVITY_PATH_2 + # GAME_ACTIVITY_PATH = GAME_ACTIVITY_PATH_2 + pass self.build_gradle_path = os.path.join(self.context.temp_project_path, "build.gradle") self.init_sdk_version() self.update_package_name()