2024年03月27日14:54:34

mac

2024-03-27 05df9bdaf543227c53f8026386339a3d78c5d769

2024年03月27日14:54:34

备份代码

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

@@ -68,6 +68,8 @@

    @Override
    public void onBindView(Bundle savedInstanceState) {
        setNotificationBarBackgroundColor(CustomColor.white);
        setStatusBarTextColor();
        //C端启动App自动打开小程序电站详情界面
        startAppAutomaticallyOpenUni();
        //注册监听
@@ -76,6 +78,13 @@
        this.initMqttClient();
        //上传极光注册ID到云端
        this.pushTokens();
    }

    @Override
    protected void onResume() {
        super.onResume();
        //目的是为启动页遮住下一页
        AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
@@ -157,8 +166,48 @@
                    }
                });
            }
        } else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL)
                && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK)) {
        } else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL) && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK)) {
            //物理按键返回事件(包括左滑移除事件)
            killProcessApp();
        }
    }

    /**
     * C端启动App自动打开小程序电站详情界面
     */
    private void startAppAutomaticallyOpenUni() {

        List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
        if (HouseIdList.size() == 0) {
            String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
            HdlUniLogic.getInstance().openUniMP(path, null);
        } else {
            int select_home = 0;
            for (int i = 0; i < HouseIdList.size(); i++) {
                if (HouseIdList.get(i).getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                    select_home = i;
                    break;
                }
            }
            HouseIdBean houseIdBean = HouseIdList.get(select_home);
            HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
            String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
            HdlUniLogic.getInstance().openUniMP(path, null);
        }


    }

//    /**
//     * 物理按键返回事件(包括左滑移除事件)
//     */
//    @Override
//    public void onBackPressed() {
//        killProcessApp();
//        super.onBackPressed();
//    }

    private void killProcessApp() {
            //物理按键返回事件(包括左滑移除事件)
            if (AppManagerUtils.getAppManager().getActivitySize() <= 1) {
                if (backPressTimes == 0) {
@@ -183,39 +232,9 @@
                        HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
                    }
                    AppManagerUtils.getAppManager().finishAllActivity();
                    HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
                    Process.killProcess(Process.myPid());
                }
            }
        }
    }

    /**
     * C端启动App自动打开小程序电站详情界面
     */
    private void startAppAutomaticallyOpenUni() {

        List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
        if (HouseIdList.size() == 0) {
            String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
            HdlUniLogic.getInstance().openUniMP(path, null);
        } else {
            int select_home = 0;
            for (int i = 0; i < HouseIdList.size(); i++) {
                if (HouseIdList.get(i).getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                    select_home = i;
                    break;
                }
            }
            HouseIdBean houseIdBean = HouseIdList.get(select_home);
            HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
            String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C
                    + "?homeId=" + houseIdBean.getHomeId()
                    + "&homeName=" + houseIdBean.getHomeName()
                    + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
            HdlUniLogic.getInstance().openUniMP(path, null);
        }

    }



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

@@ -31,6 +31,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
@@ -40,6 +41,7 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.TimeUtils;
@@ -112,6 +114,11 @@
            viewBinding.homeLoginLanguageTv.setText("简体中文");
        } else {
            viewBinding.homeLoginLanguageTv.setText("English");
        }
        if (UserConfigManage.getInstance().isBAccount()) {
            viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
        } else {
            viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
        }

        String acc = "13375012441";
@@ -250,8 +257,8 @@
                                        } else {
                                            //C端用户跳转界面
                                            startActivity(CPowerStationActivity.class);
                                        }

                                        }
                                        finish();
                                    }


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

@@ -102,6 +102,8 @@
    @Override
    protected void onResume() {
        super.onResume();
        //目的是为启动页遮住下一页
        AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
//        Intent intent = new Intent(_mActivity, MyPowerStationActivity.class);
//        intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
//        intent.putExtra("skip", "skip");//里面判断有这个标识就跳转到消息中心界面

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

@@ -12,10 +12,15 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;

import java.util.List;

/**
 * App启动页（目的是为了让用户点击APP图标的时候有一个瞬间响应的交互体验。）
 */
public class StartActivity extends CustomBaseActivity {

    @Override
@@ -45,9 +50,10 @@
                    } else {
                        //C端用户跳转界面
                        intent.setClass(StartActivity.this, CPowerStationActivity.class);

                    }
                    startActivity(intent);
                    finish();
//                    finish();
                }

                @Override
@@ -62,7 +68,7 @@
                        intent.setClass(StartActivity.this, CPowerStationActivity.class);
                    }
                    startActivity(intent);
                    finish();
//                    finish();
                }
            });


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

@@ -4,6 +4,7 @@

import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
import android.view.View;

import com.hdl.linkpm.sdk.HDLLinkPMSdk;
@@ -12,6 +13,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityLanguageSelectionBinding;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -110,25 +112,57 @@
        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
            @Override
            public void Confirm() {
                UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
                UserConfigManage.getInstance().Save();
                //配置接口请求语言
                HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
                dialog.dismiss();
                showLoading(getString(R.string.restarting_please_wait));
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {
                if (!UserConfigManage.getInstance().isBAccount()) {
                    finish();
                    //因为C端主界面是uni写的，这里语言切换必须报uni关掉再重新启动,否则会收不到uni发过来的数据(接口为null)
                    if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
                        HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
                    }
                            SystemClock.sleep(2000);//进程没有那么快被杀死
                    HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
                }
                        HdlThreadLogic.runMainThread(new Runnable() {
                            @Override
                            public void run() {
                                hideLoading();
                                UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
                                UserConfigManage.getInstance().Save();
                                //配置接口请求语言
                                HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());

                AppManagerUtils.getAppManager().finishAllActivity();
                Intent intent = new Intent();
                intent.setClass(HDLApp.getInstance(), StartActivity.class);
                startActivity(intent);
            }
        });

                    }
                });
//                UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
//                UserConfigManage.getInstance().Save();
//                //配置接口请求语言
//                HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
//                dialog.dismiss();
//                if (!UserConfigManage.getInstance().isBAccount()) {
//                    //因为C端主界面是uni写的，这里语言切换必须报uni关掉再重新启动,否则会收不到uni发过来的数据(接口为null)
//                    if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
//                        HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
//                    }
//                    SystemClock.sleep(2000);
//                    HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
//                }
//                AppManagerUtils.getAppManager().finishAllActivity();
//                Intent intent = new Intent();
//                intent.setClass(HDLApp.getInstance(), StartActivity.class);
//                startActivity(intent);

            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
            @Override
            public void Cancel() {

 app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java

@@ -17,6 +17,7 @@
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -239,12 +240,15 @@
            HdlThreadLogic.toast(mContext, R.string.camera_album_file_save_fial);
        } else {
            if (!TextUtils.isEmpty(outputImagepath.getAbsolutePath())) {
                //(android13,14需要再设置-隐私-)特殊权限设置
                orc_bitmap = BitmapFactory.decodeFile(outputImagepath.getAbsolutePath());//获取图片
                saveBitmap(comp(ImgUpdateDirection(outputImagepath.getAbsolutePath()))); //压缩图片
            } else {
                HdlThreadLogic.toast(mContext, R.string.camera_album_file_get_fial);
            }
        }


    }

    /**
@@ -530,8 +534,6 @@
    public interface CameraAlbumListener {
        void successCallBack(File a);
    }




}

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

@@ -4,6 +4,23 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFFFFFFF"
    tools:context=".ui.CPowerStationActivity">

    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_5"
        android:layout_marginEnd="@dimen/dp_5"
        android:gravity="center"
        android:text="@string/welcome_to_the_smart_energy_app"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_28"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.496"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_bias="0.093" />

</androidx.constraintlayout.widget.ConstraintLayout>

 app/src/main/res/values-en/strings.xml

@@ -244,5 +244,6 @@
    <string name="switch_power_station">Do you want to switch the %s power station?</string>
    <string name="deleting_please_wait">Deleting, please wait…</string>
    <string name="already_the_first_one">It\'s already the first one</string>
    <string name="restarting_please_wait">Restarting, please wait</string>

</resources>

 app/src/main/res/values-zh/strings.xml

@@ -244,6 +244,7 @@
    <string name="switch_power_station">是否要切换%s电站?</string>
    <string name="deleting_please_wait">删除中,请稍等…</string>
    <string name="already_the_first_one">已经是第一个了.</string>
    <string name="restarting_please_wait">重启中,请等待…</string>


</resources>

 app/src/main/res/values/strings.xml

@@ -243,6 +243,7 @@
    <string name="switch_power_station">是否要切换%s电站?</string>
    <string name="deleting_please_wait">删除中,请稍等…</string>
    <string name="already_the_first_one">已经是第一个了.</string>
    <string name="restarting_please_wait">重启中,请等待…</string>


</resources>