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

update

build.gradle

@@ -129,8 +129,9 @@ dependencies {
     //魔蝎
 //    api 'com.moxie:moxie-client-inter:1.1.6.2'
 
-    //facebook SDK
-//    api 'com.facebook.android:facebook-android-sdk:[4,5)'
+    //SDK-FACEBOOK-START
+    api 'com.facebook.android:facebook-android-sdk:[4,5)'
+    //SDK-FACEBOOK-END
 
     //AppsFlyer
 //    api 'com.appsflyer:af-android-sdk:4+@aar'

script/refresh_gponline.sh

@@ -2,10 +2,16 @@
 
 developer="sikang"
 
-cus_crop_id="${corp_id_majia}"
+
+cus_crop_id=$1
+if((${#cus_crop_id}==0))
+then
+    cus_crop_id="${corp_id_majia}"
+fi
+
 if((${#cus_crop_id}==0))
 then
-    cus_crop_id=="${corp_id}"
+    cus_crop_id="${corp_id}"
 fi
 
 echo "1、commit + push + push_tag + 自动发包登记 （需要配置分支）"
@@ -27,7 +33,7 @@ then
     git add .
     git commit -m "${app_id} ${version_name}"
     git push origin ${git_branch}
-    tagName=t${cus_crop_id}-${app_id}
+    tagName=t${corp_id}-${app_id}
     git tag -d ${tagName}
     git push origin --delete tag ${tagName}
     git tag -a ${tagName} -m ${tagName}

script/release_builder.sh

+#!/usr/bin/env bash
 echo "1、GP包（无权限）"
 echo "2、渠道包（有权限）"
-echo "3、马甲包 GP"
-echo "4、马甲包 渠道"
+echo "3、马甲包 1"
+echo "4、马甲包 2"
+echo "5、马甲包 3"
+
+
 echo -n "选择打包方式："
 read action
 
@@ -48,15 +52,22 @@ then
 
 elif((${action}=='3'))
 then
-    mv app/src/main/res/drawable-xxhdpi/logo_majia.png  app/src/main/res/drawable-xxhdpi/logo.png
-    sed -i "" "s#^app_name=.*#app_name=${majia_name}#g"  gradle.properties
+    mv app/src/main/res/drawable-xxhdpi/logo_majia1.png  app/src/main/res/drawable-xxhdpi/logo.png
+    sed -i "" "s#^app_name=.*#app_name=${majia_name1}#g"  gradle.properties
     gradlew resguardAppProductGoogleplayRelease
 
 elif((${action}=='4'))
 then
-    mv app/src/main/res/drawable-xxhdpi/logo_majia.png  app/src/main/res/drawable-xxhdpi/logo.png
-    sed -i "" "s#^app_name=.*#app_name=${majia_name}#g"  gradle.properties
-    gradlew resguardAppProductWebsiteRelease
+    mv app/src/main/res/drawable-xxhdpi/logo_majia2.png  app/src/main/res/drawable-xxhdpi/logo.png
+    sed -i "" "s#^app_name=.*#app_name=${majia_name2}#g"  gradle.properties
+    gradlew resguardAppProductGoogleplayRelease
+
+elif((${action}=='5'))
+then
+    mv app/src/main/res/drawable-xxhdpi/logo_majia3.png  app/src/main/res/drawable-xxhdpi/logo.png
+    sed -i "" "s#^app_name=.*#app_name=${majia_name3}#g"  gradle.properties
+    gradlew resguardAppProductGoogleplayRelease
+
 
 else
     echo "未知的打包方式"

script/script_help.sh

@@ -21,7 +21,6 @@ echo "18、加固"
 echo "19、混淆api"
 echo "20、更新GP状态"
 
-
 echo -n "请输入指令编号："
 read commod
 
@@ -150,9 +149,14 @@ then
 
 elif (($commod == '20'))
 then
+    . ../../gradle.properties
     chmod a+x refresh_gponline.sh
-    ./refresh_gponline.sh
-
+    if((${#1} > 0))
+    then
+        ./refresh_gponline.sh "${corp_id}${1}"
+    else
+        ./refresh_gponline.sh
+    fi
 else
     echo "找不到编号"
 fi

script/tinypng.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
 import os