20250319_0127
This commit is contained in:
		| @@ -36,10 +36,6 @@ dependencies { | ||||
|     // 二维码类库 | ||||
|     implementation 'com.google.zxing:core:3.4.1' | ||||
|     implementation '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' | ||||
|      | ||||
| @@ -49,8 +45,8 @@ dependencies { | ||||
|     implementation 'androidx.vectordrawable:vectordrawable:1.1.0' | ||||
|     implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' | ||||
|     implementation 'androidx.fragment:fragment:1.1.0' | ||||
|     implementation 'com.google.android.material:material:1.4.0' | ||||
|     implementation 'com.google.android.material:material:1.0.0' | ||||
|      | ||||
|     implementation 'cc.winboll.studio:libappbase:2.1.5' | ||||
|     implementation 'cc.winboll.studio:libapputils:9.4.4' | ||||
|     implementation 'cc.winboll.studio:libappbase:15.0.5' | ||||
|     implementation 'cc.winboll.studio:libapputils:15.0.6' | ||||
| } | ||||
|   | ||||
| @@ -16,7 +16,6 @@ import android.view.View; | ||||
| import android.widget.AdapterView; | ||||
| import androidx.appcompat.app.ActionBarDrawerToggle; | ||||
| import androidx.appcompat.app.AppCompatActivity; | ||||
| import androidx.appcompat.widget.Toolbar; | ||||
| import androidx.drawerlayout.widget.DrawerLayout; | ||||
| import androidx.fragment.app.Fragment; | ||||
| import androidx.fragment.app.FragmentManager; | ||||
| @@ -195,7 +194,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement | ||||
|         setContentView(R.layout.activity_drawerfragment); | ||||
|  | ||||
|         mToolbar = findViewById(R.id.activitydrawerfragmentASupportToolbar1); | ||||
|         setSupportActionBar(mToolbar); | ||||
|         setActionBar(mToolbar); | ||||
|  | ||||
|         if (mActivityType == ActivityType.Main) { | ||||
|             initMainRootView(); | ||||
|   | ||||
| @@ -8,7 +8,7 @@ import cc.winboll.studio.libaes.R; | ||||
| import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; | ||||
| import cc.winboll.studio.libapputils.bean.APPInfo; | ||||
| import androidx.appcompat.app.AppCompatActivity; | ||||
| import androidx.appcompat.widget.Toolbar; | ||||
| import android.widget.Toolbar; | ||||
|  | ||||
| /** | ||||
|  * @Author ZhanGSKen@QQ.COM | ||||
|   | ||||
| @@ -9,11 +9,11 @@ import android.os.Bundle; | ||||
| import android.view.LayoutInflater; | ||||
| import android.view.View; | ||||
| import android.view.ViewGroup; | ||||
| import android.widget.Toast; | ||||
| import androidx.fragment.app.Fragment; | ||||
| import cc.winboll.studio.libaes.R; | ||||
| import cc.winboll.studio.libaes.views.AButton; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.libappbase.utils.ToastUtils; | ||||
|  | ||||
| public class TestAButtonFragment extends Fragment { | ||||
|  | ||||
| @@ -28,7 +28,7 @@ public class TestAButtonFragment extends Fragment { | ||||
|                 @Override | ||||
|                 public void onClick(View view) { | ||||
|                     LogUtils.d(TAG, "onClick"); | ||||
|                     Toast.makeText(getActivity(), "AButton", Toast.LENGTH_SHORT).show(); | ||||
|                     ToastUtils.show("AButton"); | ||||
|                 } | ||||
|  | ||||
|             }); | ||||
|   | ||||
| @@ -4,14 +4,14 @@ package cc.winboll.studio.libaes.unittests; | ||||
|  * @Author ZhanGSKen@QQ.COM | ||||
|  * @Date 2024/06/30 15:00:51 | ||||
|  */ | ||||
| import android.app.Activity; | ||||
| import android.os.Bundle; | ||||
| import android.view.LayoutInflater; | ||||
| import android.view.View; | ||||
| import android.view.ViewGroup; | ||||
| import android.widget.AdapterView; | ||||
| import android.widget.Toast; | ||||
| import androidx.appcompat.app.AppCompatActivity; | ||||
| import androidx.appcompat.widget.Toolbar; | ||||
| import android.widget.Toolbar; | ||||
| import androidx.fragment.app.Fragment; | ||||
| import cc.winboll.studio.libaes.R; | ||||
| import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; | ||||
| @@ -24,8 +24,8 @@ import java.util.ArrayList; | ||||
| public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity { | ||||
|  | ||||
|     @Override | ||||
|     public AppCompatActivity getActivity() { | ||||
|         return this; | ||||
|     public Activity getActivity() { | ||||
|         return g; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
| @@ -42,7 +42,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement | ||||
|     public Toolbar initToolBar() { | ||||
|         return null; | ||||
|     } | ||||
|      | ||||
|  | ||||
|     @Override | ||||
|     public boolean isAddWinBollToolBar() { | ||||
|         return false; | ||||
| @@ -52,7 +52,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement | ||||
|     public boolean isEnableDisplayHomeAsUp() { | ||||
|         return false; | ||||
|     } | ||||
|      | ||||
|  | ||||
|  | ||||
|     public static final String TAG = "TestDrawerFragmentActivity"; | ||||
|  | ||||
|   | ||||
| @@ -5,6 +5,7 @@ package cc.winboll.studio.libaes.unittests; | ||||
|  * @Date 2024/07/16 01:35:56 | ||||
|  * @Describe TestViewPageFragment | ||||
|  */ | ||||
| import android.content.Context; | ||||
| import android.os.Bundle; | ||||
| import android.view.LayoutInflater; | ||||
| import android.view.View; | ||||
| @@ -17,14 +18,16 @@ import androidx.viewpager.widget.ViewPager; | ||||
| import cc.winboll.studio.libaes.ImagePagerAdapter; | ||||
| import cc.winboll.studio.libaes.R; | ||||
| import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; | ||||
| import cc.winboll.studio.libappbase.LogView; | ||||
| import cc.winboll.studio.libappbase.utils.ToastUtils; | ||||
| import java.util.ArrayList; | ||||
| import java.util.List; | ||||
| import cc.winboll.studio.libappbase.LogView; | ||||
|  | ||||
| public class TestViewPageFragment extends Fragment implements ViewPager.OnPageChangeListener, View.OnClickListener { | ||||
|  | ||||
|     public static final String TAG = "TestViewPageFragment"; | ||||
|      | ||||
|     Context mContext; | ||||
|     LogView mLogView; | ||||
|  | ||||
|     private ViewPager viewPager; | ||||
| @@ -39,6 +42,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh | ||||
|     @Override | ||||
|     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | ||||
|         mView = inflater.inflate(R.layout.fragment_viewpage, container, false); | ||||
|         mContext = getActivity().getContext(); | ||||
|          | ||||
|         mLogView = mView.findViewById(R.id.logview); | ||||
|         mLogView.start(); | ||||
| @@ -72,7 +76,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh | ||||
|     //初始化所要显示的布局 | ||||
|     void initData() { | ||||
|         ViewPager viewPager = mView.findViewById(R.id.fragmentviewpageViewPager1); | ||||
|         LayoutInflater inflater = LayoutInflater.from(getActivity()); | ||||
|         LayoutInflater inflater = LayoutInflater.from(mContext); | ||||
|         View view1 = inflater.inflate(R.layout.viewpage_atickprogressbar, viewPager, false); | ||||
|         View view2 = inflater.inflate(R.layout.viewpage_acard, viewPager, false); | ||||
|         View view3 = inflater.inflate(R.layout.viewpage_aohpctccard, viewPager, false); | ||||
| @@ -193,7 +197,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh | ||||
|  | ||||
|     void initAOHPCTCSeekBar() { | ||||
|         AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1); | ||||
|         seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher)); | ||||
|         seekbar.setThumb(mContext.getDrawable(R.drawable.ic_launcher)); | ||||
|         //seekbar.setThumbOffset(200); | ||||
|         //seekbar.setThumbOffset(1); | ||||
|         seekbar.setBlurRightDP(50); | ||||
| @@ -201,14 +205,14 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh | ||||
|  | ||||
|                 @Override | ||||
|                 public void onOHPCommit() { | ||||
|                     Toast.makeText(getActivity(), "onOHPCommit ", Toast.LENGTH_SHORT).show(); | ||||
|                     ToastUtils.show("onOHPCommit"); | ||||
|                 } | ||||
|             }); | ||||
|     } | ||||
|      | ||||
|     void initAOHPCTCSeekBar2() { | ||||
|         AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2); | ||||
|         seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_call)); | ||||
|         seekbar.setThumb(mContext.getDrawable(R.drawable.ic_call)); | ||||
|         //seekbar.setThumbOffset(200); | ||||
|         //seekbar.setThumbOffset(1); | ||||
|         seekbar.setBlurRightDP(50); | ||||
| @@ -216,7 +220,7 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh | ||||
|  | ||||
|                 @Override | ||||
|                 public void onOHPCommit() { | ||||
|                     Toast.makeText(getActivity(), "onOHPCommit 2", Toast.LENGTH_SHORT).show(); | ||||
|                     ToastUtils.show("onOHPCommit 2"); | ||||
|                 } | ||||
|             }); | ||||
|     } | ||||
|   | ||||
| @@ -1,10 +1,12 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|      | ||||
|     <!-- 默认方案 --> | ||||
|     <color name="colorPrimary">#FF03AB4E</color> | ||||
|     <color name="colorPrimaryDark">#FF027C39</color> | ||||
|     <color name="colorAccent">#FF3DDC84</color> | ||||
| 	<color name="colorToastFrame">#FFA9A9A9</color> | ||||
| 	<color name="colorText">#FFFFFB8D</color> | ||||
|     <color name="colorToastFrame">#FFA9A9A9</color> | ||||
|     <color name="colorToastShadow">#FF000000</color> | ||||
|     <color name="colorToastBackgroung">#FFFFFFFF</color> | ||||
|     <color name="colorAToolbarStartColor">#FF7D3F12</color> | ||||
| @@ -14,16 +16,16 @@ | ||||
|     <color name="colorACardShadow">@color/colorPrimaryDark</color> | ||||
|     <color name="colorACardFrame">@color/colorPrimary</color> | ||||
|     <color name="colorACardBackgroung">@color/colorAccent</color> | ||||
|      | ||||
|  | ||||
|     <color name="colorATickProgressBarBackgroung">@color/colorAccent</color> | ||||
|     <color name="colorATickProgressBarProgress">@color/colorPrimary</color> | ||||
|      | ||||
|  | ||||
|     <color name="colorOHPCTSBackground">@color/colorAccent</color> | ||||
|     <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color> | ||||
|     <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color> | ||||
|      | ||||
|  | ||||
|     <!-- --> | ||||
|      | ||||
|  | ||||
|     <!-- 调试方案  | ||||
|     <color name="colorPrimary">#FF727272</color> | ||||
|     <color name="colorPrimaryDark">#FF444444</color> | ||||
| @@ -39,5 +41,5 @@ | ||||
|  | ||||
|     <color name="colorATickProgressBarBackgroung">#FF6DC4E2</color> | ||||
|     <color name="colorATickProgressBarProgress">#FF22B0E1</color> | ||||
|      --> | ||||
|     --> | ||||
| </resources> | ||||
|   | ||||
| @@ -1,7 +1,6 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|  | ||||
|     <style name="AESTheme" parent="WinBoll.SupportThemeNoActionBar"> | ||||
|     <style name="AESTheme" parent="APPBaseTheme"> | ||||
|         <item name="colorTextColor">#FF000000</item> | ||||
|         <item name="colorPrimary">#FF03AB4E</item> | ||||
|         <item name="colorPrimaryDark">#FF027C39</item> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 ZhanGSKen
					ZhanGSKen