2024年11月28日12:27:03

wjc

2024-11-28 c78db812030cdcf545c400b43825d7b2c5b076e1

2024年11月28日12:27:03

 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java

@@ -154,6 +154,8 @@
    public static final String POST_statusOverview = "/home-wisdom/app/powerStation/statusOverview";
    //获取电站交付二维码(安装商)
    public static final String POST_getDeliveryUrlQrcode = "/home-wisdom/app/powerStation/getDeliveryUrlQrcode";
    //获取电站交付URl(安装商)
    public static final String POST_getDeliveryUrl = "/home-wisdom/app/powerStation/getDeliveryUrl";

    //电站手动交付(安装商)
    public static final String POST_deliverToAccount = "/home-wisdom/app/powerStation/deliverToAccount";

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

@@ -987,6 +987,39 @@

    }


    /**
     * 获取电站交付URl（B端）
     * 描述：安装商电站的交付URl
     *
     * @param homeId        电站id
     * @param cloudCallBeak -
     */
    public void getDeliveryUrl(String homeId, CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.POST_getDeliveryUrl;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
//        json.addProperty("zoneType", memberBean.getId());//区域

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(jsonStr);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });

    }


    /**
     * 电站手动交付(B端)
     * 描述：安装商手动交付电站给指定的C端账号

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

@@ -249,6 +249,12 @@
                        uniGetDeliveryUrlQrcode(type, data, callback);
                    }
                    break;
                    //电站的交付URL(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
                        uniGetDeliveryUrl(type, data, callback);
                    }

                    break;
                    //电站手动交付(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
                        uniGetDeliverToAccount(type, data, callback);
@@ -983,6 +989,25 @@
    }

    /**
     * 电站的交付URl(安装商)
     */
    private void uniGetDeliveryUrl(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniExceptionCallback(type, e, callback);
            }
        });

    }

    /**
     * 获取当前账号在公司的身份
     */
    private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {

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

@@ -91,16 +91,16 @@
     */
    private void setTextViewStyle(TextView textView, int state_value) {
        String text = mContext.getString(R.string.my_power_station_operation);
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_06b92a);
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
        switch (state_value) {
            case 1: {
                text = mContext.getString(R.string.my_power_station_connecting);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
            }
            break;
            case 2: {
                text = mContext.getString(R.string.my_power_station_malfunction);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
            }
            break;
            case 3: {
@@ -110,7 +110,7 @@
            break;
            case 4: {
                text = mContext.getString(R.string.my_power_station_off_line);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
            }
            break;


 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java

@@ -33,6 +33,7 @@
    public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//住宅【电站】详情
    public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//住宅【电站】删除
    public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE = "delivery_url_qrcode";//电站的交付二维码(安装商)
    public final static String UNI_EVENT_REPLY_HOME_DELIVERYURL = "delivery_url";//电站的交付URl(安装商)
    public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT = "deliver_to_account";//电站手动交付(安装商)
    public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM = "update_debug_perm";//电站授权安装商(C端)
    public final static String UNI_EVENT_REPLY_HOME_ADD = "scan_add_home";//扫码添加电站(C端)

 app/src/main/res/drawable/default_image.png

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

@@ -18,7 +18,7 @@
    <TextView
        android:id="@+id/fragment_me_line_title_iv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_23"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_7"
        android:text="@string/me_set"
        android:textColor="@color/text_E6FFFFFF"

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

@@ -2,7 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_127">
    android:layout_height="@dimen/dp_117">

    <!--    <ImageView-->
    <!--        android:id="@+id/power_station_search_iv"-->
@@ -20,36 +20,48 @@
        android:layout_height="@dimen/dp_99"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_21"
        android:background="@drawable/ffffff_13"
        android:background="@drawable/bj_ff333738"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">


        <TextView
            android:id="@+id/device_search_state_tv"
            android:layout_width="7dp"
            android:layout_height="7dp"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="22.5dp"
            android:background="@drawable/device_state_ffb9b9b9"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/device_search_name_tv"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_23"
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_15"
            android:layout_marginEnd="@dimen/dp_6"
            android:layout_toStartOf="@+id/device_search_state_tv"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="6dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:ellipsize="end"
            android:gravity="center_vertical|start"
            android:gravity="center_vertical"
            android:singleLine="true"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            android:textStyle="bold" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@+id/device_search_state_tv"
            app:layout_constraintTop_toTopOf="parent" />


        <TextView
            android:id="@+id/device_search_sn_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_height="14.5dp"
            android:layout_below="@+id/device_search_name_tv"
            android:layout_alignStart="@+id/device_search_name_tv"
            android:layout_alignStart="@+id/device_search_state_tv"
            android:layout_marginTop="@dimen/dp_6"
            android:gravity="center_vertical"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_12" />

        <TextView
@@ -57,24 +69,11 @@
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_below="@+id/device_search_sn_tv"
            android:layout_alignStart="@+id/device_search_sn_tv"
            android:layout_alignStart="@+id/device_search_state_tv"
            android:layout_marginTop="@dimen/dp_6"
            android:gravity="center_vertical"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_12" />

        <TextView
            android:id="@+id/device_search_state_tv"
            android:layout_width="69dp"
            android:layout_height="@dimen/dp_33"
            android:layout_alignParentTop="true"
            android:layout_alignParentEnd="true"
            android:background="@drawable/state_ffb300"
            android:gravity="center"
            android:text="@string/my_power_station_connecting"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_12" />


    </RelativeLayout>