From dac1f2838830dbe6f7ae791cc4563a00c4c5fe92 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期五, 02 六月 2023 15:06:18 +0800 Subject: [PATCH] 2023年06月02日15:06:03 --- app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java | 2 app/src/main/java/com/hdl/photovoltaic/listener/BaseView.java | 2 app/src/main/res/layout/activity_my_power_station.xml | 6 +- app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 3 .idea/misc.xml | 5 + app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java | 2 app/src/main/res/layout/activity_home_login.xml | 2 app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 8 -- app/src/androidTest/java/com/hdl/photovoltaic/ExampleInstrumentedTest.java | 2 app/src/main/java/com/hdl/photovoltaic/enums/ShowErrorMode.java | 2 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 6 +- app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java | 11 +-- app/build.gradle | 2 app/src/test/java/com/hdl/photovoltaic/ExampleUnitTest.java | 2 app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 6 +- app/src/main/java/com/hdl/photovoltaic/ui/home/HouseListFragment.java | 23 +++---- app/src/main/AndroidManifest.xml | 10 +- app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java | 10 +-- app/src/main/res/layout/activity_start.xml | 2 app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java | 2 app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 2 app/src/main/java/com/hdl/photovoltaic/base/CustomBaseFragment.java | 2 app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java | 8 +- app/src/main/java/com/hdl/photovoltaic/ui/home/MeFragment.java | 8 +- app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java | 7 - app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java | 2 26 files changed, 64 insertions(+), 73 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4bc4fc6 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <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/build.gradle b/app/build.gradle index 620abc7..2c43ce4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ compileSdk 32 defaultConfig { - applicationId "com.example.photovoltaic" + applicationId "com.hdl.photovoltaic" minSdk 23 targetSdk 32 versionCode 1 diff --git a/app/src/androidTest/java/com/example/photovoltaic/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hdl/photovoltaic/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/example/photovoltaic/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/hdl/photovoltaic/ExampleInstrumentedTest.java index dc9aa79..6e90f09 100644 --- a/app/src/androidTest/java/com/example/photovoltaic/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/hdl/photovoltaic/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic; +package com.hdl.photovoltaic; import android.content.Context; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c67f994..b020b3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.photovoltaic" > + package="com.hdl.photovoltaic" > <application - android:name=".HDLApp" + android:name="com.hdl.photovoltaic.HDLApp" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" @@ -11,13 +11,13 @@ android:supportsRtl="true" android:theme="@style/Theme.PhotovoltaicDebug" > <activity - android:name=".ui.home.MyPowerStationActivity" + android:name="com.hdl.photovoltaic.ui.home.MyPowerStationActivity" android:exported="false" /> <activity - android:name=".ui.Login.HomeLoginActivity" + android:name="com.hdl.photovoltaic.ui.Login.HomeLoginActivity" android:exported="false" /> <activity - android:name=".ui.StartActivity" + android:name="com.hdl.photovoltaic.ui.StartActivity" android:exported="true" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/com/example/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java similarity index 96% rename from app/src/main/java/com/example/photovoltaic/HDLApp.java rename to app/src/main/java/com/hdl/photovoltaic/HDLApp.java index c54aedb..c5bc0f1 100644 --- a/app/src/main/java/com/example/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic; +package com.hdl.photovoltaic; import android.app.Application; diff --git a/app/src/main/java/com/example/photovoltaic/base/BaseActivity.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java similarity index 89% rename from app/src/main/java/com/example/photovoltaic/base/BaseActivity.java rename to app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java index 1b6615e..e49c4ff 100644 --- a/app/src/main/java/com/example/photovoltaic/base/BaseActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java @@ -1,19 +1,15 @@ -package com.example.photovoltaic.base; +package com.hdl.photovoltaic.base; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.view.WindowManager; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.example.photovoltaic.listener.BaseView; -import com.example.photovoltaic.utils.AppManagerUtils; - -import org.greenrobot.eventbus.EventBus; +import com.hdl.photovoltaic.listener.BaseView; +import com.hdl.photovoltaic.utils.AppManagerUtils; public abstract class BaseActivity extends AppCompatActivity implements BaseView { diff --git a/app/src/main/java/com/example/photovoltaic/base/BaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java similarity index 96% rename from app/src/main/java/com/example/photovoltaic/base/BaseFragment.java rename to app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java index ac6a787..8854588 100644 --- a/app/src/main/java/com/example/photovoltaic/base/BaseFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.base; +package com.hdl.photovoltaic.base; import android.content.Context; import android.content.Intent; @@ -8,7 +8,6 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.widget.FrameLayout; -import android.widget.LinearLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,11 +15,9 @@ import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.Lifecycle; -import com.example.photovoltaic.listener.BaseView; +import com.hdl.photovoltaic.listener.BaseView; import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; import java.util.Locale; diff --git a/app/src/main/java/com/example/photovoltaic/base/CustomBaseActivity.java b/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java similarity index 73% rename from app/src/main/java/com/example/photovoltaic/base/CustomBaseActivity.java rename to app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java index a1770ba..8fbed3c 100644 --- a/app/src/main/java/com/example/photovoltaic/base/CustomBaseActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.base; +package com.hdl.photovoltaic.base; /** diff --git a/app/src/main/java/com/example/photovoltaic/base/CustomBaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseFragment.java similarity index 73% rename from app/src/main/java/com/example/photovoltaic/base/CustomBaseFragment.java rename to app/src/main/java/com/hdl/photovoltaic/base/CustomBaseFragment.java index 2d1564b..844f204 100644 --- a/app/src/main/java/com/example/photovoltaic/base/CustomBaseFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/base/CustomBaseFragment.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.base; +package com.hdl.photovoltaic.base; /** * 瀹炵幇涓�ц嚜瀹氫箟鏂规硶 diff --git a/app/src/main/java/com/example/photovoltaic/enums/ShowErrorMode.java b/app/src/main/java/com/hdl/photovoltaic/enums/ShowErrorMode.java similarity index 73% rename from app/src/main/java/com/example/photovoltaic/enums/ShowErrorMode.java rename to app/src/main/java/com/hdl/photovoltaic/enums/ShowErrorMode.java index 9d1a82d..bd713be 100644 --- a/app/src/main/java/com/example/photovoltaic/enums/ShowErrorMode.java +++ b/app/src/main/java/com/hdl/photovoltaic/enums/ShowErrorMode.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.enums; +package com.hdl.photovoltaic.enums; /** * 鏄剧ず閿欒妯″紡 diff --git a/app/src/main/java/com/example/photovoltaic/listener/BaseView.java b/app/src/main/java/com/hdl/photovoltaic/listener/BaseView.java similarity index 76% rename from app/src/main/java/com/example/photovoltaic/listener/BaseView.java rename to app/src/main/java/com/hdl/photovoltaic/listener/BaseView.java index 69d66f0..ec583db 100644 --- a/app/src/main/java/com/example/photovoltaic/listener/BaseView.java +++ b/app/src/main/java/com/hdl/photovoltaic/listener/BaseView.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.listener; +package com.hdl.photovoltaic.listener; import android.os.Bundle; diff --git a/app/src/main/java/com/example/photovoltaic/other/HdlLogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java similarity index 89% rename from app/src/main/java/com/example/photovoltaic/other/HdlLogLogic.java rename to app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java index f52e69d..8c9892c 100644 --- a/app/src/main/java/com/example/photovoltaic/other/HdlLogLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java @@ -1,6 +1,5 @@ -package com.example.photovoltaic.other; +package com.hdl.photovoltaic.other; -import android.nfc.Tag; import android.util.Log; /** diff --git a/app/src/main/java/com/example/photovoltaic/other/HdlThreadLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java similarity index 93% rename from app/src/main/java/com/example/photovoltaic/other/HdlThreadLogic.java rename to app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java index 1791853..40bb756 100644 --- a/app/src/main/java/com/example/photovoltaic/other/HdlThreadLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java @@ -1,14 +1,10 @@ -package com.example.photovoltaic.other; +package com.hdl.photovoltaic.other; -import android.app.AlertDialog; -import android.app.Dialog; import android.content.Context; import android.os.Handler; import android.os.Looper; -import android.widget.Toast; -import com.example.photovoltaic.HDLApp; -import com.example.photovoltaic.enums.ShowErrorMode; +import com.hdl.photovoltaic.enums.ShowErrorMode; /** * 绾跨▼閫昏緫 diff --git a/app/src/main/java/com/example/photovoltaic/ui/Login/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java similarity index 95% rename from app/src/main/java/com/example/photovoltaic/ui/Login/HomeLoginActivity.java rename to app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java index 3f80612..431ecb3 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/Login/HomeLoginActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.ui.Login; +package com.hdl.photovoltaic.ui.Login; import android.os.Bundle; @@ -17,11 +17,10 @@ import androidx.appcompat.content.res.AppCompatResources; -import com.example.photovoltaic.R; -import com.example.photovoltaic.base.CustomBaseActivity; -import com.example.photovoltaic.databinding.ActivityHomeLoginBinding; -import com.example.photovoltaic.other.HdlThreadLogic; -import com.example.photovoltaic.ui.home.MyPowerStationActivity; +import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.base.CustomBaseActivity; +import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding; +import com.hdl.photovoltaic.ui.home.MyPowerStationActivity; public class HomeLoginActivity extends CustomBaseActivity { diff --git a/app/src/main/java/com/example/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java similarity index 78% rename from app/src/main/java/com/example/photovoltaic/ui/StartActivity.java rename to app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java index 85a6978..d5ca89c 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/StartActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java @@ -1,12 +1,12 @@ -package com.example.photovoltaic.ui; +package com.hdl.photovoltaic.ui; import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; import android.os.Bundle; -import com.example.photovoltaic.R; -import com.example.photovoltaic.ui.Login.HomeLoginActivity; +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/example/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java similarity index 93% rename from app/src/main/java/com/example/photovoltaic/ui/adapter/HouseInfoAdapter.java rename to app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java index 499b209..5ad6ee2 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/adapter/HouseInfoAdapter.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.ui.adapter; +package com.hdl.photovoltaic.ui.adapter; import android.view.LayoutInflater; import android.view.View; @@ -9,8 +9,8 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.photovoltaic.R; -import com.example.photovoltaic.ui.bean.HouseInfoBean; +import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.ui.bean.HouseInfoBean; import java.util.List; diff --git a/app/src/main/java/com/example/photovoltaic/ui/bean/HouseInfoBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java similarity index 85% rename from app/src/main/java/com/example/photovoltaic/ui/bean/HouseInfoBean.java rename to app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java index 454be2c..715728f 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/bean/HouseInfoBean.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.ui.bean; +package com.hdl.photovoltaic.ui.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HouseListFragment.java similarity index 81% rename from app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java rename to app/src/main/java/com/hdl/photovoltaic/ui/home/HouseListFragment.java index ed55005..46139f7 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HouseListFragment.java @@ -1,7 +1,6 @@ -package com.example.photovoltaic.ui.home; +package com.hdl.photovoltaic.ui.home; import android.content.Context; -import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraManager; import android.os.Bundle; import android.util.Log; @@ -10,12 +9,12 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.example.photovoltaic.R; -import com.example.photovoltaic.base.CustomBaseFragment; -import com.example.photovoltaic.databinding.FragmentHouseListBinding; -import com.example.photovoltaic.ui.adapter.HouseInfoAdapter; -import com.example.photovoltaic.ui.bean.HouseInfoBean; -import com.example.photovoltaic.utils.FlashLightUtils; +import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.databinding.FragmentHouseListBinding; +import com.hdl.photovoltaic.base.CustomBaseFragment; +import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; +import com.hdl.photovoltaic.ui.bean.HouseInfoBean; +import com.hdl.photovoltaic.utils.FlashLightUtils; import java.util.ArrayList; import java.util.List; @@ -24,7 +23,7 @@ private FragmentHouseListBinding viewBinding; private HouseInfoAdapter houseInfoAdapter; private FlashLightUtils flashLightUtils; - private CameraManager manager; + private CameraManager manager; private List<HouseInfoBean> houseInfoBeanList = null; @@ -36,8 +35,8 @@ @Override public void onBindView(Bundle savedInstanceState) { - flashLightUtils = new FlashLightUtils(_mActivity); - manager = (CameraManager) _mActivity.getSystemService(Context.CAMERA_SERVICE); + flashLightUtils = new FlashLightUtils(_mActivity); + manager = (CameraManager) _mActivity.getSystemService(Context.CAMERA_SERVICE); initData(); //鍒濆鍖� @@ -74,7 +73,7 @@ // } catch (CameraAccessException e) { // e.printStackTrace(); // } -// viewBinding.fragmentHouseSrl.setRefreshing(false); + viewBinding.fragmentHouseSrl.setRefreshing(false); Log.d("HouseListFragment", "涓嬫媺鍒锋柊"); } }); diff --git a/app/src/main/java/com/example/photovoltaic/ui/home/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/MeFragment.java similarity index 84% rename from app/src/main/java/com/example/photovoltaic/ui/home/MeFragment.java rename to app/src/main/java/com/hdl/photovoltaic/ui/home/MeFragment.java index 902249b..1ad47a2 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/home/MeFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/MeFragment.java @@ -1,11 +1,11 @@ -package com.example.photovoltaic.ui.home; +package com.hdl.photovoltaic.ui.home; import android.os.Bundle; import android.view.View; -import com.example.photovoltaic.R; -import com.example.photovoltaic.base.CustomBaseFragment; -import com.example.photovoltaic.databinding.FragmentMeBinding; +import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.base.CustomBaseFragment; +import com.hdl.photovoltaic.databinding.FragmentMeBinding; public class MeFragment extends CustomBaseFragment { private FragmentMeBinding viewBinding; diff --git a/app/src/main/java/com/example/photovoltaic/ui/home/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java similarity index 93% rename from app/src/main/java/com/example/photovoltaic/ui/home/MyPowerStationActivity.java rename to app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java index 8e12c54..8725b64 100644 --- a/app/src/main/java/com/example/photovoltaic/ui/home/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java @@ -1,13 +1,13 @@ -package com.example.photovoltaic.ui.home; +package com.hdl.photovoltaic.ui.home; import androidx.appcompat.content.res.AppCompatResources; import android.os.Bundle; import android.view.View; -import com.example.photovoltaic.R; -import com.example.photovoltaic.base.CustomBaseActivity; -import com.example.photovoltaic.databinding.ActivityMyPowerStationBinding; +import com.hdl.photovoltaic.R; +import com.hdl.photovoltaic.base.CustomBaseActivity; +import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding; public class MyPowerStationActivity extends CustomBaseActivity { diff --git a/app/src/main/java/com/example/photovoltaic/utils/AppManagerUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java similarity index 98% rename from app/src/main/java/com/example/photovoltaic/utils/AppManagerUtils.java rename to app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java index 79b3f8e..b263fd8 100644 --- a/app/src/main/java/com/example/photovoltaic/utils/AppManagerUtils.java +++ b/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.utils; +package com.hdl.photovoltaic.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/example/photovoltaic/utils/FlashLightUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java similarity index 98% rename from app/src/main/java/com/example/photovoltaic/utils/FlashLightUtils.java rename to app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java index bfb5d1b..3ff26b5 100644 --- a/app/src/main/java/com/example/photovoltaic/utils/FlashLightUtils.java +++ b/app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic.utils; +package com.hdl.photovoltaic.utils; import android.content.Context; diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml index bb74213..f829c8b 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=".ui.Login.HomeLoginActivity"> + tools:context="com.hdl.photovoltaic.ui.Login.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 8e9da08..d69baa7 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=".ui.home.MyPowerStationActivity"> + tools:context="com.hdl.photovoltaic.ui.home.MyPowerStationActivity"> <!--鎴戠殑鐢电珯-Fragment--> <androidx.fragment.app.FragmentContainerView android:id="@+id/my_power_station_fcv1" - android:name="com.example.photovoltaic.ui.home.HouseListFragment" + android:name="com.hdl.photovoltaic.ui.home.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.example.photovoltaic.ui.home.MeFragment" + android:name="com.hdl.photovoltaic.ui.home.MeFragment" android:layout_width="match_parent" android:layout_height="0dp" android:visibility="gone" diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml index 0c6519e..a1fd769 100644 --- a/app/src/main/res/layout/activity_start.xml +++ b/app/src/main/res/layout/activity_start.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.StartActivity"> + tools:context="com.hdl.photovoltaic.ui.StartActivity"> <TextView android:layout_width="wrap_content" diff --git a/app/src/test/java/com/example/photovoltaic/ExampleUnitTest.java b/app/src/test/java/com/hdl/photovoltaic/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/example/photovoltaic/ExampleUnitTest.java rename to app/src/test/java/com/hdl/photovoltaic/ExampleUnitTest.java index b714bc4..b9bd843 100644 --- a/app/src/test/java/com/example/photovoltaic/ExampleUnitTest.java +++ b/app/src/test/java/com/hdl/photovoltaic/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.example.photovoltaic; +package com.hdl.photovoltaic; import org.junit.Test; -- Gitblit v1.8.0