制作完成后币值清零，广告黑屏优化

.idea/misc.xml

@@ -37,6 +37,7 @@
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_alarm_clock_tp.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_coin_sucess.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_credit_card.xml" value="0.6645367412140575" />
+        <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_info.xml" value="0.24947916666666667" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mdbcredit_card.xml" value="0.2" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_mix_pay_now.xml" value="0.72" />
         <entry key="..\:/Users/Desktop/iceCream-QX/icecream-lite-main/app/src/main/res/layout/dialog_pay.xml" value="0.24947916666666667" />

BaseLibrary/src/main/res/values-ms/strings.xml

@@ -20,5 +20,7 @@
     <string name="automatically_upload_orders">Muat naik pesanan secara automatik</string>
     <string name="language_2">Pilihan bahasa kedua:</string>
     <string name="choose_language_type">Sila pilih jenis mata wang</string>
+    <string name="value_of_zero">Tetapkan semula nilai mata wang selepas pengeluaran</string>
+
 </resources>
 <!--马来语-->

app/build.gradle

@@ -120,5 +120,5 @@ dependencies {
     implementation project(path: ':lm-library')
     implementation 'com.rabbitmq:amqp-client:4.12.0'
     implementation 'com.getui:sdk:2.13.1.0'
-
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:2.12'
 }

app/src/main/java/com/bgy/autosale/RemoteSupportService.java

@@ -81,6 +81,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
@@ -103,12 +105,14 @@ public class RemoteSupportService extends Service implements SendCallback {
     private static final String TAG = "RemoteSupportService";
     private TimerTask alarmClockTask;
     private Timer timerAlarmClock;
+    private ExecutorService executorService;
 
     @Override
     public void onCreate() {
         super.onCreate();
         getDefault().register(this);
         //获取闹钟
+        startGeTui();
         SetAnAlarm();
         timerAlarmClock = new Timer();
         alarmClockTask = new TimerTask() {
@@ -119,27 +123,26 @@ public class RemoteSupportService extends Service implements SendCallback {
         };
         timerAlarmClock.schedule(alarmClockTask, 60000, 3600000);
 
-        new Thread(new Runnable() {
+        executorService = Executors.newFixedThreadPool(2); // 创建一个固定大小的线程池
+        executorService.execute(new Runnable() {
             @Override
             public void run() {
                 String[] cmd = new String[]{"setprop service.adb.tcp.port 5555", "stop adbd", "start adbd"};
                 ShellUtils.execCommand(cmd, true, false);
             }
-        }).start();
-
+        });
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             createNotificationChannel();
         }
-        if (Hawk.get(Name.WMDB,false)) {
-            new Thread(new Runnable() {
-            @Override
-            public void run() {
+        if (Hawk.get(Name.WMDB, false)) {
+            executorService.execute(new Runnable() {
+                @Override
+                public void run() {
                     WeaverUtil.creditCardEnableReader();
                     Log.d(TAG, "run: creditCardEnableReader1");
-            }
-        }).start();
+                }
+            });
         }
-        startGeTui();
 
         new Handler().postDelayed(new Runnable() {
             @Override

app/src/main/java/com/bgy/autosale/helpers/BannerMediaHelper.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Color;
 import android.media.MediaPlayer;
 import android.support.constraint.ConstraintLayout;
+import android.util.Log;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.VideoView;
@@ -25,6 +26,7 @@ import java.util.ArrayList;
 public class BannerMediaHelper {
 
 
+    private static final String TAG = "BannerMediaHelper";
     private Banner bannerView;
     private VideoView videoView;
 
@@ -37,6 +39,7 @@ public class BannerMediaHelper {
         String bgVoicePath = null;
         String path = Constant.DIR_BANNER;
         File dir = new File(path);
+        Log.d(TAG, "BannerMediaHelper: "+dir);
         if (!dir.exists()) {
             dir.mkdirs();
         } else {

app/src/main/java/com/bgy/autosale/helpers/UISoundHelper.java

@@ -8,9 +8,14 @@ import android.util.SparseArray;
 
 import com.bgy.autosale.App;
 import com.bgy.autosale.Constant;
+import com.hboxs.base_library.constant.Global;
+import com.hboxs.base_library.constant.Name;
+import com.orhanobut.hawk.Hawk;
 
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -272,6 +277,10 @@ public class UISoundHelper implements Handler.Callback, MediaPlayer.OnPreparedLi
      */
     public void playOrderFinish() {
         play(SCENE_TAKE_FINISH);
+        if (Hawk.get(Name.VALUE_ZERO,false)){
+            Global.hasmoney = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
+            Global.hascoin = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
+        }
     }
 
     public void playRadarGuide(boolean isJump) {

app/src/main/java/com/bgy/autosale/ui/MainActivity.java

@@ -379,6 +379,7 @@ public class MainActivity extends BaseScanGunActivity {
         findViewById(R.id.main_fragment).setVisibility(View.VISIBLE);
         if (!SPUtils.getInstance(App.app).getBoolean(Constant.LOCK_IN_ERROR, false)) {
             App.app.initDeviceStateListener();//是否开机
+            Log.d(TAG, "initMainView: ");
         }
 
         if (initView != null) {

app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -427,7 +427,11 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 homeView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        exit();
+                        FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
+                        fragmentManager.beginTransaction()
+                                .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
+                                .commit();
+//                        exit();
                     }
                 });
             }
@@ -2131,7 +2135,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         bean.setPayType(payType);
         bean.setName(productName + "x" + productNumber);
         bean.setProductNumber(productNumber);
-        bean.setPrice(price);
+        bean.setPrice(price*productNumber);
         bean.setCreateDate(getStackCompleteTime());
         bean.setNo(productName + "-" + "I01" + "-" + productNumber);
         Gson gson = new Gson();

app/src/main/java/com/bgy/autosale/ui/consumer/MainFragment.java

@@ -139,7 +139,6 @@ public class MainFragment extends BaseFragment implements RadarCallback {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         EventBus.getDefault().register(this);
-
     }
 
     @Override

app/src/main/java/com/bgy/autosale/ui/operator/SwitchSettingActivity.java

@@ -25,6 +25,7 @@ public class SwitchSettingActivity extends BaseScanGunActivity implements View.O
 
     RadioButton rbAutoUploadYes, rbAutoUploadNo;
     RadioButton rbLanguageYes, rbLanguageNo;
+    RadioButton rbCoinCashResetYes, rbCoinCashResetNo;
     Spinner spLanguage2;
     private ArrayAdapter<String> language2ArrayAdapter;
 
@@ -82,6 +83,19 @@ public class SwitchSettingActivity extends BaseScanGunActivity implements View.O
             rbLanguageNo.setChecked(true);
         }
 
+        RadioGroup rgCoinCashReset = findViewById(R.id.rg_coin_cash_reset);
+        rgCoinCashReset.setOnCheckedChangeListener(this);
+
+        rbCoinCashResetYes = findViewById(R.id.rb_coin_cash_reset_yes);
+        rbCoinCashResetNo = findViewById(R.id.rb_coin_cash_reset_no);
+
+        Boolean valueZero = Hawk.get(Name.VALUE_ZERO, false);
+        if (valueZero) {
+            rbCoinCashResetYes.setChecked(true);
+        } else {
+            rbCoinCashResetNo.setChecked(true);
+        }
+
     }
 
     @Override
@@ -94,6 +108,10 @@ public class SwitchSettingActivity extends BaseScanGunActivity implements View.O
             Hawk.put(Name.LANGUAGE_SHOW, true);
         } else if (checkedId == R.id.rb_language_no) {
             Hawk.put(Name.LANGUAGE_SHOW, false);
+        } else if (checkedId == R.id.rb_coin_cash_reset_yes) {
+            Hawk.put(Name.VALUE_ZERO, true);
+        } else if (checkedId == R.id.rb_coin_cash_reset_no) {
+            Hawk.put(Name.VALUE_ZERO, false);
         }
     }
 

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

@@ -140,6 +140,49 @@
                     android:textSize="@dimen/sp_8" />
             </RadioGroup>
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_8"
+                android:text="@string/value_of_zero"
+                android:textColor="#333"
+                android:textSize="@dimen/sp_14"
+                android:textStyle="bold" />
+
+            <RadioGroup
+                android:id="@+id/rg_coin_cash_reset"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/rb_coin_cash_reset_yes"
+                    android:layout_width="@dimen/dp_60"
+                    android:layout_height="@dimen/dp_26"
+                    android:gravity="center"
+                    android:text="@string/setting_switch_on"
+                    android:textColor="#576478"
+                    android:textSize="@dimen/sp_8" />
+
+                <RadioButton
+                    android:id="@+id/rb_coin_cash_reset_no"
+                    android:layout_width="@dimen/dp_60"
+                    android:layout_height="@dimen/dp_26"
+                    android:layout_marginLeft="@dimen/dp_20"
+                    android:gravity="center"
+                    android:text="@string/setting_switch_off"
+                    android:textColor="#576478"
+                    android:textSize="@dimen/sp_8" />
+            </RadioGroup>
+        </LinearLayout>
+
     </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>

config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 19,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.42",//版本号修改
+            "versionName"                  : "1.0.43",//版本号修改
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",