左晓为主开发手持机充值管理机
zuoxiao
2023-11-14 65cbb3446770279a5dd88cf67b5bd4463af3fcdf
修改activity包名称
19 文件已重命名
3个文件已修改
1个文件已删除
1个文件已添加
137 ■■■■■ 已修改文件
app/src/main/AndroidManifest.xml 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/acitivity/ParameterActivity.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/BaseActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/DomainActivity.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/HomeActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/MyActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/PowerActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/SysActivity.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_main.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_parameter.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/AndroidManifest.xml
@@ -42,18 +42,18 @@
        android:theme="@style/AppTheme">
        <activity
            android:name=".acitivity.LoginActivity"
            android:name=".activity.LoginActivity"
            android:exported="true">
        </activity>
        <activity
            android:name=".acitivity.AdminSetupActivity"
            android:name=".activity.AdminSetupActivity"
            android:exported="true">
        </activity>
        <activity
            android:name=".acitivity.HomeActivity"
            android:name=".activity.HomeActivity"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -61,7 +61,7 @@
            </intent-filter>
        </activity>
        <activity
            android:name=".acitivity.NewCardActivity"
            android:name=".activity.NewCardActivity"
            android:exported="true"
            android:launchMode="singleTop">
            <intent-filter>
@@ -70,17 +70,17 @@
            </intent-filter>
        </activity>
        <activity
            android:name=".acitivity.SysActivity"
            android:name=".activity.SysActivity"
            android:exported="true">
        </activity>
        <activity android:name=".acitivity.PassWordActivity" />
        <activity android:name=".acitivity.MyActivity" />
        <activity android:name=".acitivity.RechargeActivity" />
        <activity android:name=".activity.PassWordActivity" />
        <activity android:name=".activity.MyActivity" />
        <activity android:name=".activity.RechargeActivity" />
        <activity
            android:name=".acitivity.ReadCardAcitivy"
            android:name=".activity.ReadCardAcitivy"
            android:exported="true"
            android:launchMode="singleTop">
            <intent-filter>
@@ -89,7 +89,7 @@
            </intent-filter>
        </activity>
        <activity
            android:name=".acitivity.NFCWreatActivity"
            android:name=".activity.NFCWreatActivity"
            android:exported="true"
            android:launchMode="singleTop">
            <intent-filter>
@@ -97,11 +97,12 @@
                <data android:mimeType="text/plain" />
            </intent-filter>
        </activity>
        <activity android:name=".acitivity.RechargeListActivity" />
        <activity android:name=".acitivity.NewCardListActivity" />
        <activity android:name=".acitivity.SysIpActivity" />
        <activity android:name=".acitivity.ParameterActivity" />
        <activity android:name=".acitivity.PowerActivity" />
        <activity android:name=".activity.RechargeListActivity" />
        <activity android:name=".activity.NewCardListActivity" />
        <activity android:name=".activity.SysIpActivity" />
        <activity android:name=".activity.ParameterActivity" />
        <activity android:name=".activity.PowerActivity" />
        <activity android:name=".activity.DomainActivity"/>
        <meta-data
app/src/main/java/com/dayu/recharge/acitivity/ParameterActivity.java
File was deleted
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/AdminSetupActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Context;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/BaseActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.app.Activity;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/BaseNfcActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
/**
 * Created by zuo on 2018/12/2.
app/src/main/java/com/dayu/recharge/activity/DomainActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/DomainActivity.java
@@ -1,10 +1,9 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.dayu.recharge.databinding.ActivityDomainBinding;
import com.dayu.recharge.dbBean.DomainBean;
@@ -12,10 +11,10 @@
/**
 * Created by Android Studio.
 * author: xxx
 * author: zuo
 * Date: 2023-11-14
 * Time: 10:19
 * 备注:
 * 备注: 设置卡域名和ip
 */
public class DomainActivity extends BaseActivity {
    ActivityDomainBinding binding;
@@ -29,6 +28,8 @@
        domainBean = baseDao.domainPortDao().findFirst();
        if (domainBean != null) {
            binding.domainOldTV.setText(domainBean.getDomain() + ":" + domainBean.getPort());
        }else {
            domainBean=new DomainBean();
        }
        binding.electricOk.setOnClickListener(new View.OnClickListener() {
            @Override
app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/ElectricPriceActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/HomeActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/LoginActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/ManageSetUpActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/MyActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/MyActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.Manifest;
import android.app.Activity;
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/NFCWreatActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/NewCardActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.app.Dialog;
import android.app.ProgressDialog;
@@ -27,7 +27,6 @@
import com.dayu.recharge.utils.ToastUtil;
import com.dayu.recharge.utils.WSHelper;
import java.sql.Date;
import java.util.Arrays;
/**
app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/NewCardListActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import static com.dayu.recharge.view.TitleBar.ClickType_RIGHT_TEXT;
app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
New file
@@ -0,0 +1,37 @@
package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import com.dayu.recharge.databinding.ActivityParameterBinding;
/**
 * Copyright (C), 2023,
 * Author: zuo
 * Date: 2023-11-06 11:47
 * Description: 参数设置界面
 */
public class ParameterActivity extends BaseActivity {
    ActivityParameterBinding binding;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        binding = ActivityParameterBinding.inflate(LayoutInflater.from(this));
        setContentView(binding.getRoot());
        initView();
    }
    private void initView() {
        //设置域名卡
        binding.parameterDomain.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent intent = new Intent(ParameterActivity.this, DomainActivity.class);
                startActivity(intent);
            }
        });
    }
}
app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/PassWordActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/PowerActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/ReadCardAcitivy.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Intent;
import android.nfc.NfcAdapter;
@@ -21,8 +21,6 @@
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.tools.NfcReadHelper;
import com.dayu.recharge.tools.Utils;
import com.dayu.recharge.utils.ArithUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.SocketUtil;
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/RechargeActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/RechargeListActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import static com.dayu.recharge.view.TitleBar.ClickType_RIGHT_TEXT;
app/src/main/java/com/dayu/recharge/activity/SysActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/SysActivity.java
@@ -1,11 +1,10 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.card.CleanCard;
import com.dayu.recharge.card.CleanUserCard;
import com.dayu.recharge.card.DomainCard;
app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
File was renamed from app/src/main/java/com/dayu/recharge/acitivity/SysIpActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.acitivity;
package com.dayu.recharge.activity;
import android.os.Bundle;
import android.view.LayoutInflater;
app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
    android:paddingLeft="@dimen/activity_horizontal_margin"
    android:paddingRight="@dimen/activity_horizontal_margin"
    android:paddingTop="@dimen/activity_vertical_margin"
    tools:context="com.dayu.recharge.acitivity.MainActivity">
    tools:context="com.dayu.recharge.activity.MainActivity">
    <TextView
        android:id="@+id/write"
app/src/main/res/layout/activity_parameter.xml
@@ -14,7 +14,7 @@
        app:leftImage="@mipmap/icon_back" />
    <TextView
        android:id="@+id/parameter_waterMeter"
        android:id="@+id/parameter_domain"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="20dp"