Apex Mobile 2.21.180720

修复ams / ifs 没内容时误判导致退出detail页面

Apex Mobile/app/src/main/java/com/usai/apex/DetailFragment.java

@@ -545,27 +545,34 @@ public class DetailFragment extends Fragment implements OnClickListener, ShipMap
 				tv_empty.setVisibility(View.VISIBLE);
 
 
-				new AlertDialog.Builder(getContext())
-						.setTitle("Warning")
-						.setMessage("No Search Result.")
-						.setPositiveButton("Back", new DialogInterface.OnClickListener() {
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								getActivity().finish();
+				NewDetailActivity activity = (NewDetailActivity) getActivity();
+				int tabCount = activity.getTabCount();
+
+				if(tabCount==1)
+				{
+					new AlertDialog.Builder(getContext())
+							.setTitle("Warning")
+							.setMessage("No Search Result.")
+							.setPositiveButton("Back", new DialogInterface.OnClickListener() {
+								@Override
+								public void onClick(DialogInterface dialog, int which) {
+									getActivity().finish();
 //                                checkAllPermission();
 //								if (finalRequest)
 //									checkAllPermission();
 //								else
 //									finish();
-							}
-						})
+								}
+							})
 //                    .setNegativeButton("No", new DialogInterface.OnClickListener() {
 //                        @Override
 //                        public void onClick(DialogInterface dialog, int which) {
 //                            finish();
 //                        }
 //                    })
-						.show();
+							.show();
+				}
+
 			}
 			for (int i = 0; i < group_count; i++)
 			{

Apex Mobile/app/src/main/java/com/usai/apex/mainframe/NewDetailActivity.java

@@ -58,6 +58,10 @@ public class NewDetailActivity extends AppCompatActivity {
 
 //    Menu actionbutton;
 
+    public int getTabCount()
+    {
+        return bottomNavigationView.getMenu().size();
+    }
     private void setCustomActionBar() {
         ActionBar.LayoutParams lp =new ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT, Gravity.CENTER);
         View mActionBarView = LayoutInflater.from(this).inflate(R.layout.actionbar_customtitle, null);