2023年06月02日15:06:03

wjc

2023-06-02 dac1f2838830dbe6f7ae791cc4563a00c4c5fe92

2023年06月02日15:06:03

修改包名

 .idea/misc.xml

New file
@@ -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>

 app/build.gradle

@@ -6,7 +6,7 @@
    compileSdk 32

    defaultConfig {
        applicationId "com.example.photovoltaic"
        applicationId "com.hdl.photovoltaic"
        minSdk 23
        targetSdk 32
        versionCode 1

 app/src/androidTest/java/com/hdl/photovoltaic/ExampleInstrumentedTest.java

File was renamed from app/src/androidTest/java/com/example/photovoltaic/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic;
package com.hdl.photovoltaic;

import android.content.Context;


 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" />

 app/src/main/java/com/hdl/photovoltaic/HDLApp.java

File was renamed from app/src/main/java/com/example/photovoltaic/HDLApp.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic;
package com.hdl.photovoltaic;

import android.app.Application;


 app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java

File was renamed from app/src/main/java/com/example/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 {

 app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java

File was renamed from app/src/main/java/com/example/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;


 app/src/main/java/com/hdl/photovoltaic/base/CustomBaseActivity.java

File was renamed from app/src/main/java/com/example/photovoltaic/base/CustomBaseActivity.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic.base;
package com.hdl.photovoltaic.base;


/**

 app/src/main/java/com/hdl/photovoltaic/base/CustomBaseFragment.java

File was renamed from app/src/main/java/com/example/photovoltaic/base/CustomBaseFragment.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic.base;
package com.hdl.photovoltaic.base;

/**
 * 实现个性自定义方法

 app/src/main/java/com/hdl/photovoltaic/enums/ShowErrorMode.java

File was renamed from app/src/main/java/com/example/photovoltaic/enums/ShowErrorMode.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic.enums;
package com.hdl.photovoltaic.enums;

/**
 * 显示错误模式

 app/src/main/java/com/hdl/photovoltaic/listener/BaseView.java

File was renamed from app/src/main/java/com/example/photovoltaic/listener/BaseView.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic.listener;
package com.hdl.photovoltaic.listener;

import android.os.Bundle;


 app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java

File was renamed from app/src/main/java/com/example/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;

/**

 app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java

File was renamed from app/src/main/java/com/example/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;

/**
 * 线程逻辑

 app/src/main/java/com/hdl/photovoltaic/ui/Login/HomeLoginActivity.java

File was renamed from app/src/main/java/com/example/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 {

 app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java

File was renamed from app/src/main/java/com/example/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 {


 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java

File was renamed from app/src/main/java/com/example/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;


 app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java

File was renamed from app/src/main/java/com/example/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;


 app/src/main/java/com/hdl/photovoltaic/ui/home/HouseListFragment.java

File was renamed from app/src/main/java/com/example/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", "下拉刷新");
            }
        });

 app/src/main/java/com/hdl/photovoltaic/ui/home/MeFragment.java

File was renamed from app/src/main/java/com/example/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;

 app/src/main/java/com/hdl/photovoltaic/ui/home/MyPowerStationActivity.java

File was renamed from app/src/main/java/com/example/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 {

 app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java

File was renamed from app/src/main/java/com/example/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;

 app/src/main/java/com/hdl/photovoltaic/utils/FlashLightUtils.java

File was renamed from app/src/main/java/com/example/photovoltaic/utils/FlashLightUtils.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic.utils;
package com.hdl.photovoltaic.utils;


import android.content.Context;

 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"

 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"

 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"

 app/src/test/java/com/hdl/photovoltaic/ExampleUnitTest.java

File was renamed from app/src/test/java/com/example/photovoltaic/ExampleUnitTest.java
@@ -1,4 +1,4 @@
package com.example.photovoltaic;
package com.hdl.photovoltaic;

import org.junit.Test;