ccc 4 kuukautta sitten
vanhempi
commit
9b966307fe

+ 1 - 1
BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java

@@ -20,7 +20,7 @@ public abstract class Global {
      * 1:
      * 2:国外线上
      */
-    public static final int isVersions = 2;
+    public static final int isVersions = 1;
 
     /**
      * 用来初始化这个Global的类,不然会很卡。

+ 4 - 0
BaseLibrary/src/main/java/com/hboxs/base_library/util/DrawableSelectorUtils.java

@@ -366,6 +366,10 @@ public class DrawableSelectorUtils {
             logoF = R.drawable.logo_kasssplash;//以色列
             width = R.dimen.dp_80;
             height = R.dimen.dp_40;
+        }else if ("7749".equals(logo)){
+            logoF = R.drawable.logo_qimitech;//qimi_tech
+            width = R.dimen.dp_80;
+            height = R.dimen.dp_40;
         }
         ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
         layoutParams.width = UiUtil.getDimensionPixelRes(width);

BIN
BaseLibrary/src/main/res/drawable/logo_qimitech.png


+ 1 - 1
app/src/main/java/com/bgy/autosale/payutil/MQService.java

@@ -1273,7 +1273,7 @@ public class MQService extends Service implements SendCallback,Callback<Result>
                 || "5769".equals(s) || "6894".equals(s) || "8123".equals(s) || "5217".equals(s) || "6431".equals(s)
                 || "7777".equals(s) || "8080".equals(s) || "6702".equals(s) || "7772".equals(s) || "7761".equals(s)
                 || "7773".equals(s) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s)|| "7754".equals(s)
-                ||"0000".equals(s)|| "7764".equals(s)|| "5784".equals(s)) {
+                ||"0000".equals(s)|| "7764".equals(s)|| "5784".equals(s)|| "7749".equals(s)) {
             Hawk.put("logo", s);
             Hawk.get("logo", "7777");
         }

+ 1 - 0
app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -587,6 +587,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        LogUtils.logWrite("退出了选购页面");
         removeFinish();
         mHandler.removeCallbacks(mRunnable);
         UISoundHelper.getInstance().playSelectFlavor(false);

+ 2 - 0
app/src/main/java/com/bgy/autosale/ui/consumer/MainFragment.java

@@ -45,6 +45,7 @@ import com.bgy.autosale.utils.ToastUtil;
 import com.hboxs.base_library.event.ApiMessageEvent;
 import com.hboxs.base_library.util.DrawableSelectorUtils;
 import com.hboxs.base_library.util.LanguageUtil;
+import com.hboxs.base_library.util.LogUtils;
 import com.orhanobut.hawk.Hawk;
 
 import org.greenrobot.eventbus.EventBus;
@@ -94,6 +95,7 @@ public class MainFragment extends BaseFragment implements RadarCallback {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         Log.d(TAG, "onViewCreated: MainFragment");
+        LogUtils.logWrite("进入了广告页面");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
             getActivity().getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
         }

+ 1 - 1
app/src/main/java/com/bgy/autosale/ui/operator/fragments/SwitchFragment.java

@@ -460,7 +460,7 @@ public class SwitchFragment extends BaseFragment implements RadioGroup.OnChecked
             String s = etChanglog.getText().toString();
             if ("1".equals(s) ||"7772".equals(s)||"7770".equals(s)||"7777".equals(s)||"7761".equals(s)
                     ||"7773".equals(s)||"7774".equals(s)||"7786".equals(s)||"7775".equals(s)||"7754".equals(s)
-            ||"0000".equals(s)|| "7764".equals(s)|| "5784".equals(s)) {
+            ||"0000".equals(s)|| "7764".equals(s)|| "5784".equals(s)|| "7749".equals(s)) {
                 Hawk.put("logo", s);
                 Hawk.get("logo", "7777");
                 ToastUtil.showToast(UiUtil.getStringRes(R.string.xgwc));

+ 42 - 42
app/src/main/res/layout/fragment_switch.xml

@@ -219,6 +219,48 @@
                 </LinearLayout>
 
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                tools:ignore="MissingConstraints">
+
+                <TextView
+                    android:id="@+id/tv_cash_vis"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/dp_8"
+                    android:text="@string/cash_pay"
+                    android:textColor="#333"
+                    android:textSize="@dimen/sp_14"
+                    android:textStyle="bold" />
+
+                <RadioGroup
+                    android:id="@+id/rg_cash_vis"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_cash_vis_yes"
+                        android:layout_width="@dimen/dp_60"
+                        android:layout_height="@dimen/dp_26"
+                        android:gravity="center"
+                        android:text="@string/show_data"
+                        android:textColor="#576478"
+                        android:textSize="@dimen/sp_8" />
+
+                    <RadioButton
+                        android:id="@+id/rb_cash_vis_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/hide_data"
+                        android:textColor="#576478"
+                        android:textSize="@dimen/sp_8" />
+                </RadioGroup>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/ll_abroad_pay_setting"
@@ -483,48 +525,6 @@
                             android:textSize="@dimen/sp_8" />
                     </RadioGroup>
                 </LinearLayout>
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    tools:ignore="MissingConstraints">
-
-                    <TextView
-                        android:id="@+id/tv_cash_vis"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_8"
-                        android:text="@string/cash_pay"
-                        android:textColor="#333"
-                        android:textSize="@dimen/sp_14"
-                        android:textStyle="bold" />
-
-                    <RadioGroup
-                        android:id="@+id/rg_cash_vis"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <RadioButton
-                            android:id="@+id/rb_cash_vis_yes"
-                            android:layout_width="@dimen/dp_60"
-                            android:layout_height="@dimen/dp_26"
-                            android:gravity="center"
-                            android:text="@string/show_data"
-                            android:textColor="#576478"
-                            android:textSize="@dimen/sp_8" />
-
-                        <RadioButton
-                            android:id="@+id/rb_cash_vis_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/hide_data"
-                            android:textColor="#576478"
-                            android:textSize="@dimen/sp_8" />
-                    </RadioGroup>
-                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
 

+ 1 - 1
config.gradle

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