Skip to content

L
lib_base
Commit 09a2f135 by sikang
Options

Merge branch 'master' of http://47.100.14.92:8929/sikang/lib_base 

KSP
parents a3e08923 1d8ca108
Showing with 3 additions and 2 deletions
app_build.gradle
...@@ -7,7 +7,7 @@ android{ ...@@ -7,7 +7,7 @@ android{
buildConfigField 'Boolean', 'IS_KSP', 'false' buildConfigField 'Boolean', 'IS_KSP', 'false'
//同盾采集SDK //同盾采集SDK
buildConfigField 'String', 'TONGDUN_PARENT_CODE', '\"\"' buildConfigField 'String', 'TONGDUN_PARENT_CODE', '\"\"'
buildConfigField 'String', 'TONGDUN_PARENT_KEY', '\" \"' buildConfigField 'String', 'TONGDUN_PARENT_KEY', '\"\"'
buildConfigField 'String', 'TONGDUN_APP_NAME', '\"\"' buildConfigField 'String', 'TONGDUN_APP_NAME', '\"\"'
resValue('string', 'octopus_open_whatsapp', " Open Whatsapp") resValue('string', 'octopus_open_whatsapp', " Open Whatsapp")
......
script/mark_screen_img.py
...@@ -11,6 +11,6 @@ for root, dirs, files in os.walk("/Users/connor/Documents/App_GP/"): ...@@ -11,6 +11,6 @@ for root, dirs, files in os.walk("/Users/connor/Documents/App_GP/"):
dir_name = root.split("/"); dir_name = root.split("/");
dir_name = dir_name[len(dir_name)-1] dir_name = dir_name[len(dir_name)-1]
if dir_name.startswith(sys.argv[1]+"_"): if dir_name.startswith(sys.argv[1]+"_"):
if (file.endswith(".png") or file.endswith(".jpg")) and "_mark" not in file: if (file.endswith(".png") or file.endswith(".jpg")) and "_mark" not in file and "logo" not in file:
path = os.path.join(directory, file) path = os.path.join(directory, file)
os.system("./image_mark.py "+ path + " " + sys.argv[2].split("_")[0]) os.system("./image_mark.py "+ path + " " + sys.argv[2].split("_")[0])
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment