更新类库

positions/build.gradle

@@ -57,20 +57,20 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // 定位服务
-    implementation 'com.google.android.gms:play-services-location:20.0.0'
+    api 'com.google.android.gms:play-services-location:20.0.0'
     // 腾讯地图
-    implementation 'com.tencent.map:tencent-map-vector-sdk:6.2.1.250120.3f971009.140342819'
+    api 'com.tencent.map:tencent-map-vector-sdk:6.2.1.250120.3f971009.140342819'
     // 腾讯地图基础库
-    implementation 'com.tencent.openmap:foundation:0.5.6.9be4e02'
+    api 'com.tencent.openmap:foundation:0.5.6.9be4e02'
-    implementation 'com.tencent.map:sdk-utilities:1.0.9'
+    api 'com.tencent.map:sdk-utilities:1.0.9'
-    implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.5.4.3'
+    api 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.5.4.3'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    api 'com.google.code.gson:gson:2.8.5'
     // 权限申请框架
     //implementation 'pub.devrel:easypermissions:2.0.1'
     // 权限申请框架：https://github.com/getActivity/XXPermissions
     //implementation 'com.github.getActivity:XXPermissions:18.63'
     // 下拉控件
-    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
     // 拼音搜索
     // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
     //implementation 'com.github.open-android:pinyin4j:2.5.0'
@@ -79,23 +79,32 @@ dependencies {
     // Html 解析
     //implementation 'org.jsoup:jsoup:1.13.1'
     // 二维码类库
-    implementation 'com.google.zxing:core:3.4.1'
+    api 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
     // 应用介绍页类库
     //implementation 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
     //implementation 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
     
     // AndroidX 类库
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
+    api 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    //api 'androidx.fragment:fragment:1.1.0'
     
-    implementation 'cc.winboll.studio:libappbase:15.0.5'
+    api 'cc.winboll.studio:libaes:15.2.4'
-    implementation 'cc.winboll.studio:libapputils:15.0.7'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
+    
+    /*api 'androidx.appcompat:appcompat:1.1.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 'com.google.android.material:material:1.3.0'
+    */
 }

positions/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 22 12:44:20 GMT 2025
+#Tue Apr 01 13:15:38 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=369
+buildCount=370
 baseBetaVersion=1.0.1

positions/src/main/java/cc/winboll/studio/positions/App.java

@@ -8,6 +8,7 @@ package cc.winboll.studio.positions;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import java.io.File;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
 public class App extends GlobalApplication {
 
@@ -18,10 +19,9 @@ public class App extends GlobalApplication {
     public void onCreate() {
         // 必须在调用基类前设置应用调试标志，
         // 这样可以预先设置日志与数据的存储根目录。
-        setIsDebuging(this, BuildConfig.DEBUG);
         super.onCreate();
         // 设置 WinBoll 应用 UI 类型
-        //WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
 
         LogUtils.d(TAG, "onCreate");
         if (BuildConfig.DEBUG) {

positions/src/main/java/cc/winboll/studio/positions/MainActivity.java

@@ -14,34 +14,28 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
+import android.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.viewpager.widget.ViewPager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
 import cc.winboll.studio.positions.R;
+import cc.winboll.studio.positions.activities.AbsActivity;
 import cc.winboll.studio.positions.activities.JointPositioningActivity;
 import cc.winboll.studio.positions.activities.SettingsActivity;
-import cc.winboll.studio.positions.models.MainServiceBean;
 import cc.winboll.studio.positions.fragments.LogFragment;
 import cc.winboll.studio.positions.fragments.PositionsFragment;
 import cc.winboll.studio.positions.fragments.TXMSFragment;
 import cc.winboll.studio.positions.fragments.TasksFragment;
+import cc.winboll.studio.positions.models.MainServiceBean;
 import com.google.android.material.tabs.TabLayout;
-//import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;
-import cc.winboll.studio.positions.activities.AbsActivity;
-import android.widget.Toolbar;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import androidx.fragment.app.FragmentStatePagerAdapter;
 
 final public class MainActivity extends AbsActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
@@ -51,11 +45,11 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
     public static final int REQUEST_ABOUT_ACTIVITY = 1;
 
     public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
-    
+
     // 创建Fragment列表和标题列表
     List<Fragment> fragmentList = new ArrayList<>();
     List<String> tabTitleList = new ArrayList<>();
-    
+
     TXMSFragment mTXMSFragment;
     PositionsFragment mPositionsFragment;
     TasksFragment mTasksFragment;
@@ -76,26 +70,6 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
 
     private static final int DIALER_REQUEST_CODE = 1;
 
-
-    @Override
-    public APPInfo getAppInfo() {
-//        String szBranchName = "positions";
-//
-//        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
-//        appInfo.setAppName("Positions");
-//        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-//        appInfo.setAppDescription("Positions Description");
-//        appInfo.setAppGitName("APP");
-//        appInfo.setAppGitOwner("Studio");
-//        appInfo.setAppGitAPPBranch(szBranchName);
-//        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-//        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Positions");
-//        appInfo.setAppAPKName("Positions");
-//        appInfo.setAppAPKFolderName("Positions");
-//        return appInfo;
-        return null;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
@@ -128,17 +102,17 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
         mPositionsFragment = new PositionsFragment();
         fragmentList.add(mPositionsFragment);
         tabTitleList.add("位置");
-        
+
         mTasksFragment = new TasksFragment();
         fragmentList.add(mTasksFragment);
         tabTitleList.add("任务");
-        
+
-        
+
         mLogFragment = new LogFragment();
         fragmentList.add(mLogFragment);
         tabTitleList.add("日志");
-        
+
-        
+
 
         // 设置ViewPager的适配器
         MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager());
@@ -174,7 +148,7 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
             return tabTitleList.get(position);
         }
     }
-    
+
     //初始化view，即显示的图片
 //    void initViewPager() {
 //        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
@@ -272,19 +246,8 @@ final public class MainActivity extends AbsActivity implements IWinBollActivity,
     }
 
     @Override
-    public Toolbar initToolBar() {
+    public Activity getActivity() {
-        return null;
+        return this;
-        //return findViewById(R.id.toolbar);
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
     }
 
     @Override

positions/src/main/java/cc/winboll/studio/positions/activities/SettingsActivity.java

@@ -4,6 +4,7 @@ package cc.winboll.studio.positions.activities;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/21 05:37:42
  */
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,14 +15,13 @@ import android.provider.Settings;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Toast;
+import android.widget.Toolbar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.positions.R;
 import java.lang.reflect.Field;
-import android.widget.Toolbar;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
 
 public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
 
@@ -29,32 +29,16 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
 
     Toolbar mToolbar;
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    
     @Override
     public String getTag() {
         return TAG;
     }
 
     @Override
-    public Toolbar initToolBar() {
+    public Activity getActivity() {
-        return findViewById(R.id.activitymainToolbar1);
+        return null;
     }
 
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -63,12 +47,10 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         // 初始化工具栏
         mToolbar = findViewById(R.id.activitymainToolbar1);
         setActionBar(mToolbar);
-        if (isEnableDisplayHomeAsUp()) {
+        // 显示后退按钮
-            // 显示后退按钮
+        getActionBar().setDisplayHomeAsUpEnabled(true);
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
         getActionBar().setSubtitle(getTag());
-        
+
     }
 
     public void onDefaultPhone(View view) {