V1.0.2(3) 1、广告显示后，onResum周期弹出弹窗；2、重设密码两次输入不一致弹出提示；

app/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 3,
-      "versionName": "1.0.0",
+      "versionName": "1.0.2",
-      "outputFile": "lockapp_v1.0.0(1)_07_26_16_40-release.apk"
+      "outputFile": "Lock App_v1.0.2(3)_08_28_17_59-release.apk"
     }
   ],
   "elementType": "File"

app/src/main/java/com/tool/applockpro/activity/SearchActivity.java

@@ -35,6 +35,10 @@ public class SearchActivity extends AppCompatActivity {
     ActivitySearchBinding binding;
     private List<Mydata> searchdata = new ArrayList<>();
     private OkDialogFragment okDialogFragment;
+
+    private boolean showDialog = false;
+    private String showMsg;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,7 +72,6 @@ public class SearchActivity extends AppCompatActivity {
     }
 
 
-
     private void search(String text) {
         if (TextUtils.isEmpty(text)) {
             binding.searchTips.setText(R.string.text_tips);
@@ -98,7 +101,8 @@ public class SearchActivity extends AppCompatActivity {
                                 AppAdapter appAdapter = new AppAdapter(SearchActivity.this, SearchActivity.this, new ShowAdDialogCallback() {
                                     @Override
                                     public void onShowAdOkDialog(String msg) {
-                                        showDialog(msg);
+                                        showMsg = msg;
+                                        showDialog = true;
                                     }
                                 });
                                 appAdapter.update(searchdata);
@@ -113,14 +117,25 @@ public class SearchActivity extends AppCompatActivity {
         }
         hideKeyView();
     }
-    private void showDialog(String string) {
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (showDialog) {
+            showDialog = false;
+            showMyDialog();
+        }
+    }
+
+    private void showMyDialog() {
         if (okDialogFragment == null) {
-            okDialogFragment = OkDialogFragment.newInstance(string);
+            okDialogFragment = OkDialogFragment.newInstance(showMsg);
-        }else {
+        } else {
-            okDialogFragment.updateContent(string);
+            okDialogFragment.updateContent(showMsg);
         }
         okDialogFragment.show(getSupportFragmentManager(), "");
     }
+
     private void initData() {
 
         binding.searchTips.setVisibility(View.GONE);

app/src/main/java/com/tool/applockpro/activity/SetPWDActivity.java

@@ -118,12 +118,12 @@ public class SetPWDActivity extends AppCompatActivity {
                         stringBuilder.append(binding.et2.getText().toString());
                         stringBuilder.append(binding.et3.getText().toString());
                         stringBuilder.append(binding.et4.getText().toString());
-                        Log.e("zzj", "---set stringBuilder---" + stringBuilder.toString());
+
                         secondPwd = stringBuilder.toString();
-                        Log.e("zzj", "---get firstPwd---" + firstPwd);
+
                         if (secondPwd.equals(firstPwd)) {
                             ApplockSkin.savePWD(secondPwd);
-                            Log.e("zzj", "---second set pwd---" + stringBuilder.toString());
+
                             if (chewkpwd == ApplockSkin.checkpwd_0) {
                                 Intent intent = new Intent(SetPWDActivity.this, MainActivity.class);
                                 Toast.makeText(SetPWDActivity.this, getString(R.string.setlock_tips), Toast.LENGTH_SHORT).show();
@@ -134,6 +134,14 @@ public class SetPWDActivity extends AppCompatActivity {
 
                                 showAd();
                             }
+                        }else {
+                            Log.d(ApplockSkin.TAG,"------两次输入不一致");
+                            //两次输入不一致
+                            binding.et1.setText("");
+                            binding.et2.setText("");
+                            binding.et3.setText("");
+                            binding.et4.setText("");
+                            Toast.makeText(SetPWDActivity.this, getString(R.string.input_error), Toast.LENGTH_SHORT).show();
                         }
                     }
                     updateEditTextBackgrounds();

app/src/main/java/com/tool/applockpro/activity/SplashActivity.java

@@ -32,7 +32,7 @@ public class SplashActivity extends AppCompatActivity {
     private CountDownTimer countDownTimer;
     private float i = 0;
 
-    private long time = 1000;
+    private long time = 12000;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/tool/applockpro/fragment/AllFragment.java

@@ -34,6 +34,9 @@ public class AllFragment extends Fragment {
 
     private String packageName;
 
+    private boolean showDialog = false;
+    private String showMsg;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -41,7 +44,8 @@ public class AllFragment extends Fragment {
         thumAdapter = new AppAdapter(requireContext(), requireActivity(), new ShowAdDialogCallback() {
             @Override
             public void onShowAdOkDialog(String msg) {
-                showDialog(msg);
+                showMsg = msg;
+                showDialog = true;
             }
         });
         packageName = ApplockSkin.getContext().getPackageName();
@@ -55,11 +59,11 @@ public class AllFragment extends Fragment {
         return binding.getRoot();
     }
 
-    private void showDialog(String string) {
+    private void showDialog() {
         if (okDialogFragment == null) {
-            okDialogFragment = OkDialogFragment.newInstance(string);
+            okDialogFragment = OkDialogFragment.newInstance(showMsg);
         } else {
-            okDialogFragment.updateContent(string);
+            okDialogFragment.updateContent(showMsg);
         }
         okDialogFragment.show(requireActivity().getSupportFragmentManager(), "");
     }
@@ -89,6 +93,10 @@ public class AllFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
+        if (showDialog) {
+            showDialog = false;
+            showDialog();
+        }
         refreshData();
     }
 

app/src/main/java/com/tool/applockpro/topon/AdManager.kt

@@ -77,7 +77,7 @@ object AdManager {
                     }
 
                 })
-//                ad.load()
+                ad.load()
             }
         }
 
@@ -154,7 +154,7 @@ object AdManager {
             override fun onInterstitialAdShow(p0: ATAdInfo?) {
                 Log.d(ApplockSkin.TAG, "AdShow  ${p0?.showId}   ")
                 listener.showSuccess()
-//                ad.load()
+                ad.load()
             }
 
             override fun onInterstitialAdClose(p0: ATAdInfo?) {

app/src/main/res/layout/item_app.xml

@@ -13,7 +13,7 @@
         android:id="@+id/logo"
         android:layout_width="55dp"
         android:layout_height="55dp"
-        app:cardCornerRadius="60dp"
+        app:cardCornerRadius="27dp"
         app:cardElevation="0dp"
         app:cardMaxElevation="0dp"
         android:padding="6dp"
@@ -24,8 +24,8 @@
 
         <ImageView
             android:id="@+id/imlogo"
-            android:layout_width="match_parent"
+            android:layout_width="55dp"
-            android:layout_height="match_parent"
+            android:layout_height="55dp"
             android:scaleType="fitXY"
             android:src="@mipmap/ic_launcher" />
     </androidx.cardview.widget.CardView>
@@ -50,7 +50,7 @@
         android:layout_width="55dp"
         android:layout_height="55dp"
         app:cardBackgroundColor="@color/item_lock_bg_color"
-        app:cardCornerRadius="60dp"
+        app:cardCornerRadius="27dp"
         app:cardElevation="0dp"
         app:cardMaxElevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/values/strings.xml

@@ -27,6 +27,7 @@
     <string name="share_title">Here is a Lock App</string>
     <string name="lock_re_enter">Please re-enter the 4-digit \n password you just created</string>
     <string name="ok_dialog_msg">Are you sure you want to %s %S</string>
+    <string name="input_error">The two inputs are inconsistent, please re-enter</string>
     <string name="cancel">Cancel</string>
     <string name="ok">Ok</string>
 </resources>