zhanghaochen / ParentControl

Compare View

switch
from
...
to
 
Commits (2)
Showing 6 changed files   Show diff stats
1 1 apply plugin: 'com.android.application'
2   -apply from: '../config.gradle'
3 2  
4 3  
5 4 def androidId = rootProject.ext.androidId
... ... @@ -95,4 +94,7 @@ dependencies {
95 94  
96 95 // 图片查看
97 96 implementation 'com.github.chrisbanes:PhotoView:2.0.0'
  97 +
  98 + implementation 'com.jakewharton:butterknife:10.2.3'
  99 + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
98 100 }
99 101 \ No newline at end of file
... ...
... ... @@ -85,7 +85,7 @@ buildscript {
85 85 classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
86 86 classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
87 87 classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
88   - classpath "com.alibaba:arouter-register:1.0.2"
  88 + //classpath "com.alibaba:arouter-register:1.0.2"
89 89 // NOTE: Do not place your application dependencies here; they belong
90 90 // in the individual module build.gradle files
91 91 }
... ...
libs/common/build.gradle
Diff comments   View file @9fc165e
1 1 apply plugin: 'com.android.library'
2   -apply from: '../../config.gradle'
3 2  
4 3  
5 4 def androidId = rootProject.ext.androidId
... ... @@ -61,4 +60,6 @@ dependencies {
61 60 exclude module: 'lifecycle-viewmodel-ktx'
62 61 }
63 62  
  63 + implementation 'com.jakewharton:butterknife:10.2.3'
  64 + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
64 65 }
65 66 \ No newline at end of file
... ...
libs/common/src/main/java/com/prws/common/base/BaseActivity.java
Diff comments   View file @9fc165e
... ... @@ -336,14 +336,14 @@ public abstract class BaseActivity<P extends BasePresenter, CONTRACT> extends Ap
336 336  
337 337 if (!fragmentList.contains(fragment)) {
338 338 fragmentList.add(fragment);
339   - fragmentTransaction.add(id, fragment, fragment.getClass().getSimpleName()).setMaxLifecycle(fragment, Lifecycle.State.RESUMED);
  339 + fragmentTransaction.add(id, fragment, fragment.getClass().getSimpleName());
340 340 }
341 341  
342   - fragmentTransaction.show(fragment).setMaxLifecycle(fragment, Lifecycle.State.RESUMED);
  342 + fragmentTransaction.show(fragment);
343 343  
344 344 for (Fragment fragment1 : fragmentList) {
345 345 if (fragment1 != fragment) {
346   - fragmentTransaction.hide(fragment1).setMaxLifecycle(fragment1, Lifecycle.State.STARTED);
  346 + fragmentTransaction.hide(fragment1);
347 347 }
348 348 }
349 349  
... ...
libs/common/src/main/java/com/prws/common/router/RouterFragmentUtils.java
View file @9d201a4
... ... @@ -1,114 +0,0 @@
1   -package com.prws.common.router;
2   -
3   -import androidx.fragment.app.Fragment;
4   -
5   -import com.alibaba.android.arouter.launcher.ARouter;
6   -
7   -public class RouterFragmentUtils {
8   - /****************************** SettingActivity *********************/
9   - public static Fragment getSpeekFragment() {
10   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_SPEEK).navigation();
11   - }
12   -
13   - public static Fragment getWorkFragment() {
14   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_WORK).navigation();
15   - }
16   -
17   - public static Fragment getWifiFragment() {
18   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_WIFI).navigation();
19   - }
20   -
21   - public static Fragment getAccountFragment() {
22   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_ACCOUNT).navigation();
23   - }
24   -
25   - public static Fragment getAlarmFragment() {
26   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_ALARM).navigation();
27   - }
28   -
29   - public static Fragment getVoiceFragment() {
30   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_VOICE).navigation();
31   - }
32   -
33   - public static Fragment getPwdFragment() {
34   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_PWD).navigation();
35   - }
36   -
37   - public static Fragment getRunFragment() {
38   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_RUN).navigation();
39   - }
40   -
41   - public static Fragment getLanguageFragment() {
42   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_LANGUAGE).navigation();
43   - }
44   - public static Fragment getWashSweepSettingFragment(){
45   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_WASH_SWEEP_SETTING).navigation();
46   - }
47   -
48   - public static Fragment getMachineFragment() {
49   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_MACHINE).navigation();
50   - }
51   -
52   - public static Fragment getTaskFragment() {
53   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_TASK).navigation();
54   - }
55   - public static Fragment getCaiFragment() {
56   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_CAI).navigation();
57   - }
58   - public static Fragment getShuiFragment() {
59   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_SHUI).navigation();
60   - }
61   - public static Fragment getxdFragment() {
62   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_XDS).navigation();
63   - }
64   - public static Fragment getxdaFragment() {
65   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_XDSA).navigation();
66   - }
67   -
68   -
69   - /******************************** RemoteActivity *************************/
70   - public static Fragment getWashSweepFragment(){
71   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_WASH_SWEEP).navigation();
72   - }
73   - public static Fragment getDustFragment() {
74   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_DUST).navigation();
75   - }
76   -
77   - public static Fragment getDisinfectFragment() {
78   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_DISINFECT).navigation();
79   - }
80   -
81   - public static Fragment getSidePushFragment() {
82   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_SIDE_PUSH).navigation();
83   - }
84   -
85   - public static Fragment getChargeFragment() {
86   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_CHARGE).navigation();
87   - }
88   -
89   - public static Fragment getPenLinFragment() {
90   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_PENLIN).navigation();
91   - }
92   - public static Fragment getGSFragment() {
93   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_GS).navigation();
94   - }
95   - public static Fragment getXCFragment() {
96   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_XC).navigation();
97   - }
98   - public static Fragment getCJFragment() {
99   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_CJ).navigation();
100   - }
101   - public static Fragment getJHFragment() {
102   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_JH).navigation();
103   - }
104   - public static Fragment getWSJFragment() {
105   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_WSJ).navigation();
106   - }
107   - public static Fragment getPDFragment() {
108   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_PD).navigation();
109   - }
110   - public static Fragment getXDABFragment() {
111   - return (Fragment) ARouter.getInstance().build(RouterConfig.FRAGMENT_XDAB).navigation();
112   - }
113   -
114   -}
libs/common/src/main/java/com/prws/common/router/RouterUtils.java
View file @9d201a4
... ... @@ -1,116 +0,0 @@
1   -package com.prws.common.router;
2   -
3   -import android.content.pm.ApplicationInfo;
4   -import android.content.pm.PackageManager;
5   -import com.prws.common.CommonApplication;
6   -
7   -import com.alibaba.android.arouter.launcher.ARouter;
8   -
9   -import java.util.ArrayList;
10   -
11   -
12   -public class RouterUtils {
13   -
14   - public static void goTestActivity(){
15   - if (isPaimo())
16   - ARouter.getInstance().build(RouterConfig.PAIMO_TEST).navigation();
17   - else
18   - ARouter.getInstance().build(RouterConfig.TEST).navigation();
19   - }
20   -
21   - public static void getMapTestActivity(){
22   - ARouter.getInstance().build(RouterConfig.MAP_ACTY_TEST).navigation();
23   - }
24   -
25   - public static void goMapListActivity(){
26   - ARouter.getInstance().build(RouterConfig.MAP_LIST).navigation();
27   - }
28   - public static void goMapCreateActivity(ArrayList<String> mapNameList){
29   - ARouter.getInstance().build(RouterConfig.MAP_CREATE)
30   - .withStringArrayList("mapNameList",mapNameList)
31   - .navigation();
32   - }
33   -
34   - public static void goEditMapActivity(String projectId,String mapMd5){
35   - ARouter.getInstance().build(RouterConfig.MAP_EDIT)
36   - .withString("projectId",projectId)
37   - .withString("mapMd5",mapMd5)
38   - .navigation();
39   - }
40   -
41   - public static void goMenuActivity(){
42   -
43   - if (isPaiwee())
44   - ARouter.getInstance().build(RouterConfig.PAIWEE_MENU).navigation();
45   - else if (isPaipo())
46   - ARouter.getInstance().build(RouterConfig.PAIPO_MENU).navigation();
47   - else
48   - ARouter.getInstance().build(RouterConfig.PAIMO_MENU).navigation();
49   -
50   - }
51   - public static void goTaskActivity(){
52   - ARouter.getInstance().build(RouterConfig.TASK).navigation();
53   - }
54   - public static void goRemoteActivity(){
55   - if (isPaiwee())
56   - ARouter.getInstance().build(RouterConfig.PAIWEE_REMOTE).navigation();
57   - else
58   - ARouter.getInstance().build(RouterConfig.REMOTE).navigation();
59   - }
60   -
61   - public static void goSettingActivity(){
62   -
63   - if (isPaiwee())
64   - ARouter.getInstance().build(RouterConfig.PAIWEE_SETTING).navigation();
65   - else
66   - ARouter.getInstance().build(RouterConfig.SETTING).navigation();
67   -
68   - }
69   -
70   - public static void goMainActivity(){
71   - if (isPaimo()){
72   -
73   - }else if (isPaipo()){
74   -
75   - }else if (isPaisam()){
76   -
77   - }
78   -
79   -// if (BuildConfig.PROJECT_NAME.equals("paimo"))
80   -// ARouter.getInstance().build(RouterConfig.PAIMO_MAIN).navigation();
81   -// else if (BuildConfig.PROJECT_NAME.equals("paipo"))
82   -// ARouter.getInstance().build(RouterConfig.PAIPO_MAIN).navigation();
83   -// else if (BuildConfig.PROJECT_NAME.equals("paisam"))
84   -// ARouter.getInstance().build(RouterConfig.PAISAM_MAIN).navigation();
85   - }
86   -
87   -
88   -
89   - /************************* 判断项目类型 **********************************/
90   -
91   - public static boolean isPaimo(){ return getProjectName().equals("paimo"); }
92   - private static boolean isPaipo(){
93   - return getProjectName().equals("paipo");
94   - }
95   - private static boolean isPaisam(){
96   - return getProjectName().equals("paisam");
97   - }
98   - public static boolean isPaiwee(){
99   - return getProjectName().equals("paiwee");
100   - }
101   -
102   -
103   - public static String getProjectName(){
104   -// ApplicationInfo applicationInfo = null;
105   -// try {
106   -// applicationInfo = CommonApplication.getAppContext().getPackageManager().getApplicationInfo(CommonApplication.getAppContext().getPackageName(), PackageManager.GET_META_DATA);
107   -// } catch (PackageManager.NameNotFoundException e) {
108   -// e.printStackTrace();
109   -// }
110   -// if (applicationInfo == null)return "";
111   -// return applicationInfo.metaData.getString("PROJECT_NAME");
112   - return "paicu";
113   - }
114   -
115   -
116   -}