From 65cbb3446770279a5dd88cf67b5bd4463af3fcdf Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 14 十一月 2023 15:11:47 +0800
Subject: [PATCH] 修改activity包名称
---
app/src/main/java/com/dayu/recharge/activity/MyActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java | 37 ++++++++++++
app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 3
app/src/main/java/com/dayu/recharge/activity/PowerActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java | 4 -
app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java | 2
app/src/main/AndroidManifest.xml | 31 +++++-----
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/BaseActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/HomeActivity.java | 2
/dev/null | 16 -----
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/SysActivity.java | 3
app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java | 2
app/src/main/res/layout/activity_main.xml | 2
app/src/main/java/com/dayu/recharge/activity/DomainActivity.java | 9 +-
app/src/main/res/layout/activity_parameter.xml | 2
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java | 2
app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java | 2
24 files changed, 78 insertions(+), 59 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 61034d3..95b1bec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/ParameterActivity.java b/app/src/main/java/com/dayu/recharge/acitivity/ParameterActivity.java
deleted file mode 100644
index 343c824..0000000
--- a/app/src/main/java/com/dayu/recharge/acitivity/ParameterActivity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dayu.recharge.acitivity;
-
-import android.os.Bundle;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-06 11:47
- * Description: 鍙傛暟璁剧疆鐣岄潰
- */
-public class ParameterActivity extends BaseActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- }
-}
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/AdminSetupActivity.java b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/acitivity/AdminSetupActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
index 390e692..2a419ff 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/AdminSetupActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.content.Context;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/BaseActivity.java b/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
similarity index 96%
rename from app/src/main/java/com/dayu/recharge/acitivity/BaseActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
index 26d4c2f..e6e62f7 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/BaseActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.app.Activity;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/BaseNfcActivity.java b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/BaseNfcActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
index ca72825..5b1e40b 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/BaseNfcActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
/**
* Created by zuo on 2018/12/2.
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/DomainActivity.java b/app/src/main/java/com/dayu/recharge/activity/DomainActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/acitivity/DomainActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/DomainActivity.java
index d15c8e2..65387f8 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/DomainActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/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
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/ElectricPriceActivity.java b/app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/acitivity/ElectricPriceActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
index df29637..014f0fd 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/ElectricPriceActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/HomeActivity.java b/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/HomeActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
index 144ec89..1a27f2c 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/HomeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/LoginActivity.java b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/acitivity/LoginActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
index ff14010..673b1de 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/ManageSetUpActivity.java b/app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
similarity index 89%
rename from app/src/main/java/com/dayu/recharge/acitivity/ManageSetUpActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
index 7cd410b..027bad7 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/ManageSetUpActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/MyActivity.java b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/acitivity/MyActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/MyActivity.java
index e83e069..a5e7f17 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/MyActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.Manifest;
import android.app.Activity;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/NFCWreatActivity.java b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/acitivity/NFCWreatActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
index 4b22587..e765ae1 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/NewCardActivity.java b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/acitivity/NewCardActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
index e9e9e3d..46f9bb0 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/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;
/**
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/NewCardListActivity.java b/app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/NewCardListActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java
index e43f73b..465dcb1 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/NewCardListActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java b/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
new file mode 100644
index 0000000..9b80d1f
--- /dev/null
+++ b/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
@@ -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);
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/PassWordActivity.java b/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/PassWordActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
index eba6f37..133dda6 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/PassWordActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/PowerActivity.java b/app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/acitivity/PowerActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
index 5751b9d..6eec124 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/PowerActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.os.Bundle;
import android.text.TextUtils;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/ReadCardAcitivy.java b/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/ReadCardAcitivy.java
rename to app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
index 61d4320..c524104 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/ReadCardAcitivy.java
+++ b/app/src/main/java/com/dayu/recharge/activity/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;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/RechargeActivity.java b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/RechargeActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
index f8701f1..15c2542 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/RechargeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/RechargeListActivity.java b/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/RechargeListActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
index e151f3f..bd19709 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/RechargeListActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/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;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/SysActivity.java b/app/src/main/java/com/dayu/recharge/activity/SysActivity.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/acitivity/SysActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/SysActivity.java
index f6232d4..a8b6967 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/SysActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/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;
diff --git a/app/src/main/java/com/dayu/recharge/acitivity/SysIpActivity.java b/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/acitivity/SysIpActivity.java
rename to app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
index 42f4eb8..9722629 100644
--- a/app/src/main/java/com/dayu/recharge/acitivity/SysIpActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.acitivity;
+package com.dayu.recharge.activity;
import android.os.Bundle;
import android.view.LayoutInflater;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 74d2fbb..0aac148 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_parameter.xml b/app/src/main/res/layout/activity_parameter.xml
index c87c0f6..621e0f1 100644
--- a/app/src/main/res/layout/activity_parameter.xml
+++ b/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"
--
Gitblit v1.8.0