From 57e16d05ef4924a480a5895cdb485556cc820e9b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 09:45:53 +0800
Subject: [PATCH] Merge branch 'wjc'
---
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 | 12 +
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 | 93 +++++++++++
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/build.gradle | 2
app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java | 26 +++
app/src/test/java/com/hdl/photovoltaic/ExampleUnitTest.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 5
app/src/main/res/layout/activity_fast_scan.xml | 9 +
app/src/main/AndroidManifest.xml | 13 +
app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java | 14 -
app/src/main/res/layout/activity_start.xml | 2
app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java | 43 +++++
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 2
app/src/main/java/com/hdl/photovoltaic/base/CustomBaseFragment.java | 2
/dev/null | 120 ---------------
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 8
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 8
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 11
app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java | 9
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 37 +---
app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java | 2
29 files changed, 244 insertions(+), 203 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..2a2e4cc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +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/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..09168e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?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"
@@ -9,16 +9,19 @@
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=".ui.home.MyPowerStationActivity"
+ android:name=".ui.device.FastScanActivity"
android:exported="false" />
<activity
- android:name=".ui.Login.HomeLoginActivity"
+ android:name=".ui.MyPowerStationActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.HomeLoginActivity"
android:exported="false" />
<activity
android:name=".ui.StartActivity"
- android:exported="true" >
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/photovoltaic/other/HdlThreadLogic.java b/app/src/main/java/com/example/photovoltaic/other/HdlThreadLogic.java
deleted file mode 100644
index 1791853..0000000
--- a/app/src/main/java/com/example/photovoltaic/other/HdlThreadLogic.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.example.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;
-
-/**
- * 绾跨▼閫昏緫
- */
-public class HdlThreadLogic {
- private static final Handler handler = new Handler(Looper.getMainLooper());
-
- /**
- * 鍒囨崲鍥炰富绾跨▼
- *
- * @param run 鍥炶皟
- */
- public static void runMainThread(Runnable run) {
- try {
- if (Looper.myLooper() == Looper.getMainLooper()) {
- run.run();
- } else {
- handler.post(run);
- }
- } catch (Exception e) {
- exception(e, ShowErrorMode.YES);
- }
- }
-
- /**
- * 鍒囨崲鍥炰富绾跨▼
- *
- * @param run 鍥炶皟
- * @param context 涓婁笅鏂�
- * @param showErrorMode 鏄惁鏄剧ず閿欒
- */
- public static void runMainThread(Runnable run, Context context, ShowErrorMode showErrorMode) {
- try {
- if (Looper.myLooper() == Looper.getMainLooper()) {
- run.run();
- } else {
- handler.post(run);
- }
- } catch (Exception e) {
- exception(e, showErrorMode);
- }
- }
-
- /**
- * 瀛愮嚎绋�
- *
- * @param run 鍥炶皟
- */
- public static void runThread(Runnable run) {
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- run.run();
- } catch (Exception e) {
- exception(e, ShowErrorMode.NO);
- }
- }
- }).start();
-
- }
-
- /**
- * 瀛愮嚎绋�
- *
- * @param run 鍥炶皟
- * @param context 涓婁笅鏂�
- * @param showErrorMode 鏄惁鏄剧ず閿欒
- */
- public static void runThread(Runnable run, Context context, ShowErrorMode showErrorMode) {
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- run.run();
- } catch (Exception e) {
- exception(e, showErrorMode);
- }
- }
- }).start();
-
- }
-
-
- private static void exception(Exception e, ShowErrorMode showErrorMode) {
- if (showErrorMode == ShowErrorMode.NO) {
- return;
- }
-
- handler.post(new Runnable() {
- @Override
- public void run() {
-// Dialog alertDialog = new AlertDialog.Builder(HDLApp.getInstance().getApplicationContext()).
-// setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏淇℃伅.").
-// setMessage(e.getMessage()).
-// create();
-// alertDialog.show();
- //鎻愮ず
-// AlertDialog alertDialog=new AlertDialog(HDLApp.getInstance().getApplicationContext(), androidx.fragment.R.style.TextAppearance_Compat_Notification);
-// alertDialog.setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�");
-// alertDialog.show();
- //Toast.makeText(HDLApp.getInstance().getApplicationContext(), "鎶辨瓑绋嬪簭鍑虹幇閿欒浜�", Toast.LENGTH_SHORT).show();
-
- }
- });
- }
-}
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 88%
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..04b2ce1 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,16 @@
-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.util.Log;
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 {
@@ -23,7 +20,6 @@
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
_mActivity = this;
Object content = getContentView();
//娣诲姞Activity鍒板爢鏍�
@@ -71,7 +67,7 @@
/**
* 绠�鍗曠殑璺宠浆Activity
*
- * @param clazz
+ * @param clazz _
*/
protected void startActivity(Class<?> clazz) {
Intent intent = new Intent(this, clazz);
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..4a88c53 100644
--- a/app/src/main/java/com/example/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -1,14 +1,14 @@
-package com.example.photovoltaic.base;
+package com.hdl.photovoltaic.base;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
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 +16,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;
@@ -39,6 +37,7 @@
_mActivity = getActivity();
}
+
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
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/hdl/photovoltaic/other/HdlThreadLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
new file mode 100644
index 0000000..73fe38b
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -0,0 +1,93 @@
+package com.hdl.photovoltaic.other;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.hdl.photovoltaic.enums.ShowErrorMode;
+
+/**
+ * 绾跨▼閫昏緫
+ */
+public class HdlThreadLogic {
+ private static final Handler handler = new Handler(Looper.getMainLooper());
+
+
+ /**
+ * 鍒囨崲鍥炰富绾跨▼
+ *
+ * @param run 鍥炶皟
+ * @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
+ * @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佹樉绀洪敊璇～null)
+ */
+ public static void runMainThread(Runnable run, Context context, ShowErrorMode showErrorMode) {
+ try {
+ if (Looper.myLooper() == Looper.getMainLooper()) {
+ run.run();
+ } else {
+ handler.post(run);
+ }
+ } catch (Exception e) {
+ exception(e, showErrorMode, context);
+ }
+ }
+
+
+ /**
+ * 瀛愮嚎绋�
+ *
+ * @param run 鍥炶皟
+ * @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
+ * @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佸～null)
+ */
+ public static void runThread(Runnable run, Context context, ShowErrorMode showErrorMode) {
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ run.run();
+ } catch (Exception e) {
+ exception(e, showErrorMode, context);
+ }
+ }
+ }).start();
+
+ }
+
+
+ /**
+ * @param e 寮傚父淇℃伅绫�
+ * @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
+ * @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佸～null)
+ */
+ private static void exception(Exception e, ShowErrorMode showErrorMode, Context context) {
+ if (showErrorMode == null || context == null || e == null) {
+ return;
+ }
+ if (showErrorMode == ShowErrorMode.NO) {
+ return;
+ }
+
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ Dialog alertDialog = new AlertDialog.Builder(context).
+ setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏淇℃伅.").
+ setMessage(e.getMessage()).
+ create();
+ alertDialog.show();
+ //鎻愮ず
+// AlertDialog alertDialog = new AlertDialog(context, androidx.fragment.R.style.TextAppearance_Compat_Notification);
+// alertDialog.setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�");
+// alertDialog.show();
+// Toast.makeText(context, "鎶辨瓑绋嬪簭鍑虹幇閿欒浜�", Toast.LENGTH_SHORT).show();
+
+ }
+ });
+ }
+}
diff --git a/app/src/main/java/com/example/photovoltaic/ui/Login/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/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/HomeLoginActivity.java
index 3f80612..591496b 100644
--- a/app/src/main/java/com/example/photovoltaic/ui/Login/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -1,4 +1,4 @@
-package com.example.photovoltaic.ui.Login;
+package com.hdl.photovoltaic.ui;
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.MyPowerStationActivity;
public class HomeLoginActivity extends CustomBaseActivity {
diff --git a/app/src/main/java/com/example/photovoltaic/ui/home/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
similarity index 92%
rename from app/src/main/java/com/example/photovoltaic/ui/home/MyPowerStationActivity.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 8e12c54..b82cea7 100644
--- a/app/src/main/java/com/example/photovoltaic/ui/home/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -1,13 +1,13 @@
-package com.example.photovoltaic.ui.home;
+package com.hdl.photovoltaic.ui;
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/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..ee3f0f4 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,11 @@
-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;
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/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/example/photovoltaic/ui/home/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/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/me/MeFragment.java
index 902249b..139c0d3 100644
--- a/app/src/main/java/com/example/photovoltaic/ui/home/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -1,11 +1,11 @@
-package com.example.photovoltaic.ui.home;
+package com.hdl.photovoltaic.ui.me;
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/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
similarity index 68%
rename from app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index ed55005..346bf75 100644
--- a/app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -1,7 +1,6 @@
-package com.example.photovoltaic.ui.home;
+package com.hdl.photovoltaic.ui.powerstation;
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();
//鍒濆鍖�
@@ -55,12 +54,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-// try {
-// manager.setTorchMode("0",true);
-// } catch (CameraAccessException e) {
-// e.printStackTrace();
-// }
-// flashLightUtils.open();
+
}
});
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -68,13 +62,8 @@
viewBinding.fragmentHouseSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
-// flashLightUtils.cloes();
-// try {
-// manager.setTorchMode("0",false);
-// } 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/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 62%
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..eb8b8e0 100644
--- a/app/src/main/java/com/example/photovoltaic/utils/FlashLightUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java
@@ -1,10 +1,11 @@
-package com.example.photovoltaic.utils;
+package com.hdl.photovoltaic.utils;
import android.content.Context;
import android.content.pm.FeatureInfo;
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraManager;
import android.os.Build;
import android.hardware.Camera;
@@ -42,7 +43,7 @@
FeatureInfo[] features = packageManager.getSystemAvailableFeatures();
for (FeatureInfo featureInfo : features) {
// 鍒ゆ柇璁惧鏄惁鏀寔闂厜鐏�
- if (packageManager.FEATURE_CAMERA_FLASH.equals(featureInfo.name)) {
+ if (PackageManager.FEATURE_CAMERA_FLASH.equals(featureInfo.name)) {
if (null == mCamera) {
mCamera = Camera.open();
}
@@ -58,7 +59,7 @@
}
// 鍏抽棴鎵嬬數绛�
- public void cloes() {
+ public void close() {
if (!status) // 濡傛灉鏄凡缁忓叧闂殑鐘舵�� 涓嶉渶瑕佹墦寮�
{
return;
@@ -79,5 +80,41 @@
}
status = false; // 璁板綍鎵嬬數绛掍负鍏抽棴
}
+
+ /**
+ * 鎵嬬數绛掓墦寮�鎴栬�呭叧闂�
+ *
+ * @param isOpen 鎵撳紑(true)鎴栬�呭叧闂�(false)
+ */
+ public void setOpenOrClose(boolean isOpen) {
+ try {
+
+ //鑾峰彇褰撳墠鎵嬫満鎵�鏈夋憚鍍忓ご璁惧ID
+ String[] ids = manager.getCameraIdList();
+ for (String id : ids) {
+ CameraCharacteristics c = manager.getCameraCharacteristics(id);
+ //鏌ヨ璇ユ憚鍍忓ご缁勪欢鏄惁鍖呭惈闂厜鐏�
+ Boolean flashAvailable = c.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
+
+ /*
+ * 鑾峰彇鐩告満闈㈠鐨勬柟鍚�
+ * CameraCharacteristics.LENS_FACING_FRONT 鍓嶇疆鎽勫儚澶�
+ * CameraCharacteristics.LENS_FACING_BACK 鍚庡彧鎽勫儚澶�
+ * CameraCharacteristics.LENS_FACING_EXTERNAL 澶栭儴鐨勬憚鍍忓ご
+ */
+ Integer lensFacing = c.get(CameraCharacteristics.LENS_FACING);
+ if (flashAvailable != null && flashAvailable
+ && lensFacing != null && lensFacing == CameraCharacteristics.LENS_FACING_BACK) {
+ //鎵撳紑鎴栧叧闂墜鐢电瓛
+ manager.setTorchMode(id, isOpen);
+ break;
+ }
+ }
+ } catch (CameraAccessException e) {
+ e.printStackTrace();
+ }
+ }
+
+
}
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 bb74213..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=".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 8e9da08..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=".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.example.photovoltaic.ui.home.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.example.photovoltaic.ui.home.MeFragment"
+ android:name="com.hdl.photovoltaic.ui.me.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