Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/neptune/neptune.iml" filepath="$PROJECT_DIR$/neptune/neptune.iml" />
+      <module fileurl="file://H:\work\TangKuPos\neptune\neptune.iml" filepath="H:\work\TangKuPos\neptune\neptune.iml" />
       <module fileurl="file://$PROJECT_DIR$/pay/pay.iml" filepath="$PROJECT_DIR$/pay/pay.iml" />
     </modules>
   </component>

app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java

@@ -147,6 +147,11 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
         super.onSaveInstanceState(outState, outPersistentState);
     }
 
+    @Override
+    protected void onPause() {
+        C.SYSTEM.mStateEnable = false;
+        super.onPause();
+    }
     @Override
     protected void onStop() {
 //        C.SYSTEM.mStateEnable = false;