2023年06月05日09:44:56

wjc

2023-06-05 331a7abecb31a856bee7950755c32ff701508a8a

2023年06月05日09:44:56

 .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>

 app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
    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"
@@ -11,13 +11,16 @@
        android:supportsRtl="true"
        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:name=".ui.HomeLoginActivity"
            android:exported="false" />
        <activity
            android:name=".ui.StartActivity"
            android:exported="true" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

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

File was renamed from app/src/main/java/com/hdl/photovoltaic/ui/Login/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 {

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

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

import androidx.appcompat.content.res.AppCompatResources;


 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 {


 app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java

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

    }
}

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

File was renamed from app/src/main/java/com/hdl/photovoltaic/ui/home/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;

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

File was renamed from app/src/main/java/com/hdl/photovoltaic/ui/home/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;

 app/src/main/res/layout/activity_fast_scan.xml

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

 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"

 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"