Revert "系统参数弹窗相关 java code 2 kotlin"

This reverts commit 4555bc21.

app/src/main/java/com/miya/fastcashier/log/ParamEntity.java

+package com.miya.fastcashier.log;
+
+import java.io.Serializable;
+
+/**
+ * 作者：Leon
+ * 时间：2017/3/21 14:50
+ */
+public class ParamEntity implements Serializable {
+    private String title;
+    private String titleColor;
+    private int titleStyle ;
+    private int theme ;
+    private String backgroundColor;
+    private int backIcon;
+    private boolean mutilyMode;
+    private String addText;
+    private int iconStyle;
+    private String[] fileTypes;
+    private String notFoundFiles;
+    private int maxNum;
+    private boolean chooseMode = true;
+    private String path;
+    private long fileSize;
+    private boolean isGreater;
+    private String fileName;
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Deprecated
+    public String getTitleColor() {
+        return titleColor;
+    }
+
+    @Deprecated
+    public void setTitleColor(String titleColor) {
+        this.titleColor = titleColor;
+    }
+
+    public int getTheme() {
+        return theme;
+    }
+
+    public void setTheme(int theme) {
+        this.theme = theme;
+    }
+
+    public int getTitleStyle() {
+        return titleStyle;
+    }
+
+    public void setTitleStyle(int titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+
+    public String getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    public void setBackgroundColor(String backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    public boolean isMutilyMode() {
+        return mutilyMode;
+    }
+
+    public void setMutilyMode(boolean mutilyMode) {
+        this.mutilyMode = mutilyMode;
+    }
+
+    public int getBackIcon() {
+        return backIcon;
+    }
+
+    public void setBackIcon(int backIcon) {
+        this.backIcon = backIcon;
+    }
+
+    public String getAddText() {
+        return addText;
+    }
+
+    public void setAddText(String addText) {
+        this.addText = addText;
+    }
+
+    public int getIconStyle() {
+        return iconStyle;
+    }
+
+    public void setIconStyle(int iconStyle) {
+        this.iconStyle = iconStyle;
+    }
+
+    public String[] getFileTypes() {
+        return fileTypes;
+    }
+
+    public void setFileTypes(String[] fileTypes) {
+        this.fileTypes = fileTypes;
+    }
+
+    public String getNotFoundFiles() {
+        return notFoundFiles;
+    }
+
+    public void setNotFoundFiles(String notFoundFiles) {
+        this.notFoundFiles = notFoundFiles;
+    }
+
+    public int getMaxNum() {
+        return maxNum;
+    }
+
+    public void setMaxNum(int maxNum) {
+        this.maxNum = maxNum;
+    }
+
+    public boolean isChooseMode() {
+        return chooseMode;
+    }
+
+    public void setChooseMode(boolean chooseMode) {
+        this.chooseMode = chooseMode;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public long getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(long fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public boolean isGreater() {
+        return isGreater;
+    }
+
+    public void setGreater(boolean greater) {
+        isGreater = greater;
+    }
+}

app/src/main/java/com/miya/fastcashier/log/ParamEntity.kt

-package com.miya.fastcashier.log
-
-import java.io.Serializable
-
-/**
- * 作者：Leon
- * 时间：2017/3/21 14:50
- */
-class ParamEntity : Serializable {
-    var title: String? = null
-
-    @get:Deprecated("")
-    @set:Deprecated("")
-    var titleColor: String? = null
-    var titleStyle = 0
-    var theme = 0
-    var backgroundColor: String? = null
-    var backIcon = 0
-    var isMutilyMode = false
-    var addText: String? = null
-    var iconStyle = 0
-    var fileTypes: Array<String>? = null
-    var notFoundFiles: String? = null
-    var maxNum = 0
-    var isChooseMode = true
-    var path: String? = null
-    var fileSize: Long = 0
-    var isGreater = false
-    var fileName: String? = null
-}
\ No newline at end of file

app/src/main/java/com/miya/fastcashier/log/SystemParameterDialog.java

+package com.miya.fastcashier.log;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import com.miya.fastcashier.BuildConfig;
+import com.miya.fastcashier.R;
+import com.miya.fastcashier.beans.SelfCashierAccountInfo;
+import com.miya.fastcashier.databinding.DialogSystemParameterBinding;
+import com.miya.fastcashier.net.ApiConfig;
+import com.miya.fastcashier.service.AccountService;
+import com.miya.fastcashier.utils.BaseFunctionKt;
+import com.miya.print.PrinterManager;
+
+import androidx.annotation.NonNull;
+
+public class SystemParameterDialog extends Dialog {
+
+    private DialogSystemParameterBinding viewBinding;
+
+    public SystemParameterDialog(@NonNull Context context) {
+        super(context, R.style.CommonDialog);
+
+        viewBinding = DialogSystemParameterBinding.inflate(getLayoutInflater());
+        setContentView(viewBinding.getRoot());
+        setCanceledOnTouchOutside(false);
+        setCancelable(true);
+
+        init();
+    }
+
+    private void init() {
+        SelfCashierAccountInfo accountInfo = AccountService.INSTANCE.getAccountInfo();
+
+        setInfo(viewBinding.tvVersion, BaseFunctionKt.getVersion(getContext()));
+        setInfo(viewBinding.tvStoreName, accountInfo.getShopInfo().getStoreName());
+        setInfo(viewBinding.tvStoreNum, accountInfo.getShopInfo().getStoreId());
+        setInfo(viewBinding.tvMerchantNum, accountInfo.getShopInfo().getHhMerchant());
+        setInfo(viewBinding.tvPos, accountInfo.getShopInfo().getPosId());
+        setInfo(viewBinding.tvCashier, accountInfo.getShopInfo().getOperatorId());
+        setInfo(viewBinding.tvVersionType, "fastCashier_" + BuildConfig.appType);
+        setInfo(viewBinding.tvEquipment, "sunmi_v2pro");
+        setInfo(viewBinding.tvServerUrl, ApiConfig.getBaseUrl());
+        setInfo(viewBinding.tvWifiName, BaseFunctionKt.getWifyName(getContext()));
+        setInfo(viewBinding.tvNetIp, BaseFunctionKt.getNetIp(getContext()) == null ? "未知" : BaseFunctionKt.getNetIp(getContext()));
+        setInfo(viewBinding.tvPrintType, PrinterManager.getInstance().getPrinter() == null ?
+                getContext().getResources().getString(R.string.app_unkown) :
+                PrinterManager.getInstance().getPrinter().getPrinterName());
+        setInfo(viewBinding.tvChannel, BuildConfig.CHANNEL);
+
+        viewBinding.ivClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dismiss();
+            }
+        });
+
+        resize();
+    }
+
+    private void setInfo(View view, String info) {
+        ((TextView) view).setText(info);
+    }
+
+    /**
+     * 设置对话框大小
+     *
+     * @param width  宽度，传0表示走默认宽度
+     * @param height 高度，传0表示走默认高度
+     */
+    public SystemParameterDialog setSize(int width, int height) {
+        if (width < 0 || height < 0) {
+            return this;
+        }
+        WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
+        if (width != 0 && height != 0) {
+            layoutParams.width = width;
+            layoutParams.height = height;
+        } else if (width == 0 && height != 0) {
+            layoutParams.height = height;
+        } else if (width != 0 && height == 0) {
+            layoutParams.width = width;
+        }
+        getWindow().setGravity(Gravity.CENTER);
+        getWindow().setAttributes(layoutParams);
+        return this;
+    }
+
+    private void resize() {
+        this.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.MATCH_PARENT);
+    }
+}
\ No newline at end of file

app/src/main/java/com/miya/fastcashier/log/SystemParameterDialog.kt

-package com.miya.fastcashier.log
-
-import android.app.Dialog
-import android.content.Context
-import com.miya.fastcashier.service.AccountService.getAccountInfo
-import com.miya.fastcashier.utils.getVersion
-import com.miya.fastcashier.net.ApiConfig.baseUrl
-import com.miya.fastcashier.utils.getWifyName
-import com.miya.fastcashier.utils.getNetIp
-import com.miya.fastcashier.R
-import com.miya.fastcashier.beans.SelfCashierAccountInfo
-import com.miya.fastcashier.service.AccountService
-import com.miya.fastcashier.net.ApiConfig
-import com.miya.print.PrinterManager
-import android.widget.TextView
-import com.miya.fastcashier.log.SystemParameterDialog
-import android.view.WindowManager
-import android.view.Gravity
-import android.view.View
-import com.miya.fastcashier.BuildConfig
-import com.miya.fastcashier.databinding.DialogSystemParameterBinding
-
-class SystemParameterDialog(context: Context) : Dialog(context, R.style.CommonDialog) {
-
-    private val viewBinding: DialogSystemParameterBinding
-
-    init {
-        viewBinding = DialogSystemParameterBinding.inflate(
-            layoutInflater
-        )
-        setContentView(viewBinding.root)
-        setCanceledOnTouchOutside(false)
-        setCancelable(true)
-        init()
-    }
-
-    private fun init() {
-        val accountInfo = getAccountInfo()
-        setInfo(viewBinding.tvVersion, getVersion(context))
-        setInfo(viewBinding.tvStoreName, accountInfo!!.shopInfo.storeName)
-        setInfo(viewBinding.tvStoreNum, accountInfo.shopInfo.storeId)
-        setInfo(viewBinding.tvMerchantNum, accountInfo.shopInfo.hhMerchant)
-        setInfo(viewBinding.tvPos, accountInfo.shopInfo.posId)
-        setInfo(viewBinding.tvCashier, accountInfo.shopInfo.operatorId)
-        setInfo(viewBinding.tvVersionType, "fastCashier_" + BuildConfig.appType)
-        setInfo(viewBinding.tvEquipment, "sunmi_v2pro")
-        setInfo(viewBinding.tvServerUrl, baseUrl)
-        setInfo(viewBinding.tvWifiName, getWifyName(context))
-        setInfo(viewBinding.tvNetIp, if (getNetIp(context) == null) "未知" else getNetIp(context))
-        setInfo(
-            viewBinding.tvPrintType,
-            if (PrinterManager.getInstance().printer == null) context.resources.getString(R.string.app_unkown) else PrinterManager.getInstance().printer.printerName
-        )
-        setInfo(viewBinding.tvChannel, BuildConfig.CHANNEL)
-        viewBinding.ivClose.setOnClickListener(View.OnClickListener { dismiss() })
-        resize()
-    }
-
-    private fun setInfo(view: View, info: String?) {
-        (view as TextView).text = info
-    }
-
-    /**
-     * 设置对话框大小
-     *
-     * @param width  宽度，传0表示走默认宽度
-     * @param height 高度，传0表示走默认高度
-     */
-    fun setSize(width: Int, height: Int): SystemParameterDialog {
-        if (width < 0 || height < 0) {
-            return this
-        }
-        val layoutParams = window!!.attributes
-        if (width != 0 && height != 0) {
-            layoutParams.width = width
-            layoutParams.height = height
-        } else if (width == 0 && height != 0) {
-            layoutParams.height = height
-        } else if (width != 0 && height == 0) {
-            layoutParams.width = width
-        }
-        window!!.setGravity(Gravity.CENTER)
-        window!!.attributes = layoutParams
-        return this
-    }
-
-    private fun resize() {
-        this.window!!.setLayout(
-            WindowManager.LayoutParams.MATCH_PARENT,
-            WindowManager.LayoutParams.MATCH_PARENT
-        )
-    }
-}
\ No newline at end of file