更新类库,调试应用介绍...
This commit is contained in:
		| @@ -19,17 +19,17 @@ def genVersionName(def versionName){ | ||||
|  | ||||
| android { | ||||
|     compileSdkVersion 32 | ||||
|     buildToolsVersion "33.0.3" | ||||
|     buildToolsVersion "32.0.0" | ||||
|  | ||||
|     defaultConfig { | ||||
|         applicationId "cc.winboll.studio.powerbell" | ||||
|         minSdkVersion 24 | ||||
|         targetSdkVersion 30 | ||||
|         minSdkVersion 26 | ||||
|         targetSdkVersion 29 | ||||
|         versionCode 6 | ||||
|         // versionName 更新后需要手动设置  | ||||
|         // .winboll/winbollBuildProps.properties 文件的 stageCount=0 | ||||
|         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" | ||||
|         versionName "4.0"  | ||||
|         versionName "15.0"  | ||||
|         if(true) { | ||||
|             versionName = genVersionName("${versionName}") | ||||
|         } | ||||
| @@ -44,7 +44,32 @@ android { | ||||
| } | ||||
|  | ||||
| dependencies { | ||||
| 	api 'cc.winboll.studio:winboll-shared:1.8.0' | ||||
|     api fileTree(dir: 'libs', include: ['*.jar']) | ||||
|      | ||||
|     // SSH | ||||
|     api 'com.jcraft:jsch:0.1.55' | ||||
|     // Html 解析 | ||||
|     api 'org.jsoup:jsoup:1.13.1' | ||||
|     // 二维码类库 | ||||
|     api 'com.google.zxing:core:3.4.1' | ||||
|     api 'com.journeyapps:zxing-android-embedded:3.6.0' | ||||
|     // 应用介绍页类库 | ||||
|     api 'io.github.medyo:android-about-page:2.0.0' | ||||
|     // 网络连接类库 | ||||
|     api 'com.squareup.okhttp3:okhttp:4.4.1' | ||||
|     // AndroidX 类库 | ||||
|     api 'androidx.appcompat:appcompat:1.1.0' | ||||
|     api 'com.google.android.material:material:1.4.0' | ||||
|     //api 'androidx.viewpager:viewpager:1.0.0' | ||||
|     //api 'androidx.vectordrawable:vectordrawable:1.1.0' | ||||
|     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' | ||||
|     //api 'androidx.fragment:fragment:1.1.0' | ||||
|      | ||||
|     api 'cc.winboll.studio:libappbase:15.0.9' | ||||
|     api 'cc.winboll.studio:libapputils:15.0.15' | ||||
|     api 'cc.winboll.studio:libaes:15.0.5' | ||||
|  | ||||
| 	/*api 'cc.winboll.studio:winboll-shared:1.8.0' | ||||
|     api 'io.github.medyo:android-about-page:2.0.0' | ||||
|     api 'com.github.getActivity:ToastUtils:10.5' | ||||
|     api 'com.jcraft:jsch:0.1.55' | ||||
| @@ -62,6 +87,5 @@ dependencies { | ||||
|     api 'com.squareup.okhttp3:okhttp:4.4.1' | ||||
|      | ||||
|     api 'cc.winboll.studio:libaes:7.6.0' | ||||
|      | ||||
|     api fileTree(dir: 'libs', include: ['*.jar']) | ||||
|     */ | ||||
| } | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| #Created by .winboll/winboll_app_build.gradle | ||||
| #Sat Mar 22 16:06:33 HKT 2025 | ||||
| stageCount=8 | ||||
| #Mon Mar 24 12:22:12 GMT 2025 | ||||
| stageCount=0 | ||||
| libraryProject= | ||||
| baseVersion=4.0 | ||||
| publishVersion=4.0.7 | ||||
| buildCount=0 | ||||
| baseBetaVersion=4.0.8 | ||||
| baseVersion=15.0 | ||||
| publishVersion=15.0.0 | ||||
| buildCount=9 | ||||
| baseBetaVersion=15.0.1 | ||||
|   | ||||
| @@ -39,7 +39,7 @@ | ||||
|     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/> | ||||
|  | ||||
|     <application | ||||
|         android:name=".GlobalApplication" | ||||
|         android:name=".App" | ||||
|         android:allowBackup="true" | ||||
|         android:icon="@drawable/ic_launcher" | ||||
|         android:label="@string/app_name" | ||||
| @@ -127,10 +127,8 @@ | ||||
|             android:name="android.max_aspect" | ||||
|             android:value="4.0"/> | ||||
|  | ||||
|         <activity android:name="cc.winboll.studio.powerbell.activities.AboutActivity"/> | ||||
|  | ||||
|         <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReporterActivity"/> | ||||
|  | ||||
|     </application> | ||||
|  | ||||
| </manifest> | ||||
| </manifest> | ||||
|   | ||||
| @@ -1,15 +1,13 @@ | ||||
| package cc.winboll.studio.powerbell; | ||||
| 
 | ||||
| import android.content.Context; | ||||
| import android.view.Gravity; | ||||
| import cc.winboll.studio.libappbase.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.utils.ToastUtils; | ||||
| import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver; | ||||
| import cc.winboll.studio.powerbell.utils.AppCacheUtils; | ||||
| import cc.winboll.studio.powerbell.utils.AppConfigUtils; | ||||
| import cc.winboll.studio.shared.app.WinBollApplication; | ||||
| import com.hjq.toast.ToastUtils; | ||||
| import com.hjq.toast.style.WhiteToastStyle; | ||||
| 
 | ||||
| public class GlobalApplication extends WinBollApplication { | ||||
| public class App extends GlobalApplication { | ||||
| 
 | ||||
|     public static final String TAG = "GlobalApplication"; | ||||
| 
 | ||||
| @@ -23,11 +21,11 @@ public class GlobalApplication extends WinBollApplication { | ||||
|         super.onCreate(); | ||||
|          | ||||
|         // 初始化 Toast 框架 | ||||
|         ToastUtils.init(this); | ||||
|         //ToastUtils.init(this); | ||||
|         // 设置 Toast 布局样式 | ||||
|         //ToastUtils.setView(R.layout.toast_custom_view); | ||||
|         ToastUtils.setStyle(new WhiteToastStyle()); | ||||
|         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); | ||||
|         //ToastUtils.setStyle(new WhiteToastStyle()); | ||||
|         //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); | ||||
| 
 | ||||
|         // 设置数据配置存储工具 | ||||
|         _mAppConfigUtils = getAppConfigUtils(this); | ||||
| @@ -12,14 +12,15 @@ import android.view.Menu; | ||||
| import android.view.MenuItem; | ||||
| import android.widget.Toast; | ||||
| import cc.winboll.studio.libaes.views.AToolbar; | ||||
| import cc.winboll.studio.libaes.winboll.APPInfo; | ||||
| import cc.winboll.studio.libaes.winboll.AboutActivityFactory; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.libappbase.LogView; | ||||
| import cc.winboll.studio.powerbell.MainActivity; | ||||
| import cc.winboll.studio.powerbell.activities.AboutActivity; | ||||
| import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity; | ||||
| import cc.winboll.studio.powerbell.activities.BatteryReporterActivity; | ||||
| import cc.winboll.studio.powerbell.activities.ClearRecordActivity; | ||||
| import cc.winboll.studio.powerbell.fragments.MainViewFragment; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import cc.winboll.studio.shared.log.LogView; | ||||
|  | ||||
| public class MainActivity extends Activity { | ||||
|     public static final String TAG = "MainActivity"; | ||||
| @@ -28,7 +29,7 @@ public class MainActivity extends Activity { | ||||
|     public static MainActivity _mMainActivity; | ||||
|     LogView mLogView; | ||||
|     //ArrayList<Fragment> mlistFragment; | ||||
|     GlobalApplication mApplication; | ||||
|     App mApplication; | ||||
|     //AppConfigUtils mAppConfigUtils; | ||||
|     Menu mMenu; | ||||
|     Fragment mCurrentShowFragment; | ||||
| @@ -48,7 +49,7 @@ public class MainActivity extends Activity { | ||||
|         mLogView.updateLogView(); | ||||
|  | ||||
|         _mMainActivity = MainActivity.this; | ||||
|         mApplication = (GlobalApplication) getApplication(); | ||||
|         mApplication = (App) getApplication(); | ||||
|         //mAppConfigUtils = AppConfigUtils.getInstance(mApplication); | ||||
|  | ||||
|         // 初始化工具栏 | ||||
| @@ -142,9 +143,10 @@ public class MainActivity extends Activity { | ||||
|         super.onOptionsItemSelected(item);  | ||||
|         int menuItemId = item.getItemId(); | ||||
|         if (menuItemId == R.id.action_about) { | ||||
|             Intent intent = new Intent(); | ||||
|             intent.setClass(this, AboutActivity.class); | ||||
|             startActivity(intent); | ||||
|             onAbout(); | ||||
| //            Intent intent = new Intent(); | ||||
| //            intent.setClass(this, AboutActivity.class); | ||||
| //            startActivity(intent); | ||||
|         } else if (menuItemId == R.id.action_battery_reporter) { | ||||
|             Intent intent = new Intent(); | ||||
|             intent.setClass(this, BatteryReporterActivity.class); | ||||
| @@ -193,4 +195,22 @@ public class MainActivity extends Activity { | ||||
|             moveTaskToBack(true); | ||||
|         } | ||||
|     } | ||||
|      | ||||
|     public void onAbout() { | ||||
|         String szBranchName = "powerbell"; | ||||
|  | ||||
|         APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); | ||||
|         appInfo.setAppName("PowerBell"); | ||||
|         appInfo.setAppIcon(R.drawable.ic_launcher); | ||||
|         appInfo.setAppDescription("PowerBell Description"); | ||||
|         appInfo.setAppGitName("APP"); | ||||
|         appInfo.setAppGitOwner("Studio"); | ||||
|         appInfo.setAppGitAPPBranch(szBranchName); | ||||
|         appInfo.setAppGitAPPSubProjectFolder(szBranchName); | ||||
|         appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=PowerBell"); | ||||
|         appInfo.setAppAPKName("PowerBell"); | ||||
|         appInfo.setAppAPKFolderName("PowerBell"); | ||||
|         AboutActivityFactory.showAboutActivity(this, appInfo); | ||||
|         //ToastUtils.show("onAbout"); | ||||
|     } | ||||
| }  | ||||
|   | ||||
| @@ -1,42 +0,0 @@ | ||||
| package cc.winboll.studio.powerbell.activities; | ||||
|  | ||||
| /** | ||||
|  * @Author ZhanGSKen@QQ.COM | ||||
|  * @Date 2024/07/12 13:33:59 | ||||
|  * @Describe AboutActivity | ||||
|  */ | ||||
| import android.app.Activity; | ||||
| import android.os.Bundle; | ||||
| import android.view.View; | ||||
| import cc.winboll.studio.libaes.views.AToolbar; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
|  | ||||
| public class AboutActivity extends Activity { | ||||
|  | ||||
|     public static final String TAG = "AboutActivity"; | ||||
|  | ||||
|     AToolbar mAToolbar; | ||||
|  | ||||
|     @Override | ||||
|     protected void onCreate(Bundle savedInstanceState) { | ||||
|         super.onCreate(savedInstanceState); | ||||
|         setContentView(R.layout.activity_about); | ||||
|  | ||||
|         // 初始化工具栏 | ||||
|         mAToolbar = (AToolbar) findViewById(R.id.toolbar); | ||||
|         setActionBar(mAToolbar); | ||||
|         //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture)); | ||||
|         mAToolbar.setSubtitle(R.string.subtitle_activity_about); | ||||
|         mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText); | ||||
|         mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText); | ||||
|         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary)); | ||||
|         setActionBar(mAToolbar); | ||||
|         getActionBar().setDisplayHomeAsUpEnabled(true); | ||||
|         mAToolbar.setNavigationOnClickListener(new View.OnClickListener() { | ||||
|                 @Override | ||||
|                 public void onClick(View v) { | ||||
|                     finish(); | ||||
|                 } | ||||
|             }); | ||||
|     } | ||||
| } | ||||
| @@ -13,6 +13,8 @@ import android.view.View; | ||||
| import android.widget.ImageView; | ||||
| import android.widget.Toast; | ||||
| import cc.winboll.studio.libaes.views.AToolbar; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.libappbase.utils.ToastUtils; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
| import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity; | ||||
| import cc.winboll.studio.powerbell.beans.BackgroundPictureBean; | ||||
| @@ -20,8 +22,6 @@ import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog; | ||||
| import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils; | ||||
| import cc.winboll.studio.powerbell.utils.FileUtils; | ||||
| import cc.winboll.studio.powerbell.utils.UriUtil; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import com.hjq.toast.ToastUtils; | ||||
| import java.io.BufferedOutputStream; | ||||
| import java.io.File; | ||||
| import java.io.FileOutputStream; | ||||
|   | ||||
| @@ -7,14 +7,14 @@ import android.view.View; | ||||
| import android.widget.TextView; | ||||
| import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; | ||||
| import cc.winboll.studio.libaes.views.AToolbar; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.libappbase.utils.ToastUtils; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
| import cc.winboll.studio.powerbell.beans.BatteryInfoBean; | ||||
| import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver; | ||||
| import cc.winboll.studio.powerbell.utils.AppCacheUtils; | ||||
| import cc.winboll.studio.powerbell.utils.StringUtils; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import com.hjq.toast.ToastUtils; | ||||
| import java.util.ArrayList; | ||||
|  | ||||
| public class ClearRecordActivity extends Activity { | ||||
| @@ -23,13 +23,13 @@ public class ClearRecordActivity extends Activity { | ||||
|  | ||||
|     AToolbar mAToolbar; | ||||
|     TextView mtvRecordText; | ||||
|     GlobalApplication mApplication; | ||||
|     App mApplication; | ||||
|  | ||||
|     @Override | ||||
|     protected void onCreate(Bundle savedInstanceState) { | ||||
|         super.onCreate(savedInstanceState); | ||||
|         setContentView(R.layout.activity_clearrecord); | ||||
|         mApplication = (GlobalApplication) getApplication(); | ||||
|         mApplication = (App) getApplication(); | ||||
|  | ||||
|         // 初始化工具栏 | ||||
|         mAToolbar = (AToolbar) findViewById(R.id.toolbar); | ||||
|   | ||||
| @@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans; | ||||
|  */ | ||||
| import android.util.JsonReader; | ||||
| import android.util.JsonWriter; | ||||
| import cc.winboll.studio.shared.app.BaseBean; | ||||
| import cc.winboll.studio.libappbase.BaseBean; | ||||
| import java.io.IOException; | ||||
| import java.io.Serializable; | ||||
|  | ||||
|   | ||||
| @@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans; | ||||
|  */ | ||||
| import android.util.JsonReader; | ||||
| import android.util.JsonWriter; | ||||
| import cc.winboll.studio.shared.app.BaseBean; | ||||
| import cc.winboll.studio.libappbase.BaseBean; | ||||
| import java.io.IOException; | ||||
|  | ||||
| public class BackgroundPictureBean extends BaseBean { | ||||
|   | ||||
| @@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.beans; | ||||
|  | ||||
| import android.util.JsonReader; | ||||
| import android.util.JsonWriter; | ||||
| import cc.winboll.studio.shared.app.BaseBean; | ||||
| import cc.winboll.studio.libappbase.BaseBean; | ||||
| import java.io.IOException; | ||||
| import java.io.Serializable; | ||||
|  | ||||
|   | ||||
| @@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans; | ||||
|  */ | ||||
| import android.util.JsonReader; | ||||
| import android.util.JsonWriter; | ||||
| import cc.winboll.studio.shared.app.BaseBean; | ||||
| import cc.winboll.studio.libappbase.BaseBean; | ||||
| import java.io.IOException; | ||||
|  | ||||
| public class ControlCenterServiceBean extends BaseBean { | ||||
|   | ||||
| @@ -1,5 +1,4 @@ | ||||
| package cc.winboll.studio.powerbell.dialogs; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
| import android.app.Dialog; | ||||
| import android.content.Context; | ||||
| import android.content.Intent; | ||||
| @@ -10,12 +9,13 @@ import android.view.View; | ||||
| import android.widget.Button; | ||||
| import android.widget.ImageView; | ||||
| import android.widget.Toast; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.MainActivity; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
| import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity; | ||||
| import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils; | ||||
| import cc.winboll.studio.powerbell.utils.FileUtils; | ||||
| import cc.winboll.studio.powerbell.utils.UriUtil; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import java.io.File; | ||||
| import java.io.IOException; | ||||
|  | ||||
|   | ||||
| @@ -17,7 +17,8 @@ import android.widget.LinearLayout; | ||||
| import android.widget.SeekBar; | ||||
| import android.widget.Switch; | ||||
| import android.widget.TextView; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
| import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity; | ||||
| import cc.winboll.studio.powerbell.beans.BackgroundPictureBean; | ||||
| @@ -27,7 +28,6 @@ import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils; | ||||
| import cc.winboll.studio.powerbell.utils.ServiceUtils; | ||||
| import cc.winboll.studio.powerbell.views.BatteryDrawable; | ||||
| import cc.winboll.studio.powerbell.views.VerticalSeekBar; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import java.io.File; | ||||
|  | ||||
| public class MainViewFragment extends Fragment { | ||||
| @@ -78,7 +78,7 @@ public class MainViewFragment extends Fragment { | ||||
|     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | ||||
|         mView = inflater.inflate(R.layout.fragment_mainview, container, false); | ||||
|         _mMainViewFragment = MainViewFragment.this; | ||||
|         mAppConfigUtils = GlobalApplication.getAppConfigUtils(getActivity()); | ||||
|         mAppConfigUtils = App.getAppConfigUtils(getActivity()); | ||||
|          | ||||
|         // 获取指定ID的View实例 | ||||
|         final View mainImageView = mView.findViewById(R.id.fragmentmainviewImageView1); | ||||
|   | ||||
| @@ -4,15 +4,12 @@ import android.content.BroadcastReceiver; | ||||
| import android.content.Context; | ||||
| import android.content.Intent; | ||||
| import android.content.IntentFilter; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.beans.AppConfigBean; | ||||
| import cc.winboll.studio.powerbell.beans.BatteryData; | ||||
| import cc.winboll.studio.powerbell.services.ControlCenterService; | ||||
| import cc.winboll.studio.powerbell.utils.AppConfigUtils; | ||||
| import cc.winboll.studio.powerbell.utils.BatteryUtils; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import java.lang.ref.WeakReference; | ||||
| import java.util.ArrayList; | ||||
| import java.util.List; | ||||
|  | ||||
| public class ControlCenterServiceReceiver extends BroadcastReceiver { | ||||
|     public static final String TAG = ControlCenterServiceReceiver.class.getSimpleName(); | ||||
|   | ||||
| @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; | ||||
| import android.content.Context; | ||||
| import android.content.Intent; | ||||
| import android.content.IntentFilter; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.fragments.MainViewFragment; | ||||
| import cc.winboll.studio.powerbell.utils.AppConfigUtils; | ||||
| import cc.winboll.studio.powerbell.utils.BatteryUtils; | ||||
| @@ -15,7 +15,7 @@ public class GlobalApplicationReceiver extends BroadcastReceiver { | ||||
|     public static final String TAG = "GlobalApplicationReceiver"; | ||||
|  | ||||
|     AppConfigUtils mAppConfigUtils; | ||||
|     GlobalApplication mGlobalApplication; | ||||
|     App mGlobalApplication; | ||||
|     // 存储电量指示值, | ||||
|     // 用于校验电量消息时的电量变化 | ||||
|     static volatile int _mnTheQuantityOfElectricityOld = -1; | ||||
| @@ -24,10 +24,10 @@ public class GlobalApplicationReceiver extends BroadcastReceiver { | ||||
|     // 便利封装 registerAction() 函数 | ||||
|     GlobalApplicationReceiver mReceiver; | ||||
|  | ||||
|     public GlobalApplicationReceiver(GlobalApplication globalApplication) { | ||||
|     public GlobalApplicationReceiver(App globalApplication) { | ||||
|         mReceiver = this; | ||||
|         mGlobalApplication = globalApplication; | ||||
|         mAppConfigUtils = GlobalApplication.getAppConfigUtils(mGlobalApplication); | ||||
|         mAppConfigUtils = App.getAppConfigUtils(mGlobalApplication); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
| @@ -47,7 +47,7 @@ public class GlobalApplicationReceiver extends BroadcastReceiver { | ||||
|                 // 电池状态改变先取消旧的提醒消息 | ||||
|                 //NotificationHelper.cancelRemindNotification(context); | ||||
|                  | ||||
|                 GlobalApplication.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity); | ||||
|                 App.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity); | ||||
|                 MainViewFragment.sendMsgCurrentValueBattery(nTheQuantityOfElectricity); | ||||
|                 // 保存好新的电池状态标志 | ||||
|                 _mIsCharging = isCharging; | ||||
|   | ||||
| @@ -9,10 +9,10 @@ import android.content.BroadcastReceiver; | ||||
| import android.content.Context; | ||||
| import android.content.Intent; | ||||
| import android.os.Build; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.services.ControlCenterService; | ||||
| import cc.winboll.studio.powerbell.utils.ServiceUtils; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
|  | ||||
| public class MainReceiver extends BroadcastReceiver { | ||||
|  | ||||
| @@ -27,7 +27,7 @@ public class MainReceiver extends BroadcastReceiver { | ||||
|     public void onReceive(Context context, Intent intent) { | ||||
|         String szAction = intent.getAction(); | ||||
|         if (szAction.equals(ACTION_BOOT_COMPLETED)) { | ||||
|             boolean isEnableService = GlobalApplication.getAppConfigUtils(context).getIsEnableService(); | ||||
|             boolean isEnableService = App.getAppConfigUtils(context).getIsEnableService(); | ||||
|             if (isEnableService) { | ||||
|                 if (ServiceUtils.isServiceAlive(context.getApplicationContext(), ControlCenterService.class.getName()) == false) { | ||||
|                     LogUtils.d(TAG, "wakeupAndBindMain() Wakeup... ControlCenterService"); | ||||
|   | ||||
| @@ -6,7 +6,7 @@ import android.content.Context; | ||||
| import android.content.Intent; | ||||
| import android.content.ServiceConnection; | ||||
| import android.os.IBinder; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.services.ControlCenterService; | ||||
| import cc.winboll.studio.powerbell.utils.AppConfigUtils; | ||||
| import cc.winboll.studio.powerbell.utils.ServiceUtils; | ||||
| @@ -29,7 +29,7 @@ public class AssistantService extends Service { | ||||
|     public void onCreate() { | ||||
|         //LogUtils.d(TAG, "onCreate"); | ||||
|         super.onCreate(); | ||||
|         mAppConfigUtils = GlobalApplication.getAppConfigUtils(this); | ||||
|         mAppConfigUtils = App.getAppConfigUtils(this); | ||||
|  | ||||
|         //mMyBinder = new MyBinder(); | ||||
|         if (mMyServiceConnection == null) { | ||||
|   | ||||
| @@ -16,7 +16,9 @@ import android.content.Intent; | ||||
| import android.content.ServiceConnection; | ||||
| import android.os.IBinder; | ||||
| import android.widget.RemoteViews; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.libappbase.utils.ToastUtils; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.MainActivity; | ||||
| import cc.winboll.studio.powerbell.R; | ||||
| import cc.winboll.studio.powerbell.beans.AppConfigBean; | ||||
| @@ -30,9 +32,6 @@ import cc.winboll.studio.powerbell.utils.AppConfigUtils; | ||||
| import cc.winboll.studio.powerbell.utils.NotificationHelper; | ||||
| import cc.winboll.studio.powerbell.utils.ServiceUtils; | ||||
| import cc.winboll.studio.powerbell.utils.StringUtils; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import com.hjq.toast.ToastUtils; | ||||
| import android.graphics.Color; | ||||
|  | ||||
| public class ControlCenterService extends Service { | ||||
|  | ||||
| @@ -69,8 +68,8 @@ public class ControlCenterService extends Service { | ||||
|         super.onCreate(); | ||||
|         _mControlCenterService = ControlCenterService.this; | ||||
|         isServiceRunning = false; | ||||
|         mAppConfigUtils = GlobalApplication.getAppConfigUtils(this); | ||||
|         mAppCacheUtils = GlobalApplication.getAppCacheUtils(this); | ||||
|         mAppConfigUtils = App.getAppConfigUtils(this); | ||||
|         mAppCacheUtils = App.getAppCacheUtils(this); | ||||
|         mNotificationHelper = new NotificationHelper(ControlCenterService.this); | ||||
|          | ||||
|          | ||||
| @@ -131,7 +130,7 @@ public class ControlCenterService extends Service { | ||||
|     } | ||||
|  | ||||
|     NotificationMessage createNotificationMessage() { | ||||
|         String szTitle = ((GlobalApplication)getApplication()).getString(R.string.app_name); | ||||
|         String szTitle = ((App)getApplication()).getString(R.string.app_name); | ||||
|         String szContent = getValuesString() + " {?} " + StringUtils.formatPCMListString(mAppCacheUtils.getArrayListBatteryInfo()); | ||||
|         return new NotificationMessage(szTitle, szContent); | ||||
|     } | ||||
|   | ||||
| @@ -2,8 +2,8 @@ package cc.winboll.studio.powerbell.threads; | ||||
|  | ||||
| import android.content.Context; | ||||
| import android.os.Message; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import java.lang.ref.WeakReference; | ||||
|  | ||||
| public class RemindThread extends Thread { | ||||
|   | ||||
| @@ -1,8 +1,8 @@ | ||||
| package cc.winboll.studio.powerbell.utils; | ||||
|  | ||||
| import android.content.Context; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.beans.BatteryInfoBean; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import java.util.ArrayList; | ||||
|  | ||||
| public class AppCacheUtils { | ||||
|   | ||||
| @@ -2,14 +2,14 @@ package cc.winboll.studio.powerbell.utils; | ||||
|  | ||||
| import android.app.Activity; | ||||
| import android.content.Context; | ||||
| import cc.winboll.studio.powerbell.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.powerbell.App; | ||||
| import cc.winboll.studio.powerbell.MainActivity; | ||||
| import cc.winboll.studio.powerbell.beans.AppConfigBean; | ||||
| import cc.winboll.studio.powerbell.beans.ControlCenterServiceBean; | ||||
| import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog; | ||||
| import cc.winboll.studio.powerbell.fragments.MainViewFragment; | ||||
| import cc.winboll.studio.powerbell.services.ControlCenterService; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import java.io.File; | ||||
|  | ||||
| // 应用配置工具类 | ||||
| @@ -42,7 +42,7 @@ public class AppConfigUtils { | ||||
|     volatile String mszBackgroundFileName = ""; | ||||
|  | ||||
|     // 保存应用实例 | ||||
|     GlobalApplication mApplication; | ||||
|     App mApplication; | ||||
|  | ||||
|     AppConfigUtils(Context context) { | ||||
|         mContext = context; | ||||
|   | ||||
| @@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.utils; | ||||
| import android.graphics.Bitmap; | ||||
| import android.graphics.BitmapFactory; | ||||
| import android.graphics.drawable.BitmapDrawable; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import java.io.BufferedInputStream; | ||||
| import java.io.ByteArrayOutputStream; | ||||
| import java.io.File; | ||||
|   | ||||
| @@ -3,7 +3,7 @@ package cc.winboll.studio.powerbell.utils; | ||||
| import android.content.Context; | ||||
| import android.graphics.Bitmap; | ||||
| import android.graphics.BitmapFactory; | ||||
| import cc.winboll.studio.shared.log.LogUtils; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import java.io.File; | ||||
| import java.io.FileNotFoundException; | ||||
| import java.io.FileOutputStream; | ||||
|   | ||||
| @@ -1,25 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout | ||||
| 	xmlns:android="http://schemas.android.com/apk/res/android" | ||||
| 	xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
| 	android:orientation="vertical" | ||||
| 	android:layout_width="match_parent" | ||||
| 	android:layout_height="match_parent"> | ||||
|  | ||||
| 	<cc.winboll.studio.libaes.views.AToolbar | ||||
| 		android:layout_width="match_parent" | ||||
| 		android:layout_height="@dimen/toolbar_height" | ||||
| 		android:id="@+id/toolbar" | ||||
| 		style="@style/DefaultAToolbar"/> | ||||
|  | ||||
|     <cc.winboll.studio.shared.view.AboutView | ||||
|         app:appname="PowerBell" | ||||
|         app:appprojectname="PowerBell" | ||||
|         app:appdescription="@string/app_description" | ||||
|         app:appicon="@drawable/ic_launcher" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:id="@+id/activityaboutAboutView1"/> | ||||
|  | ||||
| </LinearLayout> | ||||
|  | ||||
| @@ -33,10 +33,10 @@ | ||||
|  | ||||
| 	</LinearLayout> | ||||
|  | ||||
| 	<cc.winboll.studio.shared.log.LogView | ||||
| 	<cc.winboll.studio.libappbase.LogView | ||||
| 		android:orientation="horizontal" | ||||
| 		android:layout_width="match_parent" | ||||
| 		android:layout_height="100dp" | ||||
| 		android:layout_height="200dp" | ||||
| 		android:id="@+id/logview"/> | ||||
|  | ||||
| </LinearLayout> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 ZhanGSKen
					ZhanGSKen