From 331a7abecb31a856bee7950755c32ff701508a8a Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 05 六月 2023 09:44:59 +0800 Subject: [PATCH] 2023年06月05日09:44:56 --- app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java | 26 +++++++++++++ app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 2 app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 1 app/src/main/res/layout/activity_fast_scan.xml | 9 ++++ app/src/main/res/layout/activity_home_login.xml | 2 app/src/main/AndroidManifest.xml | 17 +++++--- app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 2 app/src/main/res/layout/activity_my_power_station.xml | 6 +- app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 4 +- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 2 .idea/misc.xml | 7 +++ 11 files changed, 61 insertions(+), 17 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4bc4fc6..2a2e4cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="DesignSurface"> + <option name="filePathToZoomLevelMap"> + <map> + <entry key="app/src/main/res/layout/activity_my_power_station.xml" value="0.20625" /> + </map> + </option> + </component> <component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" /> </project> \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b020b3c..09168e4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,24 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.hdl.photovoltaic" > + package="com.hdl.photovoltaic"> <application - android:name="com.hdl.photovoltaic.HDLApp" + android:name=".HDLApp" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.PhotovoltaicDebug" > + android:theme="@style/Theme.PhotovoltaicDebug"> <activity - android:name="com.hdl.photovoltaic.ui.home.MyPowerStationActivity" + android:name=".ui.device.FastScanActivity" android:exported="false" /> <activity - android:name="com.hdl.photovoltaic.ui.Login.HomeLoginActivity" + android:name=".ui.MyPowerStationActivity" android:exported="false" /> <activity - android:name="com.hdl.photovoltaic.ui.StartActivity" - android:exported="true" > + android:name=".ui.HomeLoginActivity" + android:exported="false" /> + <activity + android:name=".ui.StartActivity" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java similarity index 98% rename from app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java rename to app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java index 431ecb3..591496b 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java @@ -1,4 +1,4 @@ -package com.hdl.photovoltaic.ui.Login; +package com.hdl.photovoltaic.ui; import android.os.Bundle; @@ -20,7 +20,7 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding; -import com.hdl.photovoltaic.ui.home.MyPowerStationActivity; +import com.hdl.photovoltaic.ui.MyPowerStationActivity; public class HomeLoginActivity extends CustomBaseActivity { diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java similarity index 98% rename from app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java rename to app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java index 8725b64..b82cea7 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -1,4 +1,4 @@ -package com.hdl.photovoltaic.ui.home; +package com.hdl.photovoltaic.ui; import androidx.appcompat.content.res.AppCompatResources; diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java index d5ca89c..ee3f0f4 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java @@ -6,7 +6,6 @@ import android.os.Bundle; import com.hdl.photovoltaic.R; -import com.hdl.photovoltaic.ui.Login.HomeLoginActivity; public class StartActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java new file mode 100644 index 0000000..7c31db8 --- /dev/null +++ b/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java @@ -0,0 +1,26 @@ +package com.hdl.photovoltaic.ui.device; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.base.CustomBaseActivity; +import com.hdl.photovoltaic.databinding.ActivityFastScanBinding; + +public class FastScanActivity extends CustomBaseActivity { + + + private ActivityFastScanBinding viewBinding; + + @Override + public Object getContentView() { + viewBinding = ActivityFastScanBinding.inflate(getLayoutInflater()); + return viewBinding.getRoot(); + } + + @Override + public void onBindView(Bundle savedInstanceState) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java similarity index 96% rename from app/src/main/java/com/hdl/photovoltaic/ui/home/me/MeFragment.java rename to app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java index 665eea6..139c0d3 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/home/me/MeFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java @@ -1,4 +1,4 @@ -package com.hdl.photovoltaic.ui.home.me; +package com.hdl.photovoltaic.ui.me; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java similarity index 98% rename from app/src/main/java/com/hdl/photovoltaic/ui/home/powerstation/HouseListFragment.java rename to app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java index dd7d69f..346bf75 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/home/powerstation/HouseListFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java @@ -1,4 +1,4 @@ -package com.hdl.photovoltaic.ui.home.powerstation; +package com.hdl.photovoltaic.ui.powerstation; import android.content.Context; import android.hardware.camera2.CameraManager; diff --git a/app/src/main/res/layout/activity_fast_scan.xml b/app/src/main/res/layout/activity_fast_scan.xml new file mode 100644 index 0000000..ce5b771 --- /dev/null +++ b/app/src/main/res/layout/activity_fast_scan.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".ui.device.FastScanActivity"> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml index f829c8b..56d0881 100644 --- a/app/src/main/res/layout/activity_home_login.xml +++ b/app/src/main/res/layout/activity_home_login.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.hdl.photovoltaic.ui.Login.HomeLoginActivity"> + tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity"> <ImageView android:id="@+id/home_login_server_iv" diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml index 5410ff4..566b68c 100644 --- a/app/src/main/res/layout/activity_my_power_station.xml +++ b/app/src/main/res/layout/activity_my_power_station.xml @@ -5,13 +5,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/text_F9FAFB" - tools:context="com.hdl.photovoltaic.ui.home.MyPowerStationActivity"> + tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity"> <!--鎴戠殑鐢电珯-Fragment--> <androidx.fragment.app.FragmentContainerView android:id="@+id/my_power_station_fcv1" - android:name="com.hdl.photovoltaic.ui.home.powerstation.HouseListFragment" + android:name="com.hdl.photovoltaic.ui.powerstation.HouseListFragment" android:layout_width="match_parent" android:layout_height="0dp" android:visibility="gone" @@ -22,7 +22,7 @@ <!--鎴戠殑-Fragment--> <androidx.fragment.app.FragmentContainerView android:id="@+id/my_power_station_fcv2" - android:name="com.hdl.photovoltaic.ui.home.me.MeFragment" + android:name="com.hdl.photovoltaic.ui.me.MeFragment" android:layout_width="match_parent" android:layout_height="0dp" android:visibility="gone" -- Gitblit v1.8.0