~wjc/HDLPhotovoltaicDebugAPP.git

parent: abdc2192 | 补丁 | 提交 | ignore whitespace

2026年01月06日18:24:23 暂隐藏前台服务

wjc

2 天以前 0fd8faf8061369296b4a92b081d83c940dfc233e

2026年01月06日18:24:23 暂隐藏前台服务

2个文件已删除

8个文件已修改

	app/build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/AndroidManifest.xml	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/services/ForeService.java	136 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/services/UniappService.java	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/MyForegroundService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-ar/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-en/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-zh/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/build.gradle

@@ -31,7 +31,7 @@
        applicationId "com.hdl.photovoltaic"
        minSdk 23
        targetSdk 35
        versionCode 29
        versionCode 30
        versionName "2.0.0"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true

 app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />&lt;!&ndash;外部存储目录访问权限 谷歌play上架不了&ndash;&gt; -->
    <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <!-- wifi状态权限 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 前台服务权限 -->

    <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> -->
    <uses-permission android:name="android.permission.INTERNET" /> <!-- 开启网络权限 -->
    <!-- 位置信息 -->
@@ -89,8 +89,9 @@

    <uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> <!-- 适配Android13，弹出通知必须权限 -->
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <!-- 添加 dataSync 前台服务权限 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> &lt;!&ndash; 前台服务权限 &ndash;&gt;-->
<!--    &lt;!&ndash; 添加 dataSync 前台服务权限 &ndash;&gt;-->
<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />-->

    <queries>
        <package android:name="com.hdl.photovoltaic.services" />
@@ -246,14 +247,6 @@
        <service
            android:name="org.eclipse.paho.android.service.MqttService"
            android:exported="false" />
        <service
            android:name=".services.UniappService"
            android:enabled="true"
            android:exported="true">
            <intent-filter>
                <action android:name="UniappService.ACTION" />
            </intent-filter>
        </service> <!-- <service -->
        <!-- android:name=".services.ForeService" -->
        <!-- android:enabled="true" -->
        <!-- android:exported="true" /> -->
@@ -264,11 +257,11 @@
                <action android:name="com.google.firebase.MESSAGING_EVENT" />
            </intent-filter>
        </service>
        <service
            android:name=".uni.MyForegroundService"
            android:enabled="true"
            android:exported="false"
            android:foregroundServiceType="dataSync" /> <!-- Android 10+ 需要指定类型 -->
<!--        <service-->
<!--            android:name=".uni.MyForegroundService"-->
<!--            android:enabled="true"-->
<!--            android:exported="false"-->
<!--            android:foregroundServiceType="dataSync" /> &lt;!&ndash; Android 10+ 需要指定类型 &ndash;&gt;-->


        <meta-data

 app/src/main/java/com/hdl/photovoltaic/services/ForeService.java

File was deleted

 app/src/main/java/com/hdl/photovoltaic/services/UniappService.java

File was deleted

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

@@ -37,20 +37,21 @@
        //设置导航条背景颜色

        Activity activity = (Activity) context;

        activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));

        try {

//            if (!UserConfigManage.getInstance().isBAccount()) {

            if (!ServiceUtils.isServiceRunning(context, MyForegroundService.class)) {

                // 启动前台服务

                Intent serviceIntent = new Intent(context, MyForegroundService.class);

                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

                    context.startForegroundService(serviceIntent);

                } else {

                    context.startService(serviceIntent);

                }

            }

        // 2026年01月06日18:12:25 因上架到谷歌被拒，因上架紧急，暂时先取消前台服务，待修复后再恢复；

//        try {

////            if (!UserConfigManage.getInstance().isBAccount()) {

//            if (!ServiceUtils.isServiceRunning(context, MyForegroundService.class)) {

//                // 启动前台服务

//                Intent serviceIntent = new Intent(context, MyForegroundService.class);

//                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

//                    context.startForegroundService(serviceIntent);

//                } else {

//                    context.startService(serviceIntent);

//                }

//            }

        } catch (Exception e) {

        }

////            }

//        } catch (Exception e) {

//        }

        return splashView;

    }




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

@@ -14,7 +14,6 @@
import com.hdl.photovoltaic.R;



public class MyForegroundService extends Service {
    private static final String CHANNEL_ID = "MyForegroundServiceChannel";
    private static final int NOTIFICATION_ID = 1;
@@ -48,8 +47,8 @@
    public int onStartCommand(Intent intent, int flags, int startId) {
        // 创建通知
        Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
                .setContentTitle("")//宿主进程服务
                .setContentText("")//正在与uni-app保持通信，保持连接中
                .setContentTitle(getString(R.string.maintain_communication))//宿主进程服务
                .setContentText(getString(R.string.remain_connected))//正在与uni-app保持通信，保持连接中
                .setSmallIcon(R.drawable.logo)  // 必须设置一个图标
                .setPriority(NotificationCompat.PRIORITY_LOW)
//                .setOngoing(true)   // 设置通知为持续通知，不可清除

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

@@ -374,4 +374,6 @@
    <string name="re_commissioning_power_station">تم إعادة تشغيل محطة الطاقة الجديدة من طراز APP</string>
    <string name="notification_settings">إعدادات الإشعارات</string>
    <string name="host_process_service_channel">ممر خدمة عملية المضيف</string>
    <string name="remain_connected">ابق على اتصال</string>
    <string name="maintain_communication">ابق على اتصال</string>
</resources>

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

@@ -377,4 +377,6 @@
    <string name="re_commissioning_power_station">The Xenterra app initiates the re-commissioning of the power station</string>
    <string name="notification_settings">Notification settings</string>
    <string name="host_process_service_channel">Host process service channel</string>
    <string name="remain_connected">Remain connected</string>
    <string name="maintain_communication">Maintain communication</string>
</resources>

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

@@ -373,4 +373,6 @@
    <string name="re_commissioning_power_station">新特锐能app发起电站重新调试</string>
    <string name="notification_settings">通知设置</string>
    <string name="host_process_service_channel">宿主进程服务通道</string>
    <string name="remain_connected">保持连接中</string>
    <string name="maintain_communication">保持通信</string>
</resources>

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

@@ -377,4 +377,6 @@
    <string name="re_commissioning_power_station">The Xenterra app initiates the re-commissioning of the power station</string>
    <string name="notification_settings">Notification settings</string>
    <string name="host_process_service_channel">Host process service channel</string>
    <string name="remain_connected">Remain connected</string>
    <string name="maintain_communication">Maintain communication</string>
</resources>

			@@ -31,7 +31,7 @@
			applicationId "com.hdl.photovoltaic"
			minSdk 23
			targetSdk 35
			versionCode 29
			versionCode 30
			versionName "2.0.0"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的
			testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
			multiDexEnabled true

			@@ -15,7 +15,7 @@
			<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /><!–外部存储目录访问权限谷歌play上架不了–> -->
			<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
			<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <!-- wifi状态权限 -->
			<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 前台服务权限 -->

			<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> -->
			<uses-permission android:name="android.permission.INTERNET" /> <!-- 开启网络权限 -->
			<!-- 位置信息 -->
			@@ -89,8 +89,9 @@

			<uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> <!-- 适配Android13，弹出通知必须权限 -->
			<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
			<!-- 添加 dataSync 前台服务权限 -->
			<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
			<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!– 前台服务权限 –>-->
			<!-- <!– 添加 dataSync 前台服务权限 –>-->
			<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />-->

			<queries>
			<package android:name="com.hdl.photovoltaic.services" />
			@@ -246,14 +247,6 @@
			<service
			android:name="org.eclipse.paho.android.service.MqttService"
			android:exported="false" />
			<service
			android:name=".services.UniappService"
			android:enabled="true"
			android:exported="true">
			<intent-filter>
			<action android:name="UniappService.ACTION" />
			</intent-filter>
			</service> <!-- <service -->
			<!-- android:name=".services.ForeService" -->
			<!-- android:enabled="true" -->
			<!-- android:exported="true" /> -->
			@@ -264,11 +257,11 @@
			<action android:name="com.google.firebase.MESSAGING_EVENT" />
			</intent-filter>
			</service>
			<service
			android:name=".uni.MyForegroundService"
			android:enabled="true"
			android:exported="false"
			android:foregroundServiceType="dataSync" /> <!-- Android 10+ 需要指定类型 -->
			<!-- <service-->
			<!-- android:name=".uni.MyForegroundService"-->
			<!-- android:enabled="true"-->
			<!-- android:exported="false"-->
			<!-- android:foregroundServiceType="dataSync" /> <!– Android 10+ 需要指定类型 –>-->


			<meta-data

			@@ -37,20 +37,21 @@
			//设置导航条背景颜色
			Activity activity = (Activity) context;
			activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));
			try {
			// if (!UserConfigManage.getInstance().isBAccount()) {
			if (!ServiceUtils.isServiceRunning(context, MyForegroundService.class)) {
			// 启动前台服务
			Intent serviceIntent = new Intent(context, MyForegroundService.class);
			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
			context.startForegroundService(serviceIntent);
			} else {
			context.startService(serviceIntent);
			}
			}
			// 2026年01月06日18:12:25 因上架到谷歌被拒，因上架紧急，暂时先取消前台服务，待修复后再恢复；
			// try {
			//// if (!UserConfigManage.getInstance().isBAccount()) {
			// if (!ServiceUtils.isServiceRunning(context, MyForegroundService.class)) {
			// // 启动前台服务
			// Intent serviceIntent = new Intent(context, MyForegroundService.class);
			// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
			// context.startForegroundService(serviceIntent);
			// } else {
			// context.startService(serviceIntent);
			// }
			// }
			} catch (Exception e) {
			}
			//// }
			// } catch (Exception e) {
			// }
			return splashView;
			}

			@@ -14,7 +14,6 @@
			import com.hdl.photovoltaic.R;



			public class MyForegroundService extends Service {
			private static final String CHANNEL_ID = "MyForegroundServiceChannel";
			private static final int NOTIFICATION_ID = 1;
			@@ -48,8 +47,8 @@
			public int onStartCommand(Intent intent, int flags, int startId) {
			// 创建通知
			Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
			.setContentTitle("")//宿主进程服务
			.setContentText("")//正在与uni-app保持通信，保持连接中
			.setContentTitle(getString(R.string.maintain_communication))//宿主进程服务
			.setContentText(getString(R.string.remain_connected))//正在与uni-app保持通信，保持连接中
			.setSmallIcon(R.drawable.logo) // 必须设置一个图标
			.setPriority(NotificationCompat.PRIORITY_LOW)
			// .setOngoing(true) // 设置通知为持续通知，不可清除

			@@ -374,4 +374,6 @@
			<string name="re_commissioning_power_station">تم إعادة تشغيل محطة الطاقة الجديدة من طراز APP</string>
			<string name="notification_settings">إعدادات الإشعارات</string>
			<string name="host_process_service_channel">ممر خدمة عملية المضيف</string>
			<string name="remain_connected">ابق على اتصال</string>
			<string name="maintain_communication">ابق على اتصال</string>
			</resources>

			@@ -377,4 +377,6 @@
			<string name="re_commissioning_power_station">The Xenterra app initiates the re-commissioning of the power station</string>
			<string name="notification_settings">Notification settings</string>
			<string name="host_process_service_channel">Host process service channel</string>
			<string name="remain_connected">Remain connected</string>
			<string name="maintain_communication">Maintain communication</string>
			</resources>

			@@ -373,4 +373,6 @@
			<string name="re_commissioning_power_station">新特锐能app发起电站重新调试</string>
			<string name="notification_settings">通知设置</string>
			<string name="host_process_service_channel">宿主进程服务通道</string>
			<string name="remain_connected">保持连接中</string>
			<string name="maintain_communication">保持通信</string>
			</resources>