diff --git a/app/build.gradle b/app/build.gradle
index 8077964..64c58e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,22 +1,33 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'AndResGuard'
 
 android {
+    signingConfigs {
+        config {
+            keyAlias 'Neuron'
+            keyPassword KEYSTORE_PASSWORD
+            storeFile file('../nexus6pcn.jks')
+            storePassword KEY_PASSWORD
+        }
+    }
     compileSdkVersion 28
     defaultConfig {
         applicationId "tech.lincaiqi.PhotoTimeFix"
         minSdkVersion 19
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 21
-        versionCode 8
+        versionCode 9
         versionName '3.0'
+        resConfigs "zh", "zh-rCN"
     }
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             shrinkResources true
+            signingConfig signingConfigs.config
         }
     }
     buildToolsVersion '28.0.3'
@@ -30,8 +41,52 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.11"
-    implementation "org.jetbrains.anko:anko-common:0.10.8"
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.11'
+    implementation 'org.jetbrains.anko:anko-common:0.10.8'
     implementation 'com.android.support:customtabs:28.0.0'
     implementation 'com.android.support:design:28.0.0'
 }
+
+andResGuard {
+    // mappingFile = file("./resource_mapping.txt")
+    mappingFile = null
+    use7zip = true
+    useSign = true
+    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
+    keepRoot = false
+    whiteList = [
+            // for your icon
+            "R.drawable.icon",
+            // for fabric
+            "R.string.com.crashlytics.*",
+            // for google-services
+            "R.string.google_app_id",
+            "R.string.gcm_defaultSenderId",
+            "R.string.default_web_client_id",
+            "R.string.ga_trackingId",
+            "R.string.firebase_database_url",
+            "R.string.google_api_key",
+            "R.string.google_crash_reporting_api_key"
+    ]
+    compressFilePattern = [
+            "*.png",
+            "*.jpg",
+            "*.jpeg",
+            "*.gif",
+    ]
+    sevenzip {
+        artifact = 'com.tencent.mm:SevenZip:1.2.15'
+        //path = "/usr/local/bin/7za"
+    }
+
+    /**
+     * 可选： 如果不设置则会默认覆盖assemble输出的apk
+     **/
+    // finalApkBackupPath = "${project.rootDir}/final.apk"
+
+    /**
+     * 可选: 指定v1签名时生成jar文件的摘要算法
+     * 默认值为“SHA-1”
+     **/
+    // digestalg = "SHA-256"
+}
diff --git a/app/release/output.json b/app/release/output.json
index b8aa86b..4cd96aa 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"3.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"3.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ff0211..bd7b791 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
diff --git a/app/src/main/java/photoTimeFix/CoreK.kt b/app/src/main/java/photoTimeFix/CoreK.kt
index 9148ed5..280472c 100644
--- a/app/src/main/java/photoTimeFix/CoreK.kt
+++ b/app/src/main/java/photoTimeFix/CoreK.kt
@@ -8,6 +8,7 @@ import android.content.SharedPreferences
 import android.database.Cursor
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.media.MediaScannerConnection
 import android.net.Uri
 import android.provider.MediaStore
 import android.support.customtabs.CustomTabsIntent
@@ -15,6 +16,7 @@ import android.support.design.widget.AppBarLayout
 import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AlertDialog
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.webkit.JavascriptInterface
@@ -24,15 +26,19 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.RadioGroup
 import org.jetbrains.anko.longToast
+import org.jetbrains.anko.toast
 import tech.lincaiqi.PhotoTimeFix.R
 import java.io.File
+import java.text.SimpleDateFormat
 import java.util.*
+import java.util.regex.Pattern
 
 class CoreK(private var context: Context) {
 
-    fun initFragment(preferences: SharedPreferences, editor: SharedPreferences.Editor, chooseBtn:Button, radioGroup: RadioGroup, fragment: Fragment) {
+    fun initFragment(preferences: SharedPreferences, editor: SharedPreferences.Editor, chooseBtn: Button, radioGroup: RadioGroup, fragment: Fragment) {
         radioGroup.check(preferences.getInt("mode", R.id.radioButton))
         chooseBtn.setOnClickListener {
+            context.longToast("由于系统限制(其实是我懒)，请选择文件夹内任意一张图片")
             chooseFile(fragment)
         }
         radioGroup.setOnCheckedChangeListener { _, i ->
@@ -46,11 +52,11 @@ class CoreK(private var context: Context) {
         val builder = AlertDialog.Builder(context)
         try {
             val view = LayoutInflater.from(context).inflate(R.layout.about, null)
-            val webview: WebView = view.findViewById(R.id.webview)
-            webview.webViewClient = WebViewClient()
-            webview.loadUrl("file:///android_asset/about.html")
-            webview.settings.javaScriptEnabled = true
-            webview.addJavascriptInterface(this, "openGit")
+            val webView: WebView = view.findViewById(R.id.webview)
+            webView.webViewClient = WebViewClient()
+            webView.loadUrl("file:///android_asset/about.html")
+            webView.settings.javaScriptEnabled = true
+            webView.addJavascriptInterface(this, "openGit")
             builder.setView(view)
         } catch (e: Exception) {
             builder.setMessage("加载Webview错误，已停止显示帮助窗口。\n该错误并不影响正常功能运行，且开发者仅在模拟器上遇到过，如果出现此对话框请与开发者联系。")
@@ -88,13 +94,13 @@ class CoreK(private var context: Context) {
 
     }
 
-    private fun chooseFile(fragment : Fragment) {
+    private fun chooseFile(fragment: Fragment) {
         val intent = Intent(Intent.ACTION_PICK, null)
         intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
-        fragment.startActivityForResult(intent,0)
+        fragment.startActivityForResult(intent, 0)
     }
 
-    fun resultSolve(requestCode: Int, data: Intent?) : String {
+    fun resultSolve(requestCode: Int, data: Intent?): String {
         try {
             return if (requestCode == 0) {
                 val originalUri = data!!.data
@@ -110,36 +116,53 @@ class CoreK(private var context: Context) {
                     cursor.close()
                     path
                 } else "error"
-            }else "error"
+            } else "error"
 
-        } catch (e : java.lang.Exception) {
+        } catch (e: java.lang.Exception) {
             e.printStackTrace()
             return "error"
         }
     }
 
-    fun updateDate (path : String , activity: Activity) : String {
+    fun updateDate(path: String, activity: Activity): Array<String?> {
         val file = File(path)
-        val imageView : ImageView = activity.findViewById(R.id.user_bg)
-        return if (file.exists()&&file.isFile) {
-            val bm : Bitmap = BitmapFactory.decodeFile(path)
+        val imageView: ImageView = activity.findViewById(R.id.user_bg)
+        val returnArray = arrayOfNulls<String>(2)
+        if (file.exists() && file.isFile) {
+            val bm: Bitmap = BitmapFactory.decodeFile(path)
             imageView.setImageBitmap(bm)
-            updateAppbar(activity,false)
-            Date(file.lastModified()).toString()
-        }
-        else {
+            updateAppbar(activity, false)
+            val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+            returnArray[0]=sdf.format(Date(file.lastModified()))
+            var time = file.name
+            time = Pattern.compile("[^0-9]").matcher(time).replaceAll("").trim { it <= ' ' }
+            Log.d("date",time)
+            if (time.contains("20") && time.substring(time.indexOf("20")).length >= 12) {
+                val targetTime = time.substring(time.indexOf("20"), time.indexOf("20") + 12)
+                try {
+                    returnArray[1] = sdf.format(SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).parse(targetTime))
+                } catch (e : Exception) {
+                    returnArray[1] = ""
+                    e.printStackTrace()
+                }
+            } else {
+                returnArray[1] = ""
+            }
+        } else {
             imageView.setImageBitmap(null)
-            updateAppbar(activity,true)
-            ""
+            updateAppbar(activity, true)
+            returnArray[0] = ""
+            returnArray[1] = ""
         }
+        return returnArray
     }
 
-    fun updateAppbar (activity: Activity, scrollAble : Boolean) {
+    fun updateAppbar(activity: Activity, scrollAble: Boolean) {
         val mAppBarLayout = activity.findViewById<AppBarLayout>(R.id.app_bars)
         val mAppBarChildAt: View = mAppBarLayout.getChildAt(0)
         val mAppBarParams: AppBarLayout.LayoutParams = mAppBarChildAt.layoutParams as AppBarLayout.LayoutParams
         mAppBarParams.scrollFlags = if (scrollAble) AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
-        else  0
+        else 0
         mAppBarChildAt.layoutParams = mAppBarParams
         /* 作者：Silas_
            来源：CSDN
@@ -147,4 +170,25 @@ class CoreK(private var context: Context) {
            版权声明：本文为博主原创文章，转载请附上博文链接！ */
     }
 
+    fun freshMedia(path: String, context: Context) {
+        val file = File(path)
+        val paths : Array<String?>
+        if (!file.exists()) {
+            context.toast("文件或目录不存在")
+            return
+        }
+        if (file.isFile) {
+            paths = arrayOf(path)
+        } else {
+            val files = file.listFiles()
+            paths = arrayOfNulls(files.size)
+            for ((i, f) in files.withIndex()) {
+                paths[i] = f.absolutePath
+            }
+        }
+        Log.d("path",paths.toString())
+        MediaScannerConnection.scanFile(context, paths, null) { _, _ -> }
+        context.toast("完成")
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/photoTimeFix/Fragment1.kt b/app/src/main/java/photoTimeFix/Fragment1.kt
index f054991..d332c8c 100644
--- a/app/src/main/java/photoTimeFix/Fragment1.kt
+++ b/app/src/main/java/photoTimeFix/Fragment1.kt
@@ -5,8 +5,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Environment
-import android.support.design.widget.AppBarLayout
-import android.support.design.widget.CollapsingToolbarLayout
 import android.support.v4.app.Fragment
 import android.util.Log
 import android.view.LayoutInflater
@@ -40,7 +38,7 @@ class Fragment1 : Fragment() {
         locateText = view.findViewById<EditText>(R.id.locateText)
         locateText.setText(preferences.getString("locate", Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera"))
         chooseBtn = view.findViewById<Button>(R.id.chooseButton)
-        radioGroup = view.findViewById<RadioGroup>(R.id.radioGroup)
+        radioGroup = view.findViewById(R.id.radioGroup)
         coreK.initFragment(preferences, editor, chooseBtn, radioGroup, this)
         val startBtn = view.findViewById<Button>(R.id.startButton)
         startBtn.setOnClickListener {
@@ -48,14 +46,17 @@ class Fragment1 : Fragment() {
             val endNum: Int = Integer.valueOf(view.findViewById<EditText>(R.id.end).text.toString())
             val fileString: String = view.findViewById<EditText>(R.id.locateText).text.toString()
             val editFormat = view.findViewById<EditText>(R.id.editFormat)
-            val format: String = if (editFormat.text.toString().equals("")) "yyyyMMddHHmm" else editFormat.text.toString()
+            val format: String = if (editFormat.text.toString() == "") "yyyyMMddHHmm" else editFormat.text.toString()
             val radio: Boolean = radioGroup.checkedRadioButtonId == R.id.radioButton
             Log.d("radio", radioGroup.checkedRadioButtonId.toString())
             Log.d("radio", R.id.radioButton.toString())
-            context!!.longToast("由于系统限制(其实是我懒)，请选择文件夹内任意一张图片")
-            core.process(context, startNum, endNum, fileString, radio, activity, format)
+            core.process(context, startNum, endNum, fileString, radio, activity, format, "")
+        }
+        val freshButton = view.findViewById<Button>(R.id.freshButton)
+        freshButton.setOnClickListener {
+            val fileString: String = view.findViewById<EditText>(R.id.locateText).text.toString()
+            coreK.freshMedia(fileString,context!!)
         }
-
         return view
     }
 
diff --git a/app/src/main/java/photoTimeFix/Fragment2.kt b/app/src/main/java/photoTimeFix/Fragment2.kt
index 9627e1b..3d12fd6 100644
--- a/app/src/main/java/photoTimeFix/Fragment2.kt
+++ b/app/src/main/java/photoTimeFix/Fragment2.kt
@@ -5,19 +5,18 @@ import android.app.TimePickerDialog
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.media.MediaScannerConnection
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import org.jetbrains.anko.longToast
-import org.jetbrains.anko.toast
+import tech.lincaiqi.PhotoTimeFix.Core
 import tech.lincaiqi.PhotoTimeFix.R
-import java.io.File
 import java.util.*
 import java.text.SimpleDateFormat
 
@@ -26,11 +25,14 @@ class Fragment2 : Fragment() {
 
     private lateinit var preferences : SharedPreferences
     private lateinit var editor : SharedPreferences.Editor
-    private lateinit var coreK: CoreK
+    private lateinit var coreK : CoreK
     private lateinit var locateTv : EditText
     private lateinit var chooseBtn : Button
     private lateinit var radioGroup : RadioGroup
-    private lateinit var dateEdit :EditText
+    private lateinit var dateEdit : EditText
+    private var bitmapIsNull : Boolean = true
+    private lateinit var choseDateEdit : EditText
+    private var core = Core()
 
     override fun onCreateView(inflater: LayoutInflater, parent: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, parent, savedInstanceState)
@@ -42,13 +44,17 @@ class Fragment2 : Fragment() {
         chooseBtn = view.findViewById(R.id.chooseButton)
         radioGroup = view.findViewById(R.id.radioGroup)
         dateEdit = view.findViewById(R.id.nowDate)
+        choseDateEdit = view.findViewById(R.id.choseDateEdit)
         editor.apply()
         locateTv.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
             override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
             override fun afterTextChanged(p0: Editable?) {
                 val path:String = locateTv.text.toString()
-                dateEdit.setText(coreK.updateDate(path,activity!!))
+                val returnValue = coreK.updateDate(path,activity!!)
+                dateEdit.setText(returnValue[0])
+                choseDateEdit.setText(returnValue[1])
+                bitmapIsNull = (returnValue[0]=="")
             }
 
         })
@@ -56,10 +62,7 @@ class Fragment2 : Fragment() {
         val freshBtn = view.findViewById<Button>(R.id.freshButton)
         freshBtn.setOnClickListener {
             val path : String = locateTv.text.toString()
-            val file = File(path)
-            if (file.exists())
-                MediaScannerConnection.scanFile(context, arrayOf(path),null) { _, _ -> activity!!.runOnUiThread { context!!.toast("完成") }}
-            else context!!.toast("文件不存在")
+            coreK.freshMedia(path,context!!)
         }
 
         val dateBtn = view.findViewById<Button>(tech.lincaiqi.PhotoTimeFix.R.id.dateButton)
@@ -86,6 +89,14 @@ class Fragment2 : Fragment() {
             dp.show()
         }
 
+        val startBtn = view.findViewById<Button>(R.id.startButton)
+        startBtn.setOnClickListener {
+            val fileString: String = view.findViewById<EditText>(R.id.locateText).text.toString()
+            val radio: Boolean = radioGroup.checkedRadioButtonId == R.id.radioButton
+            val selectDate = choseDateEdit.text.toString()
+            core.process(context, 0, 0, fileString, radio, activity, "yyyyMMddHHmm", selectDate)
+        }
+
         return view
     }
 
@@ -94,7 +105,9 @@ class Fragment2 : Fragment() {
         super.onActivityResult(requestCode, resultCode, data)
         if (path != "error") {
             locateTv.setText(path)
-            dateEdit.setText(coreK.updateDate(path,activity!!))
+            val returnValue = coreK.updateDate(path,activity!!)
+            dateEdit.setText(returnValue[0])
+            choseDateEdit.setText(returnValue[1])
             path = path.substring(0, path.lastIndexOf("/"))
             editor.putString("locate", path)
             editor.apply()
@@ -105,8 +118,8 @@ class Fragment2 : Fragment() {
         super.setUserVisibleHint(isVisibleToUser)
         if (context != null && isVisibleToUser) {
             coreK.initFragment(preferences, editor, chooseBtn, radioGroup, this)
-            val iV = activity!!.findViewById<ImageView>(R.id.user_bg)
-            if (iV.drawable != null) coreK.updateAppbar(activity!!,false)
+            //context!!.toast(bitmapIsNull.toString())
+            if (!bitmapIsNull) coreK.updateAppbar(activity!!,false)
         }
     }
 
diff --git a/app/src/main/java/photoTimeFix/MainActivity.kt b/app/src/main/java/photoTimeFix/MainActivity.kt
index b51946f..a52bda9 100644
--- a/app/src/main/java/photoTimeFix/MainActivity.kt
+++ b/app/src/main/java/photoTimeFix/MainActivity.kt
@@ -9,7 +9,7 @@ import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
-import  kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java b/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java
index c2c30c8..6c56cd1 100644
--- a/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java
+++ b/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java
@@ -3,11 +3,9 @@
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -21,14 +19,17 @@ public class Core {
 
     private boolean support = true;
 
-    public void process(Context context, int startnum, int endnum, String fileString, boolean radio, Activity activity, String format) {
+    public void process(Context context, int startnum, int endnum, String fileString, boolean radio, Activity activity, String format, String selectDate) {
         File file = new File(fileString);
         //Log.d("EditText", locateTv.getText().toString());
         if (!file.exists()) {
-            Toast.makeText(context, "路径不存在", Toast.LENGTH_LONG).show();
+            Toast.makeText(context, "路径或文件不存在", Toast.LENGTH_LONG).show();
             return;
         }
-        final File[] files = file.listFiles();
+        final File[] files;
+        if (file.isDirectory()) {
+            files = file.listFiles();
+        } else files = new File[]{file};
         final ProgressDialog pd = new ProgressDialog(context);
 
         pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
@@ -50,6 +51,8 @@ public void process(Context context, int startnum, int endnum, String fileString
 
                 boolean retValue;
 
+                Toast.makeText(context,"正在获取ROOT权限",Toast.LENGTH_LONG);
+
                 try {
                     suProcess = Runtime.getRuntime().exec("su");
 
@@ -107,7 +110,7 @@ public void process(Context context, int startnum, int endnum, String fileString
                 i++;
 
                 if (i >= startnum && (endnum == 0 || i <= endnum)) {
-                    String time = f.getName();
+                    String time = selectDate.equals("") ? f.getName() : selectDate;
                     time = Pattern.compile("[^0-9]").matcher(time).replaceAll("").trim();
                     if (time.contains("20") && time.substring(time.indexOf("20")).length() >= 12) {
                         String targetTime = time.substring(time.indexOf("20"), time.indexOf("20") + 12);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a88b17f..664d709 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -49,18 +49,25 @@
         </android.support.design.widget.CollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
 
-    <android.support.design.widget.TabLayout
-        android:id="@+id/mTb"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabMode="scrollable"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        />
-    <android.support.v4.view.ViewPager
-        android:id="@+id/mVp"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/mTb"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:tabMode="scrollable" />
+        <android.support.v4.view.ViewPager
+            android:id="@+id/mVp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </LinearLayout>
 
 </android.support.design.widget.CoordinatorLayout><!--
     作者：Code_KZ
diff --git a/app/src/main/res/layout/fragment_2.xml b/app/src/main/res/layout/fragment_2.xml
index e665ec9..4581ef5 100644
--- a/app/src/main/res/layout/fragment_2.xml
+++ b/app/src/main/res/layout/fragment_2.xml
@@ -11,7 +11,7 @@
         android:layout_centerHorizontal="true"
         android:orientation="vertical"
         tools:ignore="UselessParent"
-        android:layout_marginTop="80dp">
+        android:layout_marginTop="60dp">
 
         <EditText
             android:id="@+id/locateText"
@@ -45,27 +45,6 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/format" />
-
-            <EditText
-                android:id="@+id/editFormat"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:ems="10"
-                android:hint="@string/img_yyyymmddhhmm_hhmmss_jpg"
-                android:inputType="textPersonName" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/build.gradle b/build.gradle
index 1a5330c..ddf6007 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,9 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.3.11"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.3.20"
+        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.15'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }