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

add permission.

script/release_builder.sh

@@ -17,8 +17,7 @@ gradlew clean
 init(){
     cd lib_base/script
     #api混淆
-    if ((${rename_api}=='true'))
-    then
+    if [[ "$rename_api" = "true" ]];then
         cd code
         chmod a+x rename_api.py
         ./rename_api.py

script/res/update_gateway.py

@@ -21,7 +21,7 @@ with open(path, "w") as f_w:
 
         elif "harvest_ip=" in line:
             harvester=gateway['harvester'][0].split(":")
-            line = "harvest_ip=\"%s\"\n"%(harvester[0]+harvester[1])
+            line = "harvest_ip=\"%s:%s\"\n"%(harvester[0],harvester[1])
 
         elif "harvest_port=" in line:
             line = "harvest_port=%s\n"%(gateway['harvester'][0].split(":")[2])

src/main/AndroidManifest.xml

@@ -5,10 +5,12 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!--写入SD卡-->
     <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:node="remove" />
     <!--读取SD卡-->
     <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE" />
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        tools:node="remove" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!--相机-->
     <uses-permission android:name="android.permission.CAMERA" />

src/main/java/com/common/activity/TakePhotoActivity.java

@@ -9,6 +9,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 
+import com.common.toolbox.tracker.TrackEvent;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 
 import java.io.File;
@@ -23,6 +24,7 @@ import tech.starwin.utils.BitmapUtils;
 import tech.starwin.utils.FileUtils;
 import tech.starwin.utils.PreferencesManager;
 import tech.starwin.utils.SPDataProvider;
+import tech.starwin.utils.TrackEventHelper;
 import tech.starwin.utils.context_utils.ActivityJumper;
 import tech.starwin.utils.context_utils.EasyActivityResult;
 import tech.starwin.utils.ui_utils.QMUIHelper;
@@ -95,7 +97,10 @@ public class TakePhotoActivity extends BaseActivity {
         }
         String type = getIntent().getStringExtra("photo_type");
         if (TextUtils.equals(type, PhotoType.KTP.name())) {
+            TrackEventHelper.logEvent(TrackEvent.Click.KTP_SHOT);
             findViewById(R.id.imageview_id_frame).setVisibility(View.VISIBLE);
+        }else if(TextUtils.equals(type, PhotoType.WORK_CARD.name())){
+            TrackEventHelper.logEvent(TrackEvent.Click.WORK_CARD_SHOT);
         }
 
         UIHelper.bindClickListener(new OnNoShakeClickListener() {