修改

app/priguardMapping.txt

 # compiler: R8
 # compiler_version: 2.0.74
 # min_api: 23
-# pg_map_id: d320cc8
+# pg_map_id: 8b0f247
 # common_typos_disable
 android.support.v4.app.INotificationSideChannel$Stub -> android.support.v4.app.INotificationSideChannel$Stub:
     20:22:void <init>() -> <init>
@@ -68721,31 +68721,31 @@ live.nodiyphoneshell.cend.BaseFragment -> live.nodiyphoneshell.cend.BaseFragment
     33:34:void onViewCreated(android.view.View,android.os.Bundle) -> onViewCreated
     66:72:void setUserVisibleHint(boolean) -> setUserVisibleHint
 live.nodiyphoneshell.cend.BaseMianActivity -> live.nodiyphoneshell.cend.BaseMianActivity:
-    18:21:void <init>() -> <init>
-    81:88:boolean checkPermissionGranted(java.lang.String[]) -> checkPermissionGranted
-    26:29:void onCreate(android.os.Bundle) -> onCreate
-    54:55:void onDestroy() -> onDestroy
-    48:50:void onPause() -> onPause
-    120:131:void onRequestPermissionsResult(int,java.lang.String[],int[]) -> onRequestPermissionsResult
-    33:34:void onRestart() -> onRestart
-    43:44:void onResume() -> onResume
-    59:60:void onSaveInstanceState(android.os.Bundle) -> onSaveInstanceState
-    38:39:void onStart() -> onStart
-    103:116:void requestPermission(java.lang.String[],int) -> requestPermission
-    68:69:void requestRunTimePermissions(java.lang.String[],live.nodiyphoneshell.cend.BaseMianActivity$PermissionCall) -> requestRunTimePermissions
-    92:99:boolean shouldShowRequestPermissionRationale(java.lang.String[]) -> shouldShowRequestPermissionRationale
-    135:144:boolean verifyPermissions(int[]) -> verifyPermissions
+    17:20:void <init>() -> <init>
+    80:87:boolean checkPermissionGranted(java.lang.String[]) -> checkPermissionGranted
+    25:28:void onCreate(android.os.Bundle) -> onCreate
+    53:54:void onDestroy() -> onDestroy
+    47:49:void onPause() -> onPause
+    119:130:void onRequestPermissionsResult(int,java.lang.String[],int[]) -> onRequestPermissionsResult
+    32:33:void onRestart() -> onRestart
+    42:43:void onResume() -> onResume
+    58:59:void onSaveInstanceState(android.os.Bundle) -> onSaveInstanceState
+    37:38:void onStart() -> onStart
+    102:115:void requestPermission(java.lang.String[],int) -> requestPermission
+    67:68:void requestRunTimePermissions(java.lang.String[],live.nodiyphoneshell.cend.BaseMianActivity$PermissionCall) -> requestRunTimePermissions
+    91:98:boolean shouldShowRequestPermissionRationale(java.lang.String[]) -> shouldShowRequestPermissionRationale
+    134:143:boolean verifyPermissions(int[]) -> verifyPermissions
 live.nodiyphoneshell.cend.BaseMianActivity$1 -> live.nodiyphoneshell.cend.BaseMianActivity$1:
     live.nodiyphoneshell.cend.BaseMianActivity this$0 -> c
     java.lang.String[] val$permissions -> a
     int val$requestCode -> b
-    107:107:void <init>(live.nodiyphoneshell.cend.BaseMianActivity,java.lang.String[],int) -> <init>
-    110:111:void onClick(android.content.DialogInterface,int) -> onClick
+    106:106:void <init>(live.nodiyphoneshell.cend.BaseMianActivity,java.lang.String[],int) -> <init>
+    109:110:void onClick(android.content.DialogInterface,int) -> onClick
 live.nodiyphoneshell.cend.BasePresenter -> live.nodiyphoneshell.cend.BasePresenter:
     10:10:void <init>() -> <init>
-    63:69:void closeLoad() -> closeLoad
+    61:67:void closeLoad() -> closeLoad
     19:33:void showLoad(android.content.Context) -> showLoad
-    39:59:void showLoad(android.content.Context,java.lang.String) -> showLoad
+    37:57:void showLoad(android.content.Context,java.lang.String) -> showLoad
 live.nodiyphoneshell.cend.BaseTabFragment -> live.nodiyphoneshell.cend.BaseTabFragment:
     boolean isInit -> V
     boolean isLoad -> W
@@ -68770,135 +68770,134 @@ live.nodiyphoneshell.cend.CustomApplication -> live.nodiyphoneshell.cend.CustomA
     23:37:void onCreate() -> onCreate
 live.nodiyphoneshell.cend.activities.MainActivity -> live.nodiyphoneshell.cend.activities.MainActivity:
     java.lang.Runnable runnablerStatusStart -> k
-    74:362:void <init>() -> <init>
-    159:165:void authorizationManagement() -> authorizationManagement
-    456:457:void getBanner(java.lang.String,java.lang.String) -> getBanner
-    465:472:void getBannerSuccessed(java.lang.String) -> getBannerSuccessed
-    384:385:void getMachineInit(java.lang.String) -> getMachineInit
-    446:448:void getMachineInitFail() -> getMachineInitFail
-    393:438:void getMachineInitSuccessed(java.lang.String) -> getMachineInitSuccessed
-    301:333:void getScoketData() -> getScoketData
-    74:74:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$000(live.nodiyphoneshell.cend.activities.MainActivity) -> h
-    74:74:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$002(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> i
-    186:213:void initBannnerInfo() -> initBannnerInfo
-    144:147:void initData() -> initData
-    220:295:void initFragment() -> initFragment
-    115:115:int initLayout() -> initLayout
-    129:137:void initView() -> initView
-    74:74:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$100(live.nodiyphoneshell.cend.activities.MainActivity) -> j
-    74:74:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$102(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> k
-    74:74:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$200(live.nodiyphoneshell.cend.activities.MainActivity) -> l
-    74:74:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$202(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> m
-    74:74:java.lang.String access$300(live.nodiyphoneshell.cend.activities.MainActivity) -> n
-    74:74:java.util.List access$400(live.nodiyphoneshell.cend.activities.MainActivity) -> o
-    802:803:void onActivityResult(int,int,android.content.Intent) -> onActivityResult
-    365:375:void onBackPressed() -> onBackPressed
-    120:121:void onCreate(android.os.Bundle) -> onCreate
-    349:356:void onDestroy() -> onDestroy
-    807:809:void onPause() -> onPause
-    170:178:void onRequestPermissionsResult(int,java.lang.String[],int[]) -> onRequestPermissionsResult
-    790:798:void onResume() -> onResume
-    774:778:void onStart() -> onStart
-    782:786:void onStop() -> onStop
-    74:74:void access$500(live.nodiyphoneshell.cend.activities.MainActivity,java.lang.String) -> p
-    151:155:void promptMessage() -> promptMessage
-    74:74:java.util.List access$600(live.nodiyphoneshell.cend.activities.MainActivity) -> q
-    74:74:void access$700(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.modules.ImageBanner) -> r
-    741:770:void setVideoTextInfo(live.nodiyphoneshell.cend.modules.ImageBanner) -> setVideoTextInfo
-    580:581:void upLoadVideo(live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean) -> upLoadVideo
-    590:618:void upLoadVideoSuccessed(live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean,java.lang.String) -> upLoadVideoSuccessed
-    480:572:void updateBannerData(java.lang.String) -> updateBannerData
-    626:627:void updateUpLoadVideo(live.nodiyphoneshell.cend.modules.VideoBean) -> updateUpLoadVideo
-    636:708:void updateUpLoadVideoSuccessed(live.nodiyphoneshell.cend.modules.VideoBean,java.lang.String) -> updateUpLoadVideoSuccessed
-    713:718:void updateVoice(float) -> updateVoice
+    72:344:void <init>() -> <init>
+    141:147:void authorizationManagement() -> authorizationManagement
+    438:439:void getBanner(java.lang.String,java.lang.String) -> getBanner
+    447:454:void getBannerSuccessed(java.lang.String) -> getBannerSuccessed
+    366:367:void getMachineInit(java.lang.String) -> getMachineInit
+    428:430:void getMachineInitFail() -> getMachineInitFail
+    375:420:void getMachineInitSuccessed(java.lang.String) -> getMachineInitSuccessed
+    283:315:void getScoketData() -> getScoketData
+    72:72:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$000(live.nodiyphoneshell.cend.activities.MainActivity) -> h
+    72:72:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$002(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> i
+    168:195:void initBannnerInfo() -> initBannnerInfo
+    133:136:void initData() -> initData
+    202:277:void initFragment() -> initFragment
+    104:104:int initLayout() -> initLayout
+    118:126:void initView() -> initView
+    72:72:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$100(live.nodiyphoneshell.cend.activities.MainActivity) -> j
+    72:72:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$102(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> k
+    72:72:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$200(live.nodiyphoneshell.cend.activities.MainActivity) -> l
+    72:72:live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog access$202(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> m
+    72:72:java.lang.String access$300(live.nodiyphoneshell.cend.activities.MainActivity) -> n
+    72:72:java.util.List access$400(live.nodiyphoneshell.cend.activities.MainActivity) -> o
+    783:784:void onActivityResult(int,int,android.content.Intent) -> onActivityResult
+    347:357:void onBackPressed() -> onBackPressed
+    109:110:void onCreate(android.os.Bundle) -> onCreate
+    331:338:void onDestroy() -> onDestroy
+    788:790:void onPause() -> onPause
+    152:160:void onRequestPermissionsResult(int,java.lang.String[],int[]) -> onRequestPermissionsResult
+    772:779:void onResume() -> onResume
+    756:760:void onStart() -> onStart
+    764:768:void onStop() -> onStop
+    72:72:void access$500(live.nodiyphoneshell.cend.activities.MainActivity,java.lang.String) -> p
+    72:72:java.util.List access$600(live.nodiyphoneshell.cend.activities.MainActivity) -> q
+    72:72:void access$700(live.nodiyphoneshell.cend.activities.MainActivity,live.nodiyphoneshell.cend.modules.ImageBanner) -> r
+    723:752:void setVideoTextInfo(live.nodiyphoneshell.cend.modules.ImageBanner) -> setVideoTextInfo
+    562:563:void upLoadVideo(live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean) -> upLoadVideo
+    572:600:void upLoadVideoSuccessed(live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean,java.lang.String) -> upLoadVideoSuccessed
+    462:554:void updateBannerData(java.lang.String) -> updateBannerData
+    608:609:void updateUpLoadVideo(live.nodiyphoneshell.cend.modules.VideoBean) -> updateUpLoadVideo
+    618:690:void updateUpLoadVideoSuccessed(live.nodiyphoneshell.cend.modules.VideoBean,java.lang.String) -> updateUpLoadVideoSuccessed
+    695:700:void updateVoice(float) -> updateVoice
 live.nodiyphoneshell.cend.activities.MainActivity$1 -> live.nodiyphoneshell.cend.activities.MainActivity$1:
     live.nodiyphoneshell.cend.activities.MainActivity this$0 -> a
-    220:220:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    223:239:boolean onLongClick(android.view.View) -> onLongClick
+    202:202:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    205:221:boolean onLongClick(android.view.View) -> onLongClick
 live.nodiyphoneshell.cend.activities.MainActivity$1$1 -> live.nodiyphoneshell.cend.activities.MainActivity$1$1:
     live.nodiyphoneshell.cend.activities.MainActivity$1 this$1 -> a
-    228:228:void <init>(live.nodiyphoneshell.cend.activities.MainActivity$1) -> <init>
-    231:237:void OnClickSaveButton() -> OnClickSaveButton
+    210:210:void <init>(live.nodiyphoneshell.cend.activities.MainActivity$1) -> <init>
+    213:219:void OnClickSaveButton() -> OnClickSaveButton
 live.nodiyphoneshell.cend.activities.MainActivity$2 -> live.nodiyphoneshell.cend.activities.MainActivity$2:
     live.nodiyphoneshell.cend.activities.MainActivity this$0 -> a
-    244:244:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    247:263:boolean onLongClick(android.view.View) -> onLongClick
+    226:226:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    229:245:boolean onLongClick(android.view.View) -> onLongClick
 live.nodiyphoneshell.cend.activities.MainActivity$2$1 -> live.nodiyphoneshell.cend.activities.MainActivity$2$1:
     live.nodiyphoneshell.cend.activities.MainActivity$2 this$1 -> a
-    252:252:void <init>(live.nodiyphoneshell.cend.activities.MainActivity$2) -> <init>
-    255:261:void OnClickSaveButton() -> OnClickSaveButton
+    234:234:void <init>(live.nodiyphoneshell.cend.activities.MainActivity$2) -> <init>
+    237:243:void OnClickSaveButton() -> OnClickSaveButton
 live.nodiyphoneshell.cend.activities.MainActivity$3 -> live.nodiyphoneshell.cend.activities.MainActivity$3:
     live.nodiyphoneshell.cend.activities.MainActivity this$0 -> a
-    268:268:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    271:291:boolean onLongClick(android.view.View) -> onLongClick
+    250:250:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    253:273:boolean onLongClick(android.view.View) -> onLongClick
 live.nodiyphoneshell.cend.activities.MainActivity$3$1 -> live.nodiyphoneshell.cend.activities.MainActivity$3$1:
     live.nodiyphoneshell.cend.activities.MainActivity$3 this$1 -> a
-    276:276:void <init>(live.nodiyphoneshell.cend.activities.MainActivity$3) -> <init>
-    279:289:void OnClickSaveButton() -> OnClickSaveButton
+    258:258:void <init>(live.nodiyphoneshell.cend.activities.MainActivity$3) -> <init>
+    261:271:void OnClickSaveButton() -> OnClickSaveButton
 live.nodiyphoneshell.cend.activities.MainActivity$4 -> live.nodiyphoneshell.cend.activities.MainActivity$4:
     live.nodiyphoneshell.cend.activities.MainActivity this$0 -> a
-    301:301:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    301:301:void accept(java.lang.Object) -> accept
-    305:331:void accept(live.nodiyphoneshell.cend.modules.VideoBean) -> accept
+    283:283:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    283:283:void accept(java.lang.Object) -> accept
+    287:313:void accept(live.nodiyphoneshell.cend.modules.VideoBean) -> accept
 live.nodiyphoneshell.cend.activities.MainActivity$5 -> live.nodiyphoneshell.cend.activities.MainActivity$5:
     live.nodiyphoneshell.cend.activities.MainActivity this$0 -> a
-    335:335:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    338:343:void run() -> run
+    317:317:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    320:325:void run() -> run
 live.nodiyphoneshell.cend.activities.MainActivity$6 -> live.nodiyphoneshell.cend.activities.MainActivity$6:
     live.nodiyphoneshell.cend.activities.MainActivity this$0 -> a
-    554:554:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    566:566:void onPageScrollStateChanged(int) -> onPageScrollStateChanged
-    558:558:void onPageScrolled(int,float,int) -> onPageScrolled
-    561:562:void onPageSelected(int) -> onPageSelected
+    536:536:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    548:548:void onPageScrollStateChanged(int) -> onPageScrollStateChanged
+    540:540:void onPageScrolled(int,float,int) -> onPageScrolled
+    543:544:void onPageSelected(int) -> onPageSelected
 live.nodiyphoneshell.cend.activities.MainActivity_ViewBinding -> live.nodiyphoneshell.cend.activities.MainActivity_ViewBinding:
-    23:24:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
-    27:38:void <init>(live.nodiyphoneshell.cend.activities.MainActivity,android.view.View) -> <init>
-    43:44:void unbind() -> unbind
+    21:22:void <init>(live.nodiyphoneshell.cend.activities.MainActivity) -> <init>
+    25:33:void <init>(live.nodiyphoneshell.cend.activities.MainActivity,android.view.View) -> <init>
+    38:39:void unbind() -> unbind
 live.nodiyphoneshell.cend.activities.MainPresenter -> live.nodiyphoneshell.cend.activities.MainPresenter:
-    28:31:void <init>(live.nodiyphoneshell.cend.activities.MainContract$View,android.content.Context) -> <init>
-    23:23:live.nodiyphoneshell.cend.activities.MainContract$View access$000(live.nodiyphoneshell.cend.activities.MainPresenter) -> a
-    23:23:android.content.Context access$100(live.nodiyphoneshell.cend.activities.MainPresenter) -> b
-    57:76:void getBanner(java.lang.String,java.lang.String) -> getBanner
-    35:53:void getMachineInit(java.lang.String) -> getMachineInit
-    83:97:void upLoadVideo(live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean) -> upLoadVideo
-    101:116:void updateUpLoadVideo(live.nodiyphoneshell.cend.modules.VideoBean) -> updateUpLoadVideo
+    25:28:void <init>(live.nodiyphoneshell.cend.activities.MainContract$View,android.content.Context) -> <init>
+    20:20:live.nodiyphoneshell.cend.activities.MainContract$View access$000(live.nodiyphoneshell.cend.activities.MainPresenter) -> a
+    20:20:android.content.Context access$100(live.nodiyphoneshell.cend.activities.MainPresenter) -> b
+    54:73:void getBanner(java.lang.String,java.lang.String) -> getBanner
+    32:50:void getMachineInit(java.lang.String) -> getMachineInit
+    78:92:void upLoadVideo(live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean) -> upLoadVideo
+    97:112:void updateUpLoadVideo(live.nodiyphoneshell.cend.modules.VideoBean) -> updateUpLoadVideo
 live.nodiyphoneshell.cend.activities.MainPresenter$1 -> live.nodiyphoneshell.cend.activities.MainPresenter$1:
     live.nodiyphoneshell.cend.activities.MainPresenter this$0 -> a
-    41:41:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter) -> <init>
-    44:46:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
-    41:41:void onResponse(java.lang.Object,int) -> onResponse
-    49:51:void onResponse(java.lang.String,int) -> onResponse
+    38:38:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter) -> <init>
+    41:43:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
+    38:38:void onResponse(java.lang.Object,int) -> onResponse
+    46:48:void onResponse(java.lang.String,int) -> onResponse
 live.nodiyphoneshell.cend.activities.MainPresenter$2 -> live.nodiyphoneshell.cend.activities.MainPresenter$2:
     live.nodiyphoneshell.cend.activities.MainPresenter this$0 -> a
-    64:64:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter) -> <init>
-    67:69:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
-    64:64:void onResponse(java.lang.Object,int) -> onResponse
-    72:74:void onResponse(java.lang.String,int) -> onResponse
+    61:61:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter) -> <init>
+    64:66:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
+    61:61:void onResponse(java.lang.Object,int) -> onResponse
+    69:71:void onResponse(java.lang.String,int) -> onResponse
 live.nodiyphoneshell.cend.activities.MainPresenter$3 -> live.nodiyphoneshell.cend.activities.MainPresenter$3:
     live.nodiyphoneshell.cend.activities.MainPresenter this$0 -> b
     live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean val$videoBean -> a
-    86:86:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter,java.lang.String,java.lang.String,live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean) -> <init>
-    89:90:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
-    86:86:void onResponse(java.lang.Object,int) -> onResponse
-    93:95:void onResponse(java.io.File,int) -> onResponse
+    81:81:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter,java.lang.String,java.lang.String,live.nodiyphoneshell.cend.modules.MachineInitRewriteBean$DataBean$VideoBean) -> <init>
+    84:85:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
+    81:81:void onResponse(java.lang.Object,int) -> onResponse
+    88:90:void onResponse(java.io.File,int) -> onResponse
 live.nodiyphoneshell.cend.activities.MainPresenter$4 -> live.nodiyphoneshell.cend.activities.MainPresenter$4:
     live.nodiyphoneshell.cend.activities.MainPresenter this$0 -> b
     live.nodiyphoneshell.cend.modules.VideoBean val$videoBean -> a
-    104:104:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter,java.lang.String,java.lang.String,live.nodiyphoneshell.cend.modules.VideoBean) -> <init>
-    107:108:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
-    104:104:void onResponse(java.lang.Object,int) -> onResponse
-    111:114:void onResponse(java.io.File,int) -> onResponse
+    100:100:void <init>(live.nodiyphoneshell.cend.activities.MainPresenter,java.lang.String,java.lang.String,live.nodiyphoneshell.cend.modules.VideoBean) -> <init>
+    103:104:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
+    100:100:void onResponse(java.lang.Object,int) -> onResponse
+    107:110:void onResponse(java.io.File,int) -> onResponse
 live.nodiyphoneshell.cend.activities.SplashActivity -> live.nodiyphoneshell.cend.activities.SplashActivity:
     22:22:void <init>() -> <init>
-    39:43:void launch() -> launch
+    39:44:void launch() -> launch
     29:36:void onCreate(android.os.Bundle) -> onCreate
 live.nodiyphoneshell.cend.activities.SplashActivity$AnimationImpl -> live.nodiyphoneshell.cend.activities.SplashActivity$AnimationImpl:
     live.nodiyphoneshell.cend.activities.SplashActivity this$0 -> a
-    45:45:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init>
-    45:45:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,live.nodiyphoneshell.cend.activities.SplashActivity$1) -> <init>
-    52:62:void onAnimationEnd(android.view.animation.Animation) -> onAnimationEnd
-    65:65:void onAnimationRepeat(android.view.animation.Animation) -> onAnimationRepeat
-    49:49:void onAnimationStart(android.view.animation.Animation) -> onAnimationStart
+    46:46:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init>
+    46:46:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,live.nodiyphoneshell.cend.activities.SplashActivity$1) -> <init>
+    53:63:void onAnimationEnd(android.view.animation.Animation) -> onAnimationEnd
+    66:66:void onAnimationRepeat(android.view.animation.Animation) -> onAnimationRepeat
+    50:50:void onAnimationStart(android.view.animation.Animation) -> onAnimationStart
 live.nodiyphoneshell.cend.activities.SplashActivity_ViewBinding -> live.nodiyphoneshell.cend.activities.SplashActivity_ViewBinding:
     19:20:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init>
     23:27:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,android.view.View) -> <init>
@@ -68949,37 +68948,13 @@ live.nodiyphoneshell.cend.dialog.DialogManager -> live.nodiyphoneshell.cend.dial
     32:38:live.nodiyphoneshell.cend.dialog.DialogManager getIntance() -> getIntance
     42:64:void showError(android.content.Context) -> showError
 live.nodiyphoneshell.cend.dialog.DialogMessageDialog -> live.nodiyphoneshell.cend.dialog.DialogMessageDialog:
-    29:31:void <init>(android.content.Context,java.lang.String) -> <init>
-    48:49:void dismissDiaLog() -> dismissDiaLog
-    34:45:void initView(java.lang.String) -> initView
+    31:33:void <init>(android.content.Context,java.lang.String) -> <init>
+    50:51:void dismissDiaLog() -> dismissDiaLog
+    36:47:void initView(java.lang.String) -> initView
 live.nodiyphoneshell.cend.dialog.DialogMessageDialog_ViewBinding -> live.nodiyphoneshell.cend.dialog.DialogMessageDialog_ViewBinding:
     19:20:void <init>(live.nodiyphoneshell.cend.dialog.DialogMessageDialog) -> <init>
     23:27:void <init>(live.nodiyphoneshell.cend.dialog.DialogMessageDialog,android.view.View) -> <init>
     32:33:void unbind() -> unbind
-live.nodiyphoneshell.cend.dialog.ShowClearDialog -> live.nodiyphoneshell.cend.dialog.ShowClearDialog:
-    18:18:void <init>() -> <init>
-    18:18:live.nodiyphoneshell.cend.dialog.ShowClearDialog$OnClickSaveListener access$000(live.nodiyphoneshell.cend.dialog.ShowClearDialog) -> a
-    43:49:live.nodiyphoneshell.cend.dialog.ShowClearDialog getIntance() -> getIntance
-    39:40:void setOnClickSaveListener(live.nodiyphoneshell.cend.dialog.ShowClearDialog$OnClickSaveListener) -> setOnClickSaveListener
-    35:36:void setOnClickUpLoadListener(live.nodiyphoneshell.cend.dialog.ShowClearDialog$OnClickUpLoadListener) -> setOnClickUpLoadListener
-    55:92:void showClearAll(android.content.Context) -> showClearAll
-live.nodiyphoneshell.cend.dialog.ShowClearDialog$1 -> live.nodiyphoneshell.cend.dialog.ShowClearDialog$1:
-    live.nodiyphoneshell.cend.dialog.ShowClearDialog this$0 -> b
-    android.app.Dialog val$dialog -> a
-    58:58:void <init>(live.nodiyphoneshell.cend.dialog.ShowClearDialog,android.app.Dialog) -> <init>
-    61:68:void onClick(android.view.View) -> onClick
-live.nodiyphoneshell.cend.dialog.ShowClearDialog$2 -> live.nodiyphoneshell.cend.dialog.ShowClearDialog$2:
-    android.app.Dialog val$dialog -> a
-    71:71:void <init>(live.nodiyphoneshell.cend.dialog.ShowClearDialog,android.app.Dialog) -> <init>
-    74:77:void onClick(android.view.View) -> onClick
-live.nodiyphoneshell.cend.dialog.ShowFailDialog -> live.nodiyphoneshell.cend.dialog.ShowFailDialog:
-    19:19:void <init>() -> <init>
-    77:80:void dismissDiaLog() -> dismissDiaLog
-    51:57:live.nodiyphoneshell.cend.dialog.ShowFailDialog getIntance() -> getIntance
-    32:32:void onClick(android.view.View) -> onClick
-    47:48:void setOnClickSaveListener(live.nodiyphoneshell.cend.dialog.ShowFailDialog$OnClickSaveListener) -> setOnClickSaveListener
-    43:44:void setOnClickUpLoadListener(live.nodiyphoneshell.cend.dialog.ShowFailDialog$OnClickUpLoadListener) -> setOnClickUpLoadListener
-    62:73:void showPayFail(android.content.Context) -> showPayFail
 live.nodiyphoneshell.cend.fragment.FragmentAdapter -> live.nodiyphoneshell.cend.fragment.FragmentAdapter:
     14:17:void <init>(androidx.fragment.app.FragmentManager,java.util.List,java.util.List) -> <init>
     20:21:void <init>(androidx.fragment.app.FragmentManager) -> <init>
@@ -70789,19 +70764,19 @@ live.nodiyphoneshell.cend.receiver.NetStateChangeReceiver$InstanceHolder -> live
     17:17:live.nodiyphoneshell.cend.receiver.NetStateChangeReceiver access$000() -> a
 live.nodiyphoneshell.cend.receiver.NetworkConnectChangedReceiver -> live.nodiyphoneshell.cend.receiver.NetworkConnectChangedReceiver:
     16:16:void <init>() -> <init>
-    24:85:void onReceive(android.content.Context,android.content.Intent) -> onReceive
+    24:74:void onReceive(android.content.Context,android.content.Intent) -> onReceive
 live.nodiyphoneshell.cend.receiver.NetworkReceiver -> live.nodiyphoneshell.cend.receiver.NetworkReceiver:
     9:9:void <init>() -> <init>
     19:60:void onReceive(android.content.Context,android.content.Intent) -> onReceive
     14:15:void setNetworkListen(live.nodiyphoneshell.cend.receiver.NetworkReceiver$networkListen) -> setNetworkListen
 live.nodiyphoneshell.cend.receiver.NetworkUtil -> live.nodiyphoneshell.cend.receiver.NetworkUtil:
-    30:31:void <init>() -> <init>
-    36:37:android.net.NetworkInfo getActiveNetworkInfo(android.content.Context) -> getActiveNetworkInfo
-    46:94:live.nodiyphoneshell.cend.receiver.NetworkUtil$NetworkType getNetworkType(android.content.Context) -> getNetworkType
+    29:30:void <init>() -> <init>
+    35:36:android.net.NetworkInfo getActiveNetworkInfo(android.content.Context) -> getActiveNetworkInfo
+    44:91:live.nodiyphoneshell.cend.receiver.NetworkUtil$NetworkType getNetworkType(android.content.Context) -> getNetworkType
 live.nodiyphoneshell.cend.receiver.NetworkUtil$NetworkType -> live.nodiyphoneshell.cend.receiver.NetworkUtil$NetworkType:
     12:10:void <clinit>() -> <clinit>
     20:22:void <init>(java.lang.String,int,java.lang.String) -> <init>
-    26:26:java.lang.String toString() -> toString
+    25:25:java.lang.String toString() -> toString
     10:10:live.nodiyphoneshell.cend.receiver.NetworkUtil$NetworkType valueOf(java.lang.String) -> valueOf
     10:10:live.nodiyphoneshell.cend.receiver.NetworkUtil$NetworkType[] values() -> values
 live.nodiyphoneshell.cend.rxbus.Action -> live.nodiyphoneshell.cend.rxbus.Action:
@@ -71125,9 +71100,9 @@ live.nodiyphoneshell.cend.service.AccessibilityUtil -> live.nodiyphoneshell.cend
     21:21:void <clinit>() -> <clinit>
     20:20:void <init>() -> <init>
     27:44:void checkSetting(android.content.Context,java.lang.Class) -> checkSetting
-    53:68:boolean isSettingOpen(java.lang.Class,android.content.Context) -> isSettingOpen
-    77:92:void jumpToSetting(android.content.Context) -> jumpToSetting
-    101:115:void wakeUpScreen(android.content.Context) -> wakeUpScreen
+    52:67:boolean isSettingOpen(java.lang.Class,android.content.Context) -> isSettingOpen
+    75:90:void jumpToSetting(android.content.Context) -> jumpToSetting
+    98:112:void wakeUpScreen(android.content.Context) -> wakeUpScreen
 live.nodiyphoneshell.cend.service.AccessibilityUtil$1 -> live.nodiyphoneshell.cend.service.AccessibilityUtil$1:
     android.content.Context val$cxt -> a
     32:32:void <init>(android.content.Context) -> <init>
@@ -71150,9 +71125,9 @@ live.nodiyphoneshell.cend.service.InstallUtil -> live.nodiyphoneshell.cend.servi
     18:18:void <init>() -> <init>
     18:18:void access$000(android.content.Context) -> a
     24:42:void checkSetting(android.content.Context) -> checkSetting
-    80:96:void install(android.content.Context,java.io.File) -> install
+    79:95:void install(android.content.Context,java.io.File) -> install
     49:53:boolean isSettingOpen(android.content.Context) -> isSettingOpen
-    60:73:void jumpToInstallSetting(android.content.Context) -> jumpToInstallSetting
+    60:72:void jumpToInstallSetting(android.content.Context) -> jumpToInstallSetting
 live.nodiyphoneshell.cend.service.InstallUtil$1 -> live.nodiyphoneshell.cend.service.InstallUtil$1:
     android.content.Context val$cxt -> a
     29:29:void <init>(android.content.Context) -> <init>
@@ -71302,29 +71277,9 @@ live.nodiyphoneshell.cend.utils.ClearEditText -> live.nodiyphoneshell.cend.utils
     3:3:void <init>() -> <init>
 live.nodiyphoneshell.cend.utils.ColorUtils -> live.nodiyphoneshell.cend.utils.ColorUtils:
     8:8:void <init>() -> <init>
-    35:60:int getColor(java.lang.String) -> getColor
-    11:30:int getDrawable(java.lang.String) -> getDrawable
-    64:70:boolean getFirst(java.lang.String) -> getFirst
-    74:80:boolean getLast(java.lang.String) -> getLast
-live.nodiyphoneshell.cend.utils.CommonImgEffectView -> live.nodiyphoneshell.cend.utils.CommonImgEffectView:
-    72:74:void <init>(android.content.Context) -> <init>
-    77:80:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
-    330:345:float computeDegree(android.graphics.Point,android.graphics.Point) -> computeDegree
-    216:239:boolean dispatchTouchEvent(android.view.MotionEvent) -> dispatchTouchEvent
-    373:374:void drawBackground(android.graphics.Canvas) -> drawBackground
-    386:390:void drawControlPoints(android.graphics.Canvas) -> drawControlPoints
-    377:382:void drawFrame(android.graphics.Canvas) -> drawFrame
-    356:356:float getDistanceOfTwoPoints(android.graphics.Point,android.graphics.Point) -> getDistanceOfTwoPoints
-    360:360:float getDistanceOfTwoPoints(float,float,float,float) -> getDistanceOfTwoPoints
-    165:192:int getOperationType(android.view.MotionEvent) -> getOperationType
-    88:129:void initData() -> initData
-    202:210:int isOnCP(int,int) -> isOnCP
-    157:160:boolean isOnPic(int,int) -> isOnPic
-    366:370:void onDraw(android.graphics.Canvas) -> onDraw
-    313:320:void rotate(android.view.MotionEvent) -> rotate
-    275:301:void scale(android.view.MotionEvent) -> scale
-    137:151:void setMatrix(int) -> setMatrix
-    251:262:void translate(int,int) -> translate
+    11:36:int getColor(java.lang.String) -> getColor
+    40:46:boolean getFirst(java.lang.String) -> getFirst
+    50:56:boolean getLast(java.lang.String) -> getLast
 live.nodiyphoneshell.cend.utils.CommonUtil -> live.nodiyphoneshell.cend.utils.CommonUtil:
     57:57:void <init>() -> <init>
     681:688:java.lang.String changeArgb(java.lang.String,double) -> changeArgb
@@ -71374,10 +71329,10 @@ live.nodiyphoneshell.cend.utils.CommonUtil$3 -> live.nodiyphoneshell.cend.utils.
     479:479:void <init>() -> <init>
     482:488:java.lang.CharSequence filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int) -> filter
 live.nodiyphoneshell.cend.utils.Cubic -> live.nodiyphoneshell.cend.utils.Cubic:
-    8:8:void <init>() -> <init>
-    17:17:double easeIn(double,double,double,double) -> easeIn
-    22:23:double easeInOut(double,double,double,double) -> easeInOut
-    12:12:double easeOut(double,double,double,double) -> easeOut
+    7:7:void <init>() -> <init>
+    16:16:double easeIn(double,double,double,double) -> easeIn
+    21:22:double easeInOut(double,double,double,double) -> easeInOut
+    11:11:double easeOut(double,double,double,double) -> easeOut
 live.nodiyphoneshell.cend.utils.DataCleanManager -> live.nodiyphoneshell.cend.utils.DataCleanManager:
     13:13:void <init>() -> <init>
     30:34:void clearAllCache(android.content.Context) -> clearAllCache
@@ -71965,46 +71920,45 @@ live.nodiyphoneshell.cend.view.process.ProcessActivity -> live.nodiyphoneshell.c
     44:102:void <init>() -> <init>
     270:276:void clearBitmapView() -> clearBitmapView
     249:265:void comeInComplete() -> comeInComplete
-    713:716:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
+    721:724:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
     176:243:void getScoketData() -> getScoketData
     44:44:int access$000(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> h
     44:44:int access$002(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> i
     143:171:void initData() -> initData
-    505:532:void initDataStatus() -> initDataStatus
+    506:532:void initDataStatus() -> initDataStatus
     536:573:void initDataStatusTimeOver() -> initDataStatusTimeOver
     111:111:int initLayout() -> initLayout
-    616:618:void initSelectData() -> initSelectData
+    616:617:void initSelectData() -> initSelectData
     118:131:void initView() -> initView
     581:582:boolean isDestroy(android.app.Activity) -> isDestroy
     44:44:void access$100(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> j
     44:44:void access$1000(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> k
-    44:44:void access$1100(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> l
+    44:44:void access$200(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> l
     591:611:void loadFireworks() -> loadFireworks
-    44:44:void access$200(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> m
-    44:44:boolean access$300(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> n
-    44:44:boolean access$302(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean) -> o
+    44:44:boolean access$300(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> m
+    44:44:boolean access$302(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean) -> n
+    44:44:void access$400(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> o
     106:107:void onCreate(android.os.Bundle) -> onCreate
-    280:282:void onDestroy() -> onDestroy
-    445:500:void onLineShowAndHide(int) -> onLineShowAndHide
-    703:704:void onPause() -> onPause
-    697:699:void onResume() -> onResume
-    708:709:void onStop() -> onStop
-    44:44:void access$400(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> p
-    44:44:java.lang.String access$500(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> q
-    44:44:java.lang.String access$502(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> r
-    44:44:java.lang.String access$600(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> s
-    287:375:void selctStatus(int) -> selctStatus
-    380:389:void startBrushImage() -> startBrushImage
-    419:440:void startPrintAginprogress(int) -> startPrintAginprogress
-    393:414:void startPrintprogress(int) -> startPrintprogress
-    650:673:void statProcessOnLineImage() -> statProcessOnLineImage
-    678:692:void statProcessPrintAgainImage(boolean,int) -> statProcessPrintAgainImage
-    623:645:void statProcessPrintImage(boolean,int) -> statProcessPrintImage
-    44:44:java.lang.String access$602(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> t
-    44:44:java.lang.String access$700(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> u
-    44:44:java.lang.String access$702(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> v
-    44:44:void access$800(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> w
-    44:44:void access$900(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> x
+    281:283:void onDestroy() -> onDestroy
+    446:501:void onLineShowAndHide(int) -> onLineShowAndHide
+    711:712:void onPause() -> onPause
+    705:707:void onResume() -> onResume
+    716:717:void onStop() -> onStop
+    44:44:java.lang.String access$500(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> p
+    44:44:java.lang.String access$502(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> q
+    44:44:java.lang.String access$600(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> r
+    44:44:java.lang.String access$602(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> s
+    289:375:void selctStatus(int) -> selctStatus
+    381:390:void startBrushImage() -> startBrushImage
+    420:441:void startPrintAginprogress(int) -> startPrintAginprogress
+    394:415:void startPrintprogress(int) -> startPrintprogress
+    681:681:void statProcessOnLineImage() -> statProcessOnLineImage
+    686:700:void statProcessPrintAgainImage(boolean,int) -> statProcessPrintAgainImage
+    622:653:void statProcessPrintImage(boolean,int) -> statProcessPrintImage
+    44:44:java.lang.String access$700(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> t
+    44:44:java.lang.String access$702(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> u
+    44:44:void access$800(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> v
+    44:44:void access$900(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> w
 live.nodiyphoneshell.cend.view.process.ProcessActivity$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$1:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
     176:176:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
@@ -72012,8 +71966,8 @@ live.nodiyphoneshell.cend.view.process.ProcessActivity$1 -> live.nodiyphoneshell
     180:241:void accept(live.nodiyphoneshell.cend.modules.RxProcessBean) -> accept
 live.nodiyphoneshell.cend.view.process.ProcessActivity$10 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$10:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    507:507:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    510:511:void run() -> run
+    508:508:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
+    511:512:void run() -> run
 live.nodiyphoneshell.cend.view.process.ProcessActivity$11 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$11:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
     538:538:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
@@ -72034,22 +71988,6 @@ live.nodiyphoneshell.cend.view.process.ProcessActivity$14$1 -> live.nodiyphonesh
     live.nodiyphoneshell.cend.view.process.ProcessActivity$14 this$1 -> a
     600:600:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$14) -> <init>
     603:604:void onAnimationEnd() -> onAnimationEnd
-live.nodiyphoneshell.cend.view.process.ProcessActivity$15 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$15:
-    live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> c
-    boolean val$IsComeProcess -> a
-    int val$type -> b
-    631:631:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> <init>
-    634:643:void onAnimationEnd() -> onAnimationEnd
-live.nodiyphoneshell.cend.view.process.ProcessActivity$16 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$16:
-    live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    657:657:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    660:671:void onAnimationEnd() -> onAnimationEnd
-live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1:
-    665:665:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$16) -> <init>
-    669:669:void onAnimationEnd() -> onAnimationEnd
-live.nodiyphoneshell.cend.view.process.ProcessActivity$17 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$17:
-    686:686:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    690:690:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$2 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$2:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
     249:249:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
@@ -72060,135 +71998,126 @@ live.nodiyphoneshell.cend.view.process.ProcessActivity$2$1 -> live.nodiyphoneshe
     255:261:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$3 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$3:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    299:299:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    299:299:void onResourceReady(java.lang.Object,com.bumptech.glide.request.transition.Transition) -> onResourceReady
-    302:304:void onResourceReady(android.graphics.Bitmap,com.bumptech.glide.request.transition.Transition) -> onResourceReady
+    301:301:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
+    301:301:void onResourceReady(java.lang.Object,com.bumptech.glide.request.transition.Transition) -> onResourceReady
+    304:306:void onResourceReady(android.graphics.Bitmap,com.bumptech.glide.request.transition.Transition) -> onResourceReady
 live.nodiyphoneshell.cend.view.process.ProcessActivity$4 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$4:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    332:332:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    335:336:void run() -> run
+    334:334:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
+    337:338:void run() -> run
 live.nodiyphoneshell.cend.view.process.ProcessActivity$5 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$5:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> b
     int val$type -> a
-    394:394:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init>
-    397:412:void onAnimationEnd() -> onAnimationEnd
+    395:395:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init>
+    398:413:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$5$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$5$1:
     live.nodiyphoneshell.cend.view.process.ProcessActivity$5 this$1 -> a
-    398:398:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$5) -> <init>
-    401:410:void onAnimationEnd() -> onAnimationEnd
+    399:399:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$5) -> <init>
+    402:411:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$6 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$6:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> b
     int val$type -> a
-    420:420:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init>
-    423:438:void onAnimationEnd() -> onAnimationEnd
+    421:421:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init>
+    424:439:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$6$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$6$1:
     live.nodiyphoneshell.cend.view.process.ProcessActivity$6 this$1 -> a
-    424:424:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$6) -> <init>
-    427:436:void onAnimationEnd() -> onAnimationEnd
+    425:425:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$6) -> <init>
+    428:437:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$7 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$7:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    468:468:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    471:472:void onAnimationEnd() -> onAnimationEnd
+    469:469:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
+    472:473:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$8 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$8:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    478:478:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    481:482:void onAnimationEnd() -> onAnimationEnd
+    479:479:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
+    482:483:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity$9 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$9:
     live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
-    488:488:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    491:492:void onAnimationEnd() -> onAnimationEnd
+    489:489:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
+    492:493:void onAnimationEnd() -> onAnimationEnd
 live.nodiyphoneshell.cend.view.process.ProcessActivity_ViewBinding -> live.nodiyphoneshell.cend.view.process.ProcessActivity_ViewBinding:
     22:23:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
-    26:43:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,android.view.View) -> <init>
-    48:49:void unbind() -> unbind
+    26:40:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,android.view.View) -> <init>
+    45:46:void unbind() -> unbind
 live.nodiyphoneshell.cend.view.process.ProcessPresenter -> live.nodiyphoneshell.cend.view.process.ProcessPresenter:
-    21:24:void <init>(live.nodiyphoneshell.cend.view.process.ProcessContract$View,android.content.Context) -> <init>
-    16:16:live.nodiyphoneshell.cend.view.process.ProcessContract$View access$000(live.nodiyphoneshell.cend.view.process.ProcessPresenter) -> a
-    29:47:void getBanner(java.lang.String,java.lang.String) -> getBanner
+    17:20:void <init>(live.nodiyphoneshell.cend.view.process.ProcessContract$View,android.content.Context) -> <init>
+    12:12:live.nodiyphoneshell.cend.view.process.ProcessContract$View access$000(live.nodiyphoneshell.cend.view.process.ProcessPresenter) -> a
+    24:42:void getBanner(java.lang.String,java.lang.String) -> getBanner
 live.nodiyphoneshell.cend.view.process.ProcessPresenter$1 -> live.nodiyphoneshell.cend.view.process.ProcessPresenter$1:
     live.nodiyphoneshell.cend.view.process.ProcessPresenter this$0 -> a
-    35:35:void <init>(live.nodiyphoneshell.cend.view.process.ProcessPresenter) -> <init>
-    38:39:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
-    35:35:void onResponse(java.lang.Object,int) -> onResponse
-    43:45:void onResponse(java.lang.String,int) -> onResponse
+    30:30:void <init>(live.nodiyphoneshell.cend.view.process.ProcessPresenter) -> <init>
+    33:34:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
+    30:30:void onResponse(java.lang.Object,int) -> onResponse
+    38:40:void onResponse(java.lang.String,int) -> onResponse
 live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity -> live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity:
-    37:55:void <init>() -> <init>
-    226:229:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
-    167:168:void getBanner(java.lang.String,java.lang.String) -> getBanner
-    172:178:void getBannerSuccessed(java.lang.String) -> getBannerSuccessed
-    105:106:void initData() -> initData
-    65:65:int initLayout() -> initLayout
-    72:100:void initView() -> initView
-    60:61:void onCreate(android.os.Bundle) -> onCreate
-    155:163:void onDestroy() -> onDestroy
-    138:142:void onPause() -> onPause
-    129:134:void onResume() -> onResume
-    146:150:void onStop() -> onStop
-    114:124:void onclick(android.view.View) -> onclick
+    15:15:void <init>() -> <init>
+    102:105:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
+    92:93:void getBanner(java.lang.String,java.lang.String) -> getBanner
+    98:98:void getBannerSuccessed(java.lang.String) -> getBannerSuccessed
+    64:64:void initData() -> initData
+    37:37:int initLayout() -> initLayout
+    43:59:void initView() -> initView
+    32:33:void onCreate(android.os.Bundle) -> onCreate
+    84:88:void onDestroy() -> onDestroy
+    74:75:void onPause() -> onPause
+    68:70:void onResume() -> onResume
+    79:80:void onStop() -> onStop
 live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding -> live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding:
-    26:27:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity) -> <init>
-    30:55:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity,android.view.View) -> <init>
-    60:61:void unbind() -> unbind
-live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding$1 -> live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding$1:
-    live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity val$target -> b
-    41:41:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding,live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity) -> <init>
-    44:45:void doClick(android.view.View) -> doClick
-live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding$2 -> live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding$2:
-    live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity val$target -> b
-    49:49:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding,live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity) -> <init>
-    52:53:void doClick(android.view.View) -> doClick
+    19:20:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity) -> <init>
+    23:29:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity,android.view.View) -> <init>
+    34:35:void unbind() -> unbind
 live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter -> live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter:
     18:21:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelContract$View,android.content.Context) -> <init>
     13:13:live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelContract$View access$000(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter) -> a
-    26:45:void getBanner(java.lang.String,java.lang.String) -> getBanner
+    26:44:void getBanner(java.lang.String,java.lang.String) -> getBanner
 live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter$1 -> live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter$1:
     live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter this$0 -> a
     33:33:void <init>(live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelPresenter) -> <init>
     36:37:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
     33:33:void onResponse(java.lang.Object,int) -> onResponse
-    41:43:void onResponse(java.lang.String,int) -> onResponse
+    40:42:void onResponse(java.lang.String,int) -> onResponse
 live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity -> live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity:
     27:55:void <init>() -> <init>
-    237:240:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
-    161:190:void downAndUp() -> downAndUp
+    236:239:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
+    160:189:void downAndUp() -> downAndUp
     27:27:void access$000(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity) -> h
-    204:204:void initData() -> initData
+    203:203:void initData() -> initData
     64:64:int initLayout() -> initLayout
-    70:156:void initView() -> initView
+    70:155:void initView() -> initView
     59:60:void onCreate(android.os.Bundle) -> onCreate
-    195:199:void onDestroy() -> onDestroy
-    227:228:void onPause() -> onPause
-    221:223:void onResume() -> onResume
-    232:233:void onStop() -> onStop
-    210:217:void onclick(android.view.View) -> onclick
+    194:198:void onDestroy() -> onDestroy
+    226:227:void onPause() -> onPause
+    220:222:void onResume() -> onResume
+    231:232:void onStop() -> onStop
+    209:216:void onclick(android.view.View) -> onclick
 live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1 -> live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1:
     live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity this$0 -> a
     83:83:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity) -> <init>
-    150:150:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
-    90:146:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-    154:154:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
+    149:149:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
+    90:145:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
+    153:153:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
     87:87:void onAnimationStart(android.animation.Animator) -> onAnimationStart
 live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1 -> live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1:
     live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1 this$1 -> a
-    99:99:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1) -> <init>
-    140:140:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
-    106:136:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-    144:144:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
-    103:103:void onAnimationStart(android.animation.Animator) -> onAnimationStart
+    98:98:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1) -> <init>
+    139:139:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
+    105:135:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
+    143:143:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
+    102:102:void onAnimationStart(android.animation.Animator) -> onAnimationStart
 live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1$1 -> live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1$1:
     live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1 this$2 -> a
-    111:111:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1) -> <init>
-    130:130:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
-    118:126:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-    134:134:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
-    115:115:void onAnimationStart(android.animation.Animator) -> onAnimationStart
+    110:110:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$1$1) -> <init>
+    129:129:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
+    117:125:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
+    133:133:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
+    114:114:void onAnimationStart(android.animation.Animator) -> onAnimationStart
 live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$2 -> live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity$2:
     live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity this$0 -> a
-    167:167:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity) -> <init>
-    184:184:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
-    174:180:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
-    188:188:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
-    171:171:void onAnimationStart(android.animation.Animator) -> onAnimationStart
+    166:166:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity) -> <init>
+    183:183:void onAnimationCancel(android.animation.Animator) -> onAnimationCancel
+    173:179:void onAnimationEnd(android.animation.Animator) -> onAnimationEnd
+    187:187:void onAnimationRepeat(android.animation.Animator) -> onAnimationRepeat
+    170:170:void onAnimationStart(android.animation.Animator) -> onAnimationStart
 live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity_ViewBinding -> live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity_ViewBinding:
     25:26:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity) -> <init>
     29:49:void <init>(live.nodiyphoneshell.cend.view.process.complete.ProcessCompleteActivity,android.view.View) -> <init>
@@ -72203,61 +72132,61 @@ live.nodiyphoneshell.cend.websocket.-$$Lambda$XYDClient$cfQ04nFyti_QA5vcO982mbFE
     live.nodiyphoneshell.cend.websocket.XYDClient f$0 -> a
 live.nodiyphoneshell.cend.websocket.XYDClient -> live.nodiyphoneshell.cend.websocket.XYDClient:
     live.nodiyphoneshell.cend.wsmanager.listener.WsStatusListener wsStatusListener -> a
-    98:106:void <init>(android.content.Context) -> <init>
-    65:65:java.lang.String access$000(live.nodiyphoneshell.cend.websocket.XYDClient) -> a
-    65:65:android.content.Context access$100(live.nodiyphoneshell.cend.websocket.XYDClient) -> b
-    65:65:void access$200(live.nodiyphoneshell.cend.websocket.XYDClient,org.json.JSONObject) -> c
-    65:65:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$300(live.nodiyphoneshell.cend.websocket.XYDClient) -> d
-    65:65:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$302(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.dialog.DialogMessageDialog) -> e
-    65:65:void access$400(live.nodiyphoneshell.cend.websocket.XYDClient) -> f
-    503:505:double formatDouble2(double) -> formatDouble2
-    65:65:double access$500(live.nodiyphoneshell.cend.websocket.XYDClient,double) -> g
-    451:499:void getCoveWidth(java.lang.String,live.nodiyphoneshell.cend.modules.ProcessBean) -> getCoveWidth
-    84:91:live.nodiyphoneshell.cend.websocket.XYDClient getInstance(android.content.Context) -> getInstance
-    65:65:void access$600(live.nodiyphoneshell.cend.websocket.XYDClient,int,live.nodiyphoneshell.cend.modules.ProcessBean) -> h
-    139:139:void lambda$init$1(long) -> i
-    113:141:void init() -> init
-    426:448:void initFailData() -> initFailData
-    105:105:void lambda$new$0(long) -> j
-    196:203:void saveFileText(java.lang.String,java.lang.String) -> saveFileText
-    148:147:void sendData(java.lang.String) -> sendData
-    180:189:void sendPingText() -> sendPingText
-    512:522:void sendProcessData(int,live.nodiyphoneshell.cend.modules.ProcessBean) -> sendProcessData
-    211:225:void sendReceiveMessage(org.json.JSONObject) -> sendReceiveMessage
-    165:173:void stopWebSocketRequest() -> stopWebSocketRequest
+    85:93:void <init>(android.content.Context) -> <init>
+    53:53:java.lang.String access$000(live.nodiyphoneshell.cend.websocket.XYDClient) -> a
+    53:53:android.content.Context access$100(live.nodiyphoneshell.cend.websocket.XYDClient) -> b
+    53:53:void access$200(live.nodiyphoneshell.cend.websocket.XYDClient,org.json.JSONObject) -> c
+    53:53:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$300(live.nodiyphoneshell.cend.websocket.XYDClient) -> d
+    53:53:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$302(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.dialog.DialogMessageDialog) -> e
+    53:53:void access$400(live.nodiyphoneshell.cend.websocket.XYDClient) -> f
+    481:483:double formatDouble2(double) -> formatDouble2
+    53:53:double access$500(live.nodiyphoneshell.cend.websocket.XYDClient,double) -> g
+    430:477:void getCoveWidth(java.lang.String,live.nodiyphoneshell.cend.modules.ProcessBean) -> getCoveWidth
+    71:78:live.nodiyphoneshell.cend.websocket.XYDClient getInstance(android.content.Context) -> getInstance
+    53:53:void access$600(live.nodiyphoneshell.cend.websocket.XYDClient,int,live.nodiyphoneshell.cend.modules.ProcessBean) -> h
+    126:126:void lambda$init$1(long) -> i
+    100:128:void init() -> init
+    406:427:void initFailData() -> initFailData
+    92:92:void lambda$new$0(long) -> j
+    180:187:void saveFileText(java.lang.String,java.lang.String) -> saveFileText
+    134:133:void sendData(java.lang.String) -> sendData
+    165:174:void sendPingText() -> sendPingText
+    490:500:void sendProcessData(int,live.nodiyphoneshell.cend.modules.ProcessBean) -> sendProcessData
+    194:208:void sendReceiveMessage(org.json.JSONObject) -> sendReceiveMessage
+    150:158:void stopWebSocketRequest() -> stopWebSocketRequest
 live.nodiyphoneshell.cend.websocket.XYDClient$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$1:
     live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> a
-    231:231:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient) -> <init>
-    413:414:void onClosed(int,java.lang.String) -> onClosed
-    407:408:void onClosing(int,java.lang.String) -> onClosing
-    419:420:void onFailure(java.lang.Throwable,okhttp3.Response) -> onFailure
-    266:390:void onMessage(java.lang.String) -> onMessage
-    395:396:void onMessage(okio.ByteString) -> onMessage
-    234:257:void onOpen(okhttp3.Response) -> onOpen
-    401:402:void onReconnect() -> onReconnect
+    213:213:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient) -> <init>
+    393:394:void onClosed(int,java.lang.String) -> onClosed
+    387:388:void onClosing(int,java.lang.String) -> onClosing
+    399:400:void onFailure(java.lang.Throwable,okhttp3.Response) -> onFailure
+    247:370:void onMessage(java.lang.String) -> onMessage
+    375:376:void onMessage(okio.ByteString) -> onMessage
+    216:239:void onOpen(okhttp3.Response) -> onOpen
+    381:382:void onReconnect() -> onReconnect
 live.nodiyphoneshell.cend.websocket.XYDClient$2 -> live.nodiyphoneshell.cend.websocket.XYDClient$2:
     live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> b
     int val$timeTime -> a
-    433:433:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,int) -> <init>
-    436:445:void action(int,int,int) -> action
+    412:412:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,int) -> <init>
+    415:424:void action(int,int,int) -> action
 live.nodiyphoneshell.cend.websocket.XYDClient$2$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$2$1:
-    436:436:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$2) -> <init>
-    440:440:void action(int,int) -> action
+    415:415:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$2) -> <init>
+    419:419:void action(int,int) -> action
 live.nodiyphoneshell.cend.websocket.XYDClient$3 -> live.nodiyphoneshell.cend.websocket.XYDClient$3:
     live.nodiyphoneshell.cend.modules.ProcessBean val$processBean -> a
     live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> b
-    455:455:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.modules.ProcessBean) -> <init>
-    458:459:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
-    455:455:void onResponse(java.lang.Object,int) -> onResponse
-    463:497:void onResponse(java.lang.String,int) -> onResponse
+    434:434:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.modules.ProcessBean) -> <init>
+    437:438:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
+    434:434:void onResponse(java.lang.Object,int) -> onResponse
+    441:475:void onResponse(java.lang.String,int) -> onResponse
 live.nodiyphoneshell.cend.websocket.XYDClient$3$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$3$1:
     live.nodiyphoneshell.cend.websocket.XYDClient$3 this$1 -> b
     int val$timeTime -> a
-    482:482:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3,int) -> <init>
-    485:494:void action(int,int,int) -> action
+    460:460:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3,int) -> <init>
+    463:472:void action(int,int,int) -> action
 live.nodiyphoneshell.cend.websocket.XYDClient$3$1$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$3$1$1:
-    485:485:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3$1) -> <init>
-    489:489:void action(int,int) -> action
+    463:463:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3$1) -> <init>
+    467:467:void action(int,int) -> action
 live.nodiyphoneshell.cend.widget.CircleBackColorView -> live.nodiyphoneshell.cend.widget.CircleBackColorView:
     17:18:void <init>(android.content.Context) -> <init>
     21:22:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
@@ -72280,11 +72209,11 @@ live.nodiyphoneshell.cend.widget.CornerTransform -> live.nodiyphoneshell.cend.wi
     116:116:void updateDiskCacheKey(java.security.MessageDigest) -> updateDiskCacheKey
 live.nodiyphoneshell.cend.widget.CustomViewPager -> live.nodiyphoneshell.cend.widget.CustomViewPager:
     14:15:void <init>(android.content.Context) -> <init>
-    18:19:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
-    31:31:boolean onInterceptTouchEvent(android.view.MotionEvent) -> onInterceptTouchEvent
-    36:36:boolean onTouchEvent(android.view.MotionEvent) -> onTouchEvent
-    41:42:void setCurrentItem(int) -> setCurrentItem
-    26:27:void setScanScroll(boolean) -> setScanScroll
+    17:18:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
+    29:29:boolean onInterceptTouchEvent(android.view.MotionEvent) -> onInterceptTouchEvent
+    34:34:boolean onTouchEvent(android.view.MotionEvent) -> onTouchEvent
+    39:40:void setCurrentItem(int) -> setCurrentItem
+    24:25:void setScanScroll(boolean) -> setScanScroll
 live.nodiyphoneshell.cend.widget.CustomWebView -> live.nodiyphoneshell.cend.widget.CustomWebView:
     15:16:void <init>(android.content.Context) -> <init>
     20:21:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
@@ -72296,95 +72225,90 @@ live.nodiyphoneshell.cend.widget.DragScaleView -> live.nodiyphoneshell.cend.widg
     int screenHeight -> b
     int lastX -> c
     int screenWidth -> a
-    49:52:void <init>(android.content.Context,android.util.AttributeSet,int) -> <init>
-    55:58:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
-    61:64:void <init>(android.content.Context) -> <init>
-    103:150:void delDrag(android.view.View,android.view.MotionEvent,int) -> a
-    256:284:int getDirection(android.view.View,int,int) -> b
-    206:213:void bottom(android.view.View,int) -> bottom
-    44:46:void initScreenW_H() -> c
-    160:181:void center(android.view.View,int,int) -> center
-    302:302:int getCutHeight() -> getCutHeight
-    293:293:int getCutWidth() -> getCutWidth
-    238:245:void left(android.view.View,int) -> left
-    68:74:void onDraw(android.graphics.Canvas) -> onDraw
-    78:92:boolean onTouch(android.view.View,android.view.MotionEvent) -> onTouch
-    222:229:void right(android.view.View,int) -> right
-    190:197:void top(android.view.View,int) -> top
+    45:48:void <init>(android.content.Context,android.util.AttributeSet,int) -> <init>
+    51:54:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
+    57:60:void <init>(android.content.Context) -> <init>
+    97:144:void delDrag(android.view.View,android.view.MotionEvent,int) -> a
+    250:278:int getDirection(android.view.View,int,int) -> b
+    200:207:void bottom(android.view.View,int) -> bottom
+    40:42:void initScreenW_H() -> c
+    154:175:void center(android.view.View,int,int) -> center
+    296:296:int getCutHeight() -> getCutHeight
+    287:287:int getCutWidth() -> getCutWidth
+    232:239:void left(android.view.View,int) -> left
+    64:70:void onDraw(android.graphics.Canvas) -> onDraw
+    74:87:boolean onTouch(android.view.View,android.view.MotionEvent) -> onTouch
+    216:223:void right(android.view.View,int) -> right
+    184:191:void top(android.view.View,int) -> top
 live.nodiyphoneshell.cend.widget.HProgressBar -> live.nodiyphoneshell.cend.widget.HProgressBar:
-    51:53:void <init>(android.content.Context) -> <init>
-    56:88:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
-    92:93:void <init>(android.content.Context,android.util.AttributeSet,int) -> <init>
-    98:99:void <init>(android.content.Context,android.util.AttributeSet,int,int) -> <init>
-    176:176:float getProgress() -> getProgress
-    102:117:void initDefStyleAttr(android.util.AttributeSet) -> initDefStyleAttr
-    130:154:void onDraw(android.graphics.Canvas) -> onDraw
-    122:125:void onMeasure(int,int) -> onMeasure
-    180:181:void setProgress(float) -> setProgress
-    188:189:void setmMaxProgress(int) -> setmMaxProgress
-live.nodiyphoneshell.cend.widget.MainView -> live.nodiyphoneshell.cend.widget.MainView:
-    31:40:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
-    42:55:void rotate(int,int) -> a
-    79:81:void dispatchDraw(android.graphics.Canvas) -> dispatchDraw
-    58:75:boolean onTouchEvent(android.view.MotionEvent) -> onTouchEvent
+    50:51:void <init>(android.content.Context) -> <init>
+    54:80:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
+    83:84:void <init>(android.content.Context,android.util.AttributeSet,int) -> <init>
+    88:89:void <init>(android.content.Context,android.util.AttributeSet,int,int) -> <init>
+    145:145:float getProgress() -> getProgress
+    92:107:void initDefStyleAttr(android.util.AttributeSet) -> initDefStyleAttr
+    118:142:void onDraw(android.graphics.Canvas) -> onDraw
+    111:114:void onMeasure(int,int) -> onMeasure
+    149:150:void setProgress(float) -> setProgress
+    157:158:void setmMaxProgress(int) -> setmMaxProgress
 live.nodiyphoneshell.cend.widget.MaskImage -> live.nodiyphoneshell.cend.widget.MaskImage:
     22:23:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
-    26:50:void setBackAndImage(int,android.graphics.Bitmap,android.graphics.Bitmap) -> setBackAndImage
+    26:47:void setBackAndImage(int,android.graphics.Bitmap,android.graphics.Bitmap) -> setBackAndImage
 live.nodiyphoneshell.cend.widget.MyAutoLayoutManager -> live.nodiyphoneshell.cend.widget.MyAutoLayoutManager:
-    9:11:void <init>() -> <init>
-    16:16:androidx.recyclerview.widget.RecyclerView$LayoutParams generateDefaultLayoutParams() -> generateDefaultLayoutParams
-    23:54:void onLayoutChildren(androidx.recyclerview.widget.RecyclerView$Recycler,androidx.recyclerview.widget.RecyclerView$State) -> onLayoutChildren
+    6:8:void <init>() -> <init>
+    12:12:androidx.recyclerview.widget.RecyclerView$LayoutParams generateDefaultLayoutParams() -> generateDefaultLayoutParams
+    19:50:void onLayoutChildren(androidx.recyclerview.widget.RecyclerView$Recycler,androidx.recyclerview.widget.RecyclerView$State) -> onLayoutChildren
 live.nodiyphoneshell.cend.widget.MyBitmapViewAnother -> live.nodiyphoneshell.cend.widget.MyBitmapViewAnother:
     62:63:void <init>(android.content.Context) -> <init>
-    66:91:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
+    66:89:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
     27:27:int access$002(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother,int) -> a
     27:27:int access$102(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother,int) -> b
     27:27:void access$200(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> c
-    305:311:void cancel() -> cancel
-    317:323:void cancelAgainCome() -> cancelAgainCome
-    282:291:void clearLine() -> clearLine
-    295:299:void clearLineAgainCome() -> clearLineAgainCome
+    302:308:void cancel() -> cancel
+    314:320:void cancelAgainCome() -> cancelAgainCome
+    279:288:void clearLine() -> clearLine
+    292:296:void clearLineAgainCome() -> clearLineAgainCome
     27:27:io.reactivex.disposables.Disposable access$302(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother,io.reactivex.disposables.Disposable) -> d
     27:27:boolean access$400(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> e
     27:27:float access$500(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> f
     27:27:float access$502(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother,float) -> g
     27:27:int access$600(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> h
-    143:154:void hasBrushAllComplete() -> hasBrushAllComplete
+    140:151:void hasBrushAllComplete() -> hasBrushAllComplete
     27:27:float access$700(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> i
-    203:213:void interval() -> interval
-    220:231:void intervalCome() -> intervalCome
+    200:210:void interval() -> interval
+    217:228:void intervalCome() -> intervalCome
     27:27:android.graphics.Path access$800(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> j
-    107:118:void onDraw(android.graphics.Canvas) -> onDraw
-    95:103:void onMeasure(int,int) -> onMeasure
-    237:278:void setProcessTime(int,int,int) -> setProcessTime
-    134:138:void starClearDrawBitmapImage() -> starClearDrawBitmapImage
-    157:196:void starHasBprogressImage(int,int,int,android.widget.ImageView,int) -> starHasBprogressImage
-    127:131:void starNoDrawBitmapImage(int,int) -> starNoDrawBitmapImage
-    121:124:void startBitmapImage(android.graphics.Bitmap,float) -> startBitmapImage
+    105:116:void onDraw(android.graphics.Canvas) -> onDraw
+    93:101:void onMeasure(int,int) -> onMeasure
+    234:275:void setProcessTime(int,int,int) -> setProcessTime
+    132:136:void starClearDrawBitmapImage() -> starClearDrawBitmapImage
+    154:193:void starHasBprogressImage(int,int,int,android.widget.ImageView,int) -> starHasBprogressImage
+    125:129:void starNoDrawBitmapImage(int,int) -> starNoDrawBitmapImage
+    119:122:void startBitmapImage(android.graphics.Bitmap,float) -> startBitmapImage
 live.nodiyphoneshell.cend.widget.MyBitmapViewAnother$1 -> live.nodiyphoneshell.cend.widget.MyBitmapViewAnother$1:
     live.nodiyphoneshell.cend.widget.MyBitmapViewAnother this$0 -> a
-    204:204:void <init>(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> <init>
-    207:210:void action(int,int) -> action
+    201:201:void <init>(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> <init>
+    204:207:void action(int,int) -> action
 live.nodiyphoneshell.cend.widget.MyBitmapViewAnother$2 -> live.nodiyphoneshell.cend.widget.MyBitmapViewAnother$2:
     live.nodiyphoneshell.cend.widget.MyBitmapViewAnother this$0 -> a
-    222:222:void <init>(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> <init>
-    225:228:void action(int,int) -> action
+    219:219:void <init>(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother) -> <init>
+    222:225:void action(int,int) -> action
 live.nodiyphoneshell.cend.widget.MyBitmapViewAnother$3 -> live.nodiyphoneshell.cend.widget.MyBitmapViewAnother$3:
     live.nodiyphoneshell.cend.widget.MyBitmapViewAnother this$0 -> b
     int val$startY -> a
-    243:243:void <init>(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother,int) -> <init>
-    275:275:void onComplete() -> onComplete
-    271:271:void onError(java.lang.Throwable) -> onError
-    243:243:void onNext(java.lang.Object) -> onNext
-    250:267:void onNext(java.lang.Long) -> onNext
-    246:247:void onSubscribe(io.reactivex.disposables.Disposable) -> onSubscribe
+    240:240:void <init>(live.nodiyphoneshell.cend.widget.MyBitmapViewAnother,int) -> <init>
+    272:272:void onComplete() -> onComplete
+    268:268:void onError(java.lang.Throwable) -> onError
+    240:240:void onNext(java.lang.Object) -> onNext
+    247:264:void onNext(java.lang.Long) -> onNext
+    243:244:void onSubscribe(io.reactivex.disposables.Disposable) -> onSubscribe
 live.nodiyphoneshell.cend.widget.MyCropMoveView -> live.nodiyphoneshell.cend.widget.MyCropMoveView:
     23:25:void <init>(android.content.Context,android.graphics.Bitmap) -> <init>
     28:30:void <init>(android.content.Context,android.util.AttributeSet,android.graphics.Bitmap) -> <init>
-    34:35:void <init>(android.content.Context,android.util.AttributeSet,int) -> <init>
-    40:42:void init() -> init
-    47:76:void onDraw(android.graphics.Canvas) -> onDraw
-    131:133:void setMethod(int) -> setMethod
+    33:34:void <init>(android.content.Context,android.util.AttributeSet,int) -> <init>
+    37:39:void init() -> init
+    43:72:void onDraw(android.graphics.Canvas) -> onDraw
+    75:77:void setMethod(int) -> setMethod
 live.nodiyphoneshell.cend.widget.MyGridView -> live.nodiyphoneshell.cend.widget.MyGridView:
     14:15:void <init>(android.content.Context) -> <init>
     18:19:void <init>(android.content.Context,android.util.AttributeSet) -> <init>

app/src/main/AndroidManifest.xml

@@ -41,14 +41,13 @@
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission
         android:name="android.permission.DEVICE_POWER"
-        tools:ignore="ProtectedPermissions" />
-    <!--android:theme="@style/AppTheme"-->
+        tools:ignore="ProtectedPermissions"/>
     <application
         android:name=".CustomApplication"
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@drawable/app_logo"
-        android:label="色彩手机壳"
+        android:label="自动色彩手机壳"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
@@ -67,7 +66,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <!--<category android:name="android.intent.category.FS_HOME" />-->
                 <category android:name="android.intent.category.HOME" />
             </intent-filter>
         </activity>
@@ -77,33 +75,6 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
-        <!--android:largeHeap="true"
-         android:hardwareAccelerated="false"-->
-        <activity
-            android:name=".view.home.make.RealMakeActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:largeHeap="true"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize|stateHidden" />
-        <activity
-            android:name=".view.pay.PaySuccessActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".view.pay.PayActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".view.online.OnLineActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
         <activity
             android:name=".view.process.ProcessActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -111,23 +82,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
         <activity
-            android:name=".view.wrok.WorkActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".view.wrok.detail.WorkDetailActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".view.goodSize.GoodSizeActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:hardwareAccelerated="false"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
             android:name=".view.machine.MachineCodeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
@@ -145,22 +99,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
         <activity
-            android:name=".view.good.GoodSelectActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".activities.testAnimationActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
-        <activity
             android:name=".view.process.complete.ProcessCompleteActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
-
         <service
             android:name="live.nodiyphoneshell.cend.service.AutoInstallService"
             android:label="@string/aby_label"

app/src/main/assets/html/fireworks.html

-<!DOCTYPE html>
-<html >
-<meta charset="utf-8">
-
-<body style="color: transparent;width:100%;height:100%;">
-
-<div  onclick="startfireworks()">点击开始</div>
-<script>
-			    var raf = (function() {
-				var TIME = Math.floor(1000 / 60);
-				var frame, cancel;
-				var frames = {};
-				var lastFrameTime = 0;
-				if (typeof requestAnimationFrame === 'function' && typeof cancelAnimationFrame === 'function') {
-					frame = function(cb) {
-						var id = Math.random();
-
-						frames[id] = requestAnimationFrame(function onFrame(time) {
-							if (lastFrameTime === time || lastFrameTime + TIME - 1 < time) {
-								lastFrameTime = time;
-								delete frames[id];
-
-								cb();
-							} else {
-								frames[id] = requestAnimationFrame(onFrame);
-							}
-						});
-
-						return id;
-					};
-					cancel = function(id) {
-						if (frames[id]) {
-							cancelAnimationFrame(frames[id]);
-						}
-					};
-				} else {
-					frame = function(cb) {
-						return setTimeout(cb, TIME);
-					};
-					cancel = function(timer) {
-						return clearTimeout(timer);
-					};
-				}
-
-				return {
-					frame: frame,
-					cancel: cancel
-				};
-			}());
-
-			function toDecimal(str) {
-				return parseInt(str, 16);
-			}
-
-			function hexToRgb(str) {
-				var val = String(str).replace(/[^0-9a-f]/gi, '');
-
-				if (val.length < 6) {
-					val = val[0] + val[0] + val[1] + val[1] + val[2] + val[2];
-				}
-
-				return {
-					r: toDecimal(val.substring(0, 2)),
-					g: toDecimal(val.substring(2, 4)),
-					b: toDecimal(val.substring(4, 6))
-				};
-			}
-
-			function updateFetti(context, fetti) {
-				var progress = (fetti.tick++) / fetti.totalTicks;
-				if (progress > 1) {
-					return;
-				}
-				fetti.x += Math.cos(fetti.angle2D) * fetti.velocity; // 左下角
-				fetti.y += Math.sin(fetti.angle2D) * fetti.velocity + fetti.gravity; // 左下角
-
-				fetti.velocity *= fetti.decay;
-				fetti.tiltAngle += 0.1;
-				fetti.tiltSin = Math.sin(fetti.tiltAngle);
-				fetti.tiltCos = Math.cos(fetti.tiltAngle);
-				fetti.random = Math.random() + 7;
-
-				var x1 = fetti.x;
-				var y1 = fetti.y;
-
-				var x2 = fetti.x + (fetti.random * fetti.tiltCos); // 左上角
-				var y2 = fetti.y + (fetti.random * fetti.tiltSin); // 左上角
-
-				var x3 = x2 + fetti.random;
-				var y3 = y2;
-
-				var x4 = fetti.x + fetti.random;
-				var y4 = fetti.y;
-
-
-				context.fillStyle = 'rgba(' + fetti.color.r + ', ' + fetti.color.g + ', ' + fetti.color.b + ', ' + (1 - progress) +
-					')';
-				context.beginPath();
-
-				context.moveTo(Math.floor(x1), Math.floor(y1));
-				context.lineTo(Math.floor(x2), Math.floor(y2));
-				context.lineTo(Math.floor(x3), Math.floor(y3));
-				context.lineTo(Math.floor(x4), Math.floor(y4));
-
-				context.closePath();
-				context.fill();
-
-				return fetti.tick < fetti.totalTicks;
-			}
-
-			function getCanvas(zIndex) {
-				var canvas = document.createElement('canvas');
-
-				canvas.style.position = 'fixed';
-				canvas.style.top = '0px';
-				canvas.style.left = '0px';
-				canvas.style.pointerEvents = 'none';
-				canvas.style.zIndex = zIndex;
-
-				return canvas;
-			}
-
-			function setCanvasWindowSize(canvas) {
-				canvas.width = document.documentElement.clientWidth;
-				canvas.height = document.documentElement.clientHeight;
-
-			}
-			const canvas = getCanvas(200);
-
-			setCanvasWindowSize(canvas);
-			document.body.appendChild(canvas);
-			var context = canvas.getContext('2d');
-			const colors = [
-				'#26ccff',
-				'#a25afd',
-				'#ff5e7e',
-				'#88ff5a',
-				'#fcff42',
-				'#ffa62d',
-				'#ff36ff',
-				'#7f7522',
-				'#2e3a1f',
-				'#181d4b',
-				'#0c212b',
-				'#d71345'
-			];
-			var arr = []
-			for (let i = 0; i < 20; i++) {
-				arr.push({
-					"x": 0,
-					"y": document.documentElement.clientHeight / 3,
-					"velocity": (45 * 0.5) + (Math.random() * 20),
-					"angle2D": 3 / 2 * Math.PI + Math.random() * 1 / 4 * Math.PI,
-					"tiltAngle": Math.random() * Math.PI,
-					"color": hexToRgb(colors[Math.floor(Math.random() * 12)]),
-					"tick": 0,
-					"totalTicks": 200,
-					"decay": 0.9,
-					"random": 0,
-					"tiltSin": 0,
-					"tiltCos": 0,
-					"gravity": 3,
-					"scalar": 1
-				})
-			}
-			var animationFrame = null;
-
-			function update() {
-				context.clearRect(0, 0, canvas.width, canvas.height);
-				arr = arr.filter(item => {
-					return updateFetti(context, item);
-				});
-
-				if (arr.length) {
-					animationFrame = raf.frame(update);
-				}
-			}
-
-			function startfireworks() {
-						alert("进来")
-				 if (!animationFrame) {
-					//alert("进来")
-					animationFrame = raf.frame(update);
-				} else {
-						//alert("进来下面")
-					for (let i = 0; i < 20; i++) {
-						arr.push({
-							"x": 0,
-							//"y": 500,
-							"y": document.documentElement.clientHeight / 3,
-							"velocity": (45 * 0.5) + (Math.random() * 20),
-							"angle2D": 3 / 2 * Math.PI + Math.random() * 1 / 4 * Math.PI,
-							"tiltAngle": Math.random() * Math.PI,
-							"color": hexToRgb(colors[Math.floor(Math.random() * 12)]),
-							"tick": 100,
-							"totalTicks": 200,
-							"decay": 0.9,
-							"random": 0,
-							"tiltSin": 0,
-							"tiltCos": 0,
-							"gravity": 3,
-							"scalar": 1
-						})
-					}
-				}
-			}
-
-
-			start.onclick = () => {
-				if (!animationFrame) {
-					animationFrame = raf.frame(update);
-				} else {
-					for (let i = 0; i < 20; i++) {
-						arr.push({
-							"x": 0,
-							"y": document.documentElement.clientHeight / 3,
-							"velocity": (45 * 0.5) + (Math.random() * 20),
-							"angle2D": 3 / 2 * Math.PI + Math.random() * 1 / 4 * Math.PI,
-							"tiltAngle": Math.random() * Math.PI,
-							"color": hexToRgb(colors[Math.floor(Math.random() * 12)]),
-							"tick": 0,
-							"totalTicks": 200,
-							"decay": 0.9,
-							"random": 0,
-							"tiltSin": 0,
-							"tiltCos": 0,
-							"gravity": 3,
-							"scalar": 1
-						})
-					}
-				}
-			}
-		</script>
-</body>
-
-</html>

app/src/main/assets/html/index.html

-<html>
-<head>
-    <meta charset="utf-8">
-    //JS代码
-    <script>
-  //Android需要调用的方法
-   function callJS(color){
-   if(color == "" || color == null || color == undefined){
-    return "";
-   }
-				           var values = color
-				             .replace(/rgba?\(/, '')
-				             .replace(/\)/, '')
-				             .replace(/[\s+]/g, '')
-				             .split(',')
-				           var a = parseFloat(values[3] || 1),
-				             r = Math.floor(a * parseInt(values[0]) + (1 - a) * 255),
-				             g = Math.floor(a * parseInt(values[1]) + (1 - a) * 255),
-				             b = Math.floor(a * parseInt(values[2]) + (1 - a) * 255)
-				           return '#' +
-				             ('0' + r.toString(16)).slice(-2) +
-				             ('0' + g.toString(16)).slice(-2) +
-				             ('0' + b.toString(16)).slice(-2)
-
-   }
-
-
-    </script>
-
-</head>
-
-</html>
- 
\ No newline at end of file

app/src/main/java/live/nodiyphoneshell/cend/BaseMianActivity.java

 package live.nodiyphoneshell.cend;
-
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
@@ -25,7 +24,7 @@ public class BaseMianActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ScreenUtils.setDensityByWidth(this, getApplication());
-       // ScreenUtils.setCustomDensity(this);
+        //ScreenUtils.setCustomDensity(this);
     }
 
     @Override

app/src/main/java/live/nodiyphoneshell/cend/BasePresenter.java

@@ -27,15 +27,13 @@ public class BasePresenter {
                 dialog = loadBuilder.create();
             }
             dialog.show();
-        }catch (Exception e){
+         }catch (Exception e){
 
-        }
+         }
     }
 
-
     public void showLoad(Context context,String message) {
         try {
-
             if(context==null){
                 return;
             }
@@ -53,9 +51,9 @@ public class BasePresenter {
                 dialog = loadBuilder.create();
             }
             dialog.show();
-        }catch (Exception e){
+         }catch (Exception e){
 
-        }
+         }
     }
 
     public void closeLoad() {
@@ -68,5 +66,4 @@ public class BasePresenter {
         }
     }
 
-
 }

app/src/main/java/live/nodiyphoneshell/cend/activities/MainActivity.java

@@ -40,8 +40,6 @@ import live.nodiyphoneshell.cend.modules.ImageBanner;
 import live.nodiyphoneshell.cend.modules.MachineInitRewriteBean;
 import live.nodiyphoneshell.cend.modules.VideoBean;
 import live.nodiyphoneshell.cend.modules.VideoInfoBean;
-import live.nodiyphoneshell.cend.receiver.NetStateChangeReceiver;
-import live.nodiyphoneshell.cend.receiver.NetworkUtil;
 import live.nodiyphoneshell.cend.rxbus.RxBackHomeTimer;
 import live.nodiyphoneshell.cend.rxbus.RxBus;
 import live.nodiyphoneshell.cend.rxbus.RxConstants;
@@ -88,15 +86,6 @@ public class MainActivity extends BaseActivity implements MainContract.View {
     @BindView(R.id.fragment_home_banner_text)
     TextView fragment_home_banner_text;
 
-    @BindView(R.id.layout_my_prompt_message_le)
-    LinearLayout layout_my_prompt_message_le;
-
-    @BindView(R.id.layout_my_prompt_message_image)
-    ImageView layout_my_prompt_message_image;
-
-    @BindView(R.id.layout_my_prompt_message_text)
-    TextView layout_my_prompt_message_text;
-
     private Handler handler = new Handler();
     private List<ViewItemBean> viewItemBeanList = new ArrayList<>();
     private MainPresenter mainPresenter;
@@ -146,13 +135,6 @@ public class MainActivity extends BaseActivity implements MainContract.View {
         getScoketData();
     }
 
-    //消息提示跑马灯
-    private void promptMessage() {
-        RxHomePromptMessageTimer.getInstance(this).initData(layout_my_prompt_message_le, layout_my_prompt_message_image, layout_my_prompt_message_text);
-        if (RxMakePromptMessageTimer.getInstance(this).orderNoticeBeanList != null && RxMakePromptMessageTimer.getInstance(this).orderNoticeBeanList.size() > 0) {
-            RxHomePromptMessageTimer.getInstance(this).interval();
-        }
-    }
 
     //授权管理
     private void authorizationManagement() {
@@ -788,7 +770,6 @@ public class MainActivity extends BaseActivity implements MainContract.View {
     @Override
     public void onResume() {
         super.onResume();
-        promptMessage();
         MediaPlayerHelper.getInstance().stop();
         RxBackHomeTimer.getInstance(MainActivity.this).initTimer(-1);
         String machine_code = SPUtils.getStringValue("machine_code", "");

app/src/main/java/live/nodiyphoneshell/cend/activities/MainPresenter.java

 package live.nodiyphoneshell.cend.activities;
 import android.content.Context;
 import android.os.Environment;
-import com.cretin.www.wheelsruflibrary.view.LotteryBean;
-import com.cretin.www.wheelsruflibrary.view.WheelSurfView;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.FileCallBack;
 import java.io.File;
-import java.util.List;
 import live.nodiyphoneshell.cend.BasePresenter;
 import live.nodiyphoneshell.cend.config.Config;
 import live.nodiyphoneshell.cend.modules.MachineInitRewriteBean;
@@ -76,8 +73,6 @@ public class MainPresenter extends BasePresenter implements MainContract.Present
     }
 
 
-
-
     @Override
     public void upLoadVideo(MachineInitRewriteBean.DataBean.VideoBean videoBean) {
         XYDClient.getInstance(context).saveFileText("下载视频文件","开始下载....");
@@ -96,6 +91,7 @@ public class MainPresenter extends BasePresenter implements MainContract.Present
         });
     }
 
+
     @Override
     public void updateUpLoadVideo(VideoBean videoBean) {
         XYDClient.getInstance(context).saveFileText("推送更新视频文件","开始下载....");
@@ -115,4 +111,5 @@ public class MainPresenter extends BasePresenter implements MainContract.Present
         });
     }
 
+
 }

app/src/main/java/live/nodiyphoneshell/cend/activities/SplashActivity.java

@@ -36,6 +36,7 @@ public class SplashActivity extends AppCompatActivity  {
     }
 
     private void launch() {
+        SPUtils.putStringValue("machine_code","100003");
         AlphaAnimation animation = new AlphaAnimation(0.1f, 1.0f);
         animation.setDuration(900);
         mIvBackground.startAnimation(animation);

app/src/main/java/live/nodiyphoneshell/cend/dialog/DialogMessageDialog.java

 package live.nodiyphoneshell.cend.dialog;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.view.Gravity;
@@ -11,6 +12,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import live.nodiyphoneshell.cend.R;
 import live.nodiyphoneshell.cend.utils.ScreenUtils;
+
 /**
  * @author MaYnaghua
  * @version 1.0.0

app/src/main/java/live/nodiyphoneshell/cend/dialog/ShowClearDialog.java

-package live.nodiyphoneshell.cend.dialog;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-import live.nodiyphoneshell.cend.R;
-import live.nodiyphoneshell.cend.utils.ScreenUtils;
-/**
- * @author MaYnaghua
- * @version 1.0.0
- * @date 2020/8/28 16:26
- */
-public class ShowClearDialog {
-
-    private static volatile ShowClearDialog intance;
-
-    private OnClickSaveListener onClickSaveListener;
-
-    private OnClickUpLoadListener onClickUpLoadListener;
-
-    public interface OnClickSaveListener {
-        void OnClickSaveButton();
-    }
-
-    public interface OnClickUpLoadListener {
-        void OnClickUpLoadButton();
-    }
-
-    public void setOnClickUpLoadListener(OnClickUpLoadListener onClickUpLoadListener) {
-        this.onClickUpLoadListener = onClickUpLoadListener;
-    }
-
-    public void setOnClickSaveListener(OnClickSaveListener onClickSaveListener) {
-        this.onClickSaveListener = onClickSaveListener;
-    }
-
-    public static ShowClearDialog getIntance() {
-        if (intance == null) {
-            synchronized (ShowClearDialog.class) {
-                if (intance == null)
-                    intance = new ShowClearDialog();
-            }
-        }
-        return intance;
-    }
-
-
-    public void showClearAll(Context ctx) {
-        try {
-            View vv = LayoutInflater.from(ctx).inflate(R.layout.layout_clear_all_dialog, null);
-            Dialog dialog = new AlertDialog.Builder(ctx).create();
-            TextView layout_clear_all_dialog_confirm = vv.findViewById(R.id.layout_clear_all_dialog_confirm);
-            layout_clear_all_dialog_confirm.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    if (onClickSaveListener != null) {
-                        onClickSaveListener.OnClickSaveButton();
-                        if (dialog != null) {
-                            dialog.dismiss();
-                        }
-
-                    }
-                }
-            });
-            TextView layout_clear_all_dialog_cancel = vv.findViewById(R.id.layout_clear_all_dialog_cancel);
-            layout_clear_all_dialog_cancel.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    if (dialog != null) {
-                        dialog.dismiss();
-                    }
-                }
-            });
-            dialog.show();
-            dialog.setCancelable(true);
-            Window window = dialog.getWindow();
-            window.setBackgroundDrawableResource(R.color.transparent);
-            window.setGravity(Gravity.CENTER);
-            WindowManager.LayoutParams lp = window.getAttributes();
-            lp.width = ScreenUtils.dip2px(ctx, 245);
-            lp.height = ScreenUtils.dip2px(ctx, 165);
-            window.setAttributes(lp);
-            window.setContentView(vv);
-        }catch (Exception e){
-
-        }
-    }
-
-
-}

app/src/main/java/live/nodiyphoneshell/cend/dialog/ShowFailDialog.java

-package live.nodiyphoneshell.cend.dialog;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Build;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import live.nodiyphoneshell.cend.R;
-import live.nodiyphoneshell.cend.utils.ScreenUtils;
-/**
- * @author MaYnaghua
- * @version 1.0.0
- * @date 2020/7/23 17:15
- */
-public class ShowFailDialog implements View.OnClickListener {
-
-    private static volatile ShowFailDialog intance;
-
-    private OnClickSaveListener onClickSaveListener;
-
-    private OnClickUpLoadListener onClickUpLoadListener;
-
-    public Dialog dialog;
-
-    @Override
-    public void onClick(View view) {
-
-    }
-
-    public interface OnClickSaveListener {
-        void OnClickSaveButton();
-    }
-
-    public interface OnClickUpLoadListener {
-        void OnClickUpLoadButton();
-    }
-
-    public void setOnClickUpLoadListener(OnClickUpLoadListener onClickUpLoadListener) {
-        this.onClickUpLoadListener = onClickUpLoadListener;
-    }
-
-    public void setOnClickSaveListener(OnClickSaveListener onClickSaveListener) {
-        this.onClickSaveListener = onClickSaveListener;
-    }
-
-    public static ShowFailDialog getIntance() {
-        if (intance == null) {
-            synchronized (ShowFailDialog.class) {
-                if (intance == null)
-                    intance = new ShowFailDialog();
-            }
-        }
-        return intance;
-    }
-
-
-    public void showPayFail(Context ctx) {
-        View vv = LayoutInflater.from(ctx).inflate(R.layout.layout_pay_succeed_fail, null);
-        dialog = new AlertDialog.Builder(ctx).create();
-        dialog.show();
-        dialog.setCancelable(false);
-        Window window = dialog.getWindow();
-        window.setBackgroundDrawableResource(R.color.transparent);
-        window.setGravity(Gravity.CENTER);
-        WindowManager.LayoutParams lp = window.getAttributes();
-        lp.width = ScreenUtils.getScreenWidth(ctx) - ScreenUtils.dip2px(ctx, 140);
-        window.setAttributes(lp);
-        window.setContentView(vv);
-    }
-
-
-    public void dismissDiaLog() {
-        if (dialog != null) {
-            dialog.dismiss();
-        }
-    }
-
-
-}

app/src/main/java/live/nodiyphoneshell/cend/receiver/NetworkConnectChangedReceiver.java

@@ -38,10 +38,8 @@ public class NetworkConnectChangedReceiver  extends BroadcastReceiver {
                     break;
              }
         }
-        // 这个监听wifi的连接状态即是否连上了一个有效无线路由，当上边广播的状态是WifiManager
-        // .WIFI_STATE_DISABLING，和WIFI_STATE_DISABLED的时候，根本不会接到这个广播。
-        // 在上边广播接到广播是WifiManager.WIFI_STATE_ENABLED状态的同时也会接到这个广播，
-        // 当然刚打开wifi肯定还没有连接到有效的无线
+        //这个监听wifi的连接状态即是否连上了一个有效无线路由，当上边广播的状态是WifiManager
+        //.WIFI_STATE_DISABLING，和WIFI_STATE_DISABLED的时候，根本不会接到这个广播。
         if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(intent.getAction())) {
             Parcelable parcelableExtra = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
             if (null != parcelableExtra) {
@@ -54,8 +52,6 @@ public class NetworkConnectChangedReceiver  extends BroadcastReceiver {
             }
         }
         // 这个监听网络连接的设置，包括wifi和移动数据的打开和关闭。.
-        // 最好用的还是这个监听。wifi如果打开，关闭，以及连接上可用的连接都会接到监听。见log
-        // 这个广播的最大弊端是比上边两个广播的反应要慢，如果只是要监听wifi，我觉得还是用上边两个配合比较合适
         if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {
             ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
             NetworkInfo activeNetwork = manager.getActiveNetworkInfo();
@@ -63,23 +59,16 @@ public class NetworkConnectChangedReceiver  extends BroadcastReceiver {
                 if (activeNetwork.isConnected()) {
                     Log.e(TAG, "当前WiFi连接可用 ");
                      if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI) {
-                        //connected to wifi
-                        //APP.getInstance().setWifi(true);
-                        //Log.e(TAG, "当前WiFi连接可用 ");
+
                     } else if (activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE) {
-                        //connected to the mobile provider's data plan
-                        //APP.getInstance().setMobile(true);
-                        //Log.e(TAG, "当前移动网络连接可用 ");
+
                     }
                     DialogManager.getIntance().dismissDiaLog();
                 } else {
-                    //DialogManager.getIntance().showDisable(context,"当前没有网络连接，请确保你已经打开网络");
-                    //Log.e(TAG, "当前没有网络连接，请确保你已经打开网络 ");
+
                 }
-                //Log.e(TAG1, "info.getTypeName()" + activeNetwork.getTypeName());
-            } else {   // not connected to the internet
-                //DialogManager.getIntance().showDisable(context,"当前没有网络连接，请确保你已经打开网络");
-                //Log.e(TAG, "当前没有网络连接，请确保你已经打开网络 ");
+            } else {
+
              }
          }
     }

app/src/main/java/live/nodiyphoneshell/cend/receiver/NetworkUtil.java

@@ -20,7 +20,6 @@ public class NetworkUtil {
         NetworkType(String desc) {
             this.desc = desc;
         }
-
         @Override
         public String toString() {
             return desc;
@@ -39,7 +38,6 @@ public class NetworkUtil {
 
     /**
      * 获取当前网络类型
-     * 需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>}
      */
     @RequiresPermission("android.permission.ACCESS_NETWORK_STATE")
     public static NetworkType getNetworkType(Context context) {
@@ -51,7 +49,6 @@ public class NetworkUtil {
                 netType = NetworkType.NETWORK_WIFI;
             } else if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
                 switch (info.getSubtype()) {
-
                     case TelephonyManager.NETWORK_TYPE_TD_SCDMA:
                     case TelephonyManager.NETWORK_TYPE_EVDO_A:
                     case TelephonyManager.NETWORK_TYPE_UMTS:

app/src/main/java/live/nodiyphoneshell/cend/service/AccessibilityUtil.java

@@ -43,7 +43,6 @@ public class AccessibilityUtil {
         dialog.getWindow().setAttributes(lp);
     }
 
-
     /**
      * 检查系统设置：是否开启辅助服务
      * @param service 辅助服务
@@ -68,7 +67,6 @@ public class AccessibilityUtil {
         return false;
     }
 
-
     /**
      * 跳转到系统设置：开启辅助服务
      */
@@ -91,7 +89,6 @@ public class AccessibilityUtil {
         }
     }
 
-
     /**
      * 唤醒点亮和解锁屏幕(60s)
      */
@@ -114,5 +111,4 @@ public class AccessibilityUtil {
         }
     }
 
-
 }
\ No newline at end of file

app/src/main/java/live/nodiyphoneshell/cend/service/InstallUtil.java

@@ -66,7 +66,6 @@ public class InstallUtil {
             Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:" + cxt.getPackageName()));//使用系统设置+返回键 //ACTION_WIFI_SETTINGS
             intent.putExtras(bundle);
             cxt.startActivity(intent);
-            //cxt.startActivity(new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:" + cxt.getPackageName())));
         }else {
             cxt.startActivity(new Intent(Settings.ACTION_SECURITY_SETTINGS));
         }

app/src/main/java/live/nodiyphoneshell/cend/utils/ColorUtils.java

@@ -7,78 +7,5 @@ import live.nodiyphoneshell.cend.R;
  */
 public class ColorUtils {
 
-    public static int getDrawable(String backColor) {
-        int drawable = 0;
-        switch (backColor) {
-            case "#FFFFFF":
-                drawable = R.drawable.sticker_white_background;
-                break;
-            case "#050BDE":
-                drawable = R.drawable.sticker_blue_background;
-                break;
-            case "#ff0000":
-            case "#E60012":
-                drawable = R.drawable.sticker_red_background;
-                break;
-            case "#E65C00":
-                drawable = R.drawable.sticker_orange_background;
-                break;
-            case "#000000":
-                drawable = R.drawable.sticker_black_background;
-                break;
-        }
-        return drawable;
-    }
-
-
-    public static int getColor(String colorValue) {
-        int drawable = 0;
-        switch (colorValue) {
-            case "#FFFFFF":
-                drawable = R.color.white_FFFFFF;
-                break;
-            case "#868686":
-                drawable = R.color.color868686;
-                break;
-            case "#050BDE":
-                drawable = R.color.color_050BDE;
-                break;
-            case "#ff0000":
-            case "#E60012":
-                drawable = R.color.color_E60012;
-                break;
-            case "#E65C00":
-                drawable = R.color.color_E65C00;
-                break;
-            case "#000000":
-                drawable = R.color.black_000000;
-                break;
-            default:
-                drawable = R.color.color868686;
-                break;
-        }
-        return drawable;
-    }
-
-    public static boolean getFirst(String backColor) {
-        boolean first = false;
-        if ("#00000000".equals(backColor)) {
-            first = false;
-        } else {
-            first = true;
-        }
-        return first;
-    }
-
-    public static boolean getLast(String font) {
-        boolean last = false;
-        if ("regular".equals(font)) {
-            last = false;
-        } else {
-            last = true;
-        }
-        return last;
-    }
-
 
 }

app/src/main/java/live/nodiyphoneshell/cend/utils/CommonImgEffectView.java

-package live.nodiyphoneshell.cend.utils;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-
-import live.nodiyphoneshell.cend.R;
-
-/**
- * @author MaYnaghua
- * @version 1.0.0
- * @date 2020/10/29 19:34
- */
-public class CommonImgEffectView extends View {
-
-    private Context context;
-    private Bitmap mainBmp, controlBmp;
-    private int mainBmpWidth, mainBmpHeight, controlBmpWidth, controlBmpHeight;
-    private Matrix matrix;
-    private float[] srcPs, dstPs;
-    private RectF srcRect, dstRect;
-    private Paint paint, paintRect, paintFrame;
-    private float deltaX = 0, deltaY = 0; //位移值
-    private float scaleValue = 1; //缩放值
-    private Point lastPoint;
-    private Point prePivot, lastPivot;
-    private float preDegree, lastDegree;
-    private short currentSelectedPointindex;        //当前操作点击点
-    private Point symmetricPoint = new Point();    //当前操作点对称点
-
-    /**
-     * 图片操作类型
-     */
-    public static final int OPER_DEFAULT = -1;      //默认
-    public static final int OPER_TRANSLATE = 0;     //移动
-    public static final int OPER_SCALE = 1;         //缩放
-    public static final int OPER_ROTATE = 2;        //旋转
-    public static final int OPER_SELECTED = 3;      //选择
-    public int lastOper = OPER_DEFAULT;
-
-    /* 图片控制点
-     * 0---1---2
-     * |       |
-     * 7   8   3
-     * |       |
-     * 6---5---4
-     */
-    public static final int CTR_NONE = -1;
-    public static final int CTR_LEFT_TOP = 0;
-    public static final int CTR_MID_TOP = 1;
-    public static final int CTR_RIGHT_TOP = 2;
-    public static final int CTR_RIGHT_MID = 3;
-    public static final int CTR_RIGHT_BOTTOM = 4;
-    public static final int CTR_MID_BOTTOM = 5;
-    public static final int CTR_LEFT_BOTTOM = 6;
-    public static final int CTR_LEFT_MID = 7;
-    public static final int CTR_MID_MID = 8;
-    public int current_ctr = CTR_NONE;
-
-    public CommonImgEffectView(Context context) {
-        super(context);
-        this.context = context;
-    }
-
-    public CommonImgEffectView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        this.context = context;
-        initData();
-    }
-
-    /**
-     * 初始化数据
-     *
-     * @author 张进
-     */
-    private void initData() {
-        mainBmp = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.icon_good_size_details_picture_one);
-        controlBmp = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.icon_make_refresh);
-        mainBmpWidth = mainBmp.getWidth();
-        mainBmpHeight = mainBmp.getHeight();
-        controlBmpWidth = controlBmp.getWidth();
-        controlBmpHeight = controlBmp.getHeight();
-
-        srcPs = new float[]{
-                0, 0,
-                mainBmpWidth / 2, 0,
-                mainBmpWidth, 0,
-                mainBmpWidth, mainBmpHeight / 2,
-                mainBmpWidth, mainBmpHeight,
-                mainBmpWidth / 2, mainBmpHeight,
-                0, mainBmpHeight,
-                0, mainBmpHeight / 2,
-                mainBmpWidth / 2, mainBmpHeight / 2
-        };
-        dstPs = srcPs.clone();
-        srcRect = new RectF(0, 0, mainBmpWidth, mainBmpHeight);
-        dstRect = new RectF();
-
-        matrix = new Matrix();
-
-        prePivot = new Point(mainBmpWidth / 2, mainBmpHeight / 2);
-        lastPivot = new Point(mainBmpWidth / 2, mainBmpHeight / 2);
-
-        lastPoint = new Point(0, 0);
-
-        paint = new Paint();
-
-        paintRect = new Paint();
-        paintRect.setColor(Color.RED);
-        paintRect.setAlpha(100);
-        paintRect.setAntiAlias(true);
-
-        paintFrame = new Paint();
-        paintFrame.setColor(Color.GREEN);
-        paintFrame.setAntiAlias(true);
-
-        setMatrix(OPER_DEFAULT);
-    }
-
-    /**
-     * 矩阵变换，达到图形平移的目的
-     *
-     * @author 张进
-     */
-    private void setMatrix(int operationType) {
-        switch (operationType) {
-            case OPER_TRANSLATE:
-                matrix.postTranslate(deltaX, deltaY);
-                break;
-            case OPER_SCALE:
-                matrix.postScale(scaleValue, scaleValue, symmetricPoint.x, symmetricPoint.y);
-                break;
-            case OPER_ROTATE:
-                matrix.postRotate(preDegree - lastDegree, dstPs[CTR_MID_MID * 2], dstPs[CTR_MID_MID * 2 + 1]);
-                break;
-        }
-
-        matrix.mapPoints(dstPs, srcPs);
-        matrix.mapRect(dstRect, srcRect);
-    }
-
-
-
-    private boolean isOnPic(int x, int y) {
-
-        if (dstRect.contains(x, y)) {
-            return true;
-        } else
-            return false;
-    }
-
-    private int getOperationType(MotionEvent event) {
-
-        int evX = (int) event.getX();
-        int evY = (int) event.getY();
-        int curOper = lastOper;
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                current_ctr = isOnCP(evX, evY);
-                Log.i("img", "current_ctr is " + current_ctr);
-                if (current_ctr != CTR_NONE || isOnPic(evX, evY)) {
-                    curOper = OPER_SELECTED;
-                }
-                break;
-            case MotionEvent.ACTION_MOVE:
-                if (current_ctr > CTR_NONE && current_ctr < CTR_MID_MID) {
-                    curOper = OPER_SCALE;
-                } else if (current_ctr == CTR_MID_MID) {
-                    curOper = OPER_ROTATE;
-                } else if (lastOper == OPER_SELECTED) {
-                    curOper = OPER_TRANSLATE;
-                }
-                break;
-            case MotionEvent.ACTION_UP:
-                curOper = OPER_SELECTED;
-                break;
-            default:
-                break;
-        }
-        Log.d("img", "curOper is " + curOper);
-        return curOper;
-
-    }
-
-    /**
-     * 判断点所在的控制点
-
-     * @return
-     */
-    private int isOnCP(int evx, int evy) {
-        Rect rect = new Rect(evx - controlBmpWidth / 2, evy - controlBmpHeight / 2, evx + controlBmpWidth / 2, evy + controlBmpHeight / 2);
-        int res = 0;
-        for (int i = 0; i < dstPs.length; i += 2) {
-            if (rect.contains((int) dstPs[i], (int) dstPs[i + 1])) {
-                return res;
-            }
-            ++res;
-        }
-        return CTR_NONE;
-    }
-
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-        int evX = (int) event.getX();
-        int evY = (int) event.getY();
-
-        int operType = OPER_DEFAULT;
-        operType = getOperationType(event);
-
-        switch (operType) {
-            case OPER_TRANSLATE:
-                translate(evX, evY);
-                break;
-            case OPER_SCALE:
-                scale(event);
-                break;
-            case OPER_ROTATE:
-                rotate(event);
-                break;
-        }
-
-        lastPoint.x = evX;
-        lastPoint.y = evY;
-
-        lastOper = operType;
-        invalidate();//重绘
-        return true;
-    }
-
-    /**
-     * 移动
-     *
-     * @param evx
-     * @param evy
-     * @author zhang_jin1
-     */
-    private void translate(int evx, int evy) {
-
-        prePivot.x += evx - lastPoint.x;
-        prePivot.y += evy - lastPoint.y;
-
-        deltaX = prePivot.x - lastPivot.x;
-        deltaY = prePivot.y - lastPivot.y;
-
-        lastPivot.x = prePivot.x;
-        lastPivot.y = prePivot.y;
-
-        setMatrix(OPER_TRANSLATE); //设置矩阵
-
-    }
-
-    /**
-     * 缩放
-     * 0---1---2
-     * |       |
-     * 7   8   3
-     * |       |
-     * 6---5---4
-
-     */
-    private void scale(MotionEvent event) {
-
-        int pointIndex = current_ctr * 2;
-
-        float px = dstPs[pointIndex];
-        float py = dstPs[pointIndex + 1];
-
-        float evx = event.getX();
-        float evy = event.getY();
-
-        float oppositeX = 0;
-        float oppositeY = 0;
-        if (current_ctr < 4 && current_ctr >= 0) {
-            oppositeX = dstPs[pointIndex + 8];
-            oppositeY = dstPs[pointIndex + 9];
-        } else if (current_ctr >= 4) {
-            oppositeX = dstPs[pointIndex - 8];
-            oppositeY = dstPs[pointIndex - 7];
-        }
-        float temp1 = getDistanceOfTwoPoints(px, py, oppositeX, oppositeY);
-        float temp2 = getDistanceOfTwoPoints(evx, evy, oppositeX, oppositeY);
-
-        this.scaleValue = temp2 / temp1;
-        symmetricPoint.x = (int) oppositeX;
-        symmetricPoint.y = (int) oppositeY;
-
-        Log.i("img", "scaleValue is " + scaleValue);
-        setMatrix(OPER_SCALE);
-    }
-
-    /**
-     * 旋转图片
-     * 0---1---2
-     * |       |
-     * 7   8   3
-     * |       |
-     * 6---5---4
-     */
-    private void rotate(MotionEvent event) {
-
-        if (event.getPointerCount() == 2) {
-            preDegree = computeDegree(new Point((int) event.getX(0), (int) event.getY(0)), new Point((int) event.getX(1), (int) event.getY(1)));
-        } else {
-            preDegree = computeDegree(new Point((int) event.getX(), (int) event.getY()), new Point((int) dstPs[16], (int) dstPs[17]));
-        }
-        setMatrix(OPER_ROTATE);
-        lastDegree = preDegree;
-    }
-
-
-    /**
-     * 计算两点与垂直方向夹角
-     * @param p1
-     * @param p2
-     * @return
-     */
-    public float computeDegree(Point p1, Point p2) {
-        float tran_x = p1.x - p2.x;
-        float tran_y = p1.y - p2.y;
-        float degree = 0.0f;
-        float angle = (float) (Math.asin(tran_x / Math.sqrt(tran_x * tran_x + tran_y * tran_y)) * 180 / Math.PI);
-        if (!Float.isNaN(angle)) {
-            if (tran_x >= 0 && tran_y <= 0) {//第一象限
-                degree = angle;
-            } else if (tran_x <= 0 && tran_y <= 0) {//第二象限
-                degree = angle;
-            } else if (tran_x <= 0 && tran_y >= 0) {//第三象限
-                degree = -180 - angle;
-            } else if (tran_x >= 0 && tran_y >= 0) {//第四象限
-                degree = 180 - angle;
-            }
-        }
-        return degree;
-    }
-
-    /**
-     * 计算两个点之间的距离
-     *
-     * @param p1
-     * @param p2
-     * @return
-     */
-    private float getDistanceOfTwoPoints(Point p1, Point p2) {
-        return (float) (Math.sqrt((p1.x - p2.x) * (p1.x - p2.x) + (p1.y - p2.y) * (p1.y - p2.y)));
-    }
-
-    private float getDistanceOfTwoPoints(float x1, float y1, float x2, float y2) {
-        return (float) (Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2)));
-    }
-
-
-    @Override
-    public void onDraw(Canvas canvas) {
-        drawBackground(canvas);//绘制背景,以便测试矩形的映射
-        canvas.drawBitmap(mainBmp, matrix, paint);//绘制主图片
-        drawFrame(canvas);//绘制边框,以便测试点的映射
-        drawControlPoints(canvas);//绘制控制点图片
-    }
-
-    private void drawBackground(Canvas canvas) {
-        canvas.drawRect(dstRect, paintRect);
-    }
-
-    private void drawFrame(Canvas canvas) {
-        canvas.drawLine(dstPs[0], dstPs[1], dstPs[4], dstPs[5], paintFrame);
-        canvas.drawLine(dstPs[4], dstPs[5], dstPs[8], dstPs[9], paintFrame);
-        canvas.drawLine(dstPs[8], dstPs[9], dstPs[12], dstPs[13], paintFrame);
-        canvas.drawLine(dstPs[0], dstPs[1], dstPs[12], dstPs[13], paintFrame);
-        canvas.drawPoint(dstPs[16], dstPs[17], paintFrame);
-    }
-
-    private void drawControlPoints(Canvas canvas) {
-
-        for (int i = 0; i < dstPs.length; i += 2) {
-            canvas.drawBitmap(controlBmp, dstPs[i] - controlBmpWidth / 2, dstPs[i + 1] - controlBmpHeight / 2, paint);
-        }
-
-    }
-
-}
\ No newline at end of file

app/src/main/java/live/nodiyphoneshell/cend/utils/Cubic.java

 package live.nodiyphoneshell.cend.utils;
-
 /**
  * @author MaYnaghua
  * @version 1.0.0

app/src/main/java/live/nodiyphoneshell/cend/view/process/ProcessActivity.java

@@ -70,17 +70,17 @@ public class ProcessActivity extends BaseActivity {
     @BindView(R.id.activity_process_print_fireworks)
     ImageView activity_process_print_fireworks;
 
-    @BindView(R.id.activity_process_top_start_come)
-    ImageView activity_process_top_start_come;
+    /*@BindView(R.id.activity_process_top_start_come)
+    ImageView activity_process_top_start_come;*/
 
-    @BindView(R.id.activity_process_top_on_start_come)
-    ImageView activity_process_top_on_start_come;
+    /*@BindView(R.id.activity_process_top_on_start_come)
+    ImageView activity_process_top_on_start_come;*/
 
     @BindView(R.id.activity_process_online_image_bacl_all_le)
     LinearLayout activity_process_online_image_bacl_all_le;
 
-    @BindView(R.id.activity_process_top_on_start_come_le)
-    LinearLayout activity_process_top_on_start_come_le;
+    /*@BindView(R.id.activity_process_top_on_start_come_le)
+    LinearLayout activity_process_top_on_start_come_le;*/
 
     @BindView(R.id.activity_process_diy_image_back_le)
     LinearLayout activity_process_diy_image_back_le;
@@ -137,18 +137,18 @@ public class ProcessActivity extends BaseActivity {
     protected void initData() {
         //测试
         //status = 1;
-       //position = 4;
+        //position = 4;
         //backUrl = "http://img.colorpark.cn/back/1628055499610a27cb1b984.png";
-       //imageUrl = "http://img.colorpark.cn/yun/10962_16284751746847.png";*/
+        //imageUrl = "http://img.colorpark.cn/yun/10962_16284751746847.png";*/
         selctStatus(status);
         //startBrushImage();
-       /*handler.postDelayed(new Runnable() {
+        /*handler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 startBrushImage();
             }
         }, 12000);*/
-      /* handler.postDelayed(new Runnable() {
+       /*handler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 //backUrl = "http://img.colorpark.cn/back/16274542866100fb4e7002a.png";
@@ -275,12 +275,14 @@ public class ProcessActivity extends BaseActivity {
         }
     }
 
+
     @Override
     public void onDestroy() {
         super.onDestroy();//销毁
         clearBitmapView();
     }
 
+
     //0：等待出料，1：生产中 , 2: 生产完成待取货， 3：取消生产，4：出料中，5: 等待取料 6：等待入货，7：取货完成',
     //根据状态选择对应颜色
     private void selctStatus(int status) {
@@ -618,14 +620,23 @@ public class ProcessActivity extends BaseActivity {
     //开始进来动画 //IsComeProcess true 进入打印区域 type 进入状态
     private void statProcessPrintImage(boolean IsComeProcess, int type) {
         isBushImage = false;
-        activity_process_top_on_start_come.setBackgroundResource(R.drawable.icon_pay_back);
-        activity_process_diy_image_back_le.setVisibility(View.GONE);
+        //activity_process_top_on_start_come.setBackgroundResource(R.drawable.icon_pay_back);
+        /*activity_process_diy_image_back_le.setVisibility(View.GONE);
         activity_process_online_image_bacl_all_le.setVisibility(View.GONE);
         LinearLayout.LayoutParams layoutParamsImage = (LinearLayout.LayoutParams) activity_process_top_start_come.getLayoutParams();
-        layoutParamsImage.topMargin = -ScreenUtils.dip2px(ProcessActivity.this, (float) 1.5);
-        activity_process_top_start_come.setLayoutParams(layoutParamsImage);
-        activity_process_top_start_come.setBackgroundResource(R.drawable.icon_process_print_strat);
-        AnimationUtil.getInstance(ProcessActivity.this).translationXAnimation(activity_process_top_on_start_come_le, 4000, new AnimationUtil.onAnimationAction() {
+        layoutParamsImage.topMargin = -ScreenUtils.dip2px(ProcessActivity.this, (float) 1.5);*/
+        //activity_process_top_start_come.setLayoutParams(layoutParamsImage);
+        //activity_process_top_start_come.setBackgroundResource(R.drawable.icon_process_print_strat);
+        /*activity_process_diy_image_back_le.setTranslationX(0);
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) activity_process_diy_image_back_le.getLayoutParams();
+        layoutParams.leftMargin = -ScreenUtils.dip2px(ProcessActivity.this, 40);
+        activity_process_diy_image_back_le.setLayoutParams(layoutParams);
+        activity_process_diy_image_back_le.setVisibility(View.VISIBLE);
+        activity_process_online_image_bacl_all_le.setVisibility(View.VISIBLE);*/
+        if (IsComeProcess && type != 0) {
+            startPrintprogress(type);
+        }
+        /*AnimationUtil.getInstance(ProcessActivity.this).translationXAnimation(activity_process_top_on_start_come_le, 4000, new AnimationUtil.onAnimationAction() {
             @Override
             public void onAnimationEnd() {
                 activity_process_diy_image_back_le.setTranslationX(0);
@@ -638,13 +649,13 @@ public class ProcessActivity extends BaseActivity {
                     startPrintprogress(type);
                 }
             }
-        }, 0, -ScreenUtils.dip2px(ProcessActivity.this, 360));
+        }, 0, -ScreenUtils.dip2px(ProcessActivity.this, 360));*/
     }
 
 
     //开始排队进来动画
     private void statProcessOnLineImage() {
-        activity_process_diy_image_back_le.setTranslationX(0);
+        /*activity_process_diy_image_back_le.setTranslationX(0);
         activity_process_diy_image_back_le.setVisibility(View.GONE);
         activity_process_online_image_bacl_all_le.setVisibility(View.GONE);
         activity_process_top_start_come.setBackgroundResource(R.drawable.icon_process_online_strat);
@@ -666,7 +677,7 @@ public class ProcessActivity extends BaseActivity {
                     }
                 }, ScreenUtils.dip2px(ProcessActivity.this, 90));
             }
-        }, 0, -ScreenUtils.dip2px(ProcessActivity.this, 360));
+        }, 0, -ScreenUtils.dip2px(ProcessActivity.this, 360));*/
     }
 
 
@@ -674,7 +685,7 @@ public class ProcessActivity extends BaseActivity {
     private void statProcessPrintAgainImage(boolean IsComeProcess, int type) {
         isBushImage = false;
         activity_proces_diy_image.starClearDrawBitmapImage();
-        activity_process_top_on_start_come.setBackgroundResource(R.drawable.icon_process_online_strat);
+        /*activity_process_top_on_start_come.setBackgroundResource(R.drawable.icon_process_online_strat);
         activity_process_diy_image_back_le.setVisibility(View.VISIBLE);
         LinearLayout.LayoutParams layoutParamsImage = (LinearLayout.LayoutParams) activity_process_top_start_come.getLayoutParams();
         layoutParamsImage.topMargin = -ScreenUtils.dip2px(ProcessActivity.this, (float) 1.5);
@@ -685,7 +696,7 @@ public class ProcessActivity extends BaseActivity {
             public void onAnimationEnd() {
 
             }
-        }, 0, -ScreenUtils.dip2px(ProcessActivity.this, 360));
+        }, 0, -ScreenUtils.dip2px(ProcessActivity.this, 360));*/
     }
 
 

app/src/main/java/live/nodiyphoneshell/cend/view/process/cancel/ProcessCancelActivity.java

 package live.nodiyphoneshell.cend.view.process.cancel;
-import android.graphics.Color;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
-import com.bumptech.glide.Glide;
-import com.lake.banner.BannerStyle;
-import com.lake.banner.HBanner;
-import com.lake.banner.ImageGravityType;
-import com.lake.banner.Transformer;
-import com.lake.banner.VideoGravityType;
-import com.lake.banner.loader.ViewItemBean;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 import butterknife.BindView;
-import butterknife.OnClick;
 import live.nodiyphoneshell.cend.BaseActivity;
-import live.nodiyphoneshell.cend.CustomApplication;
 import live.nodiyphoneshell.cend.R;
-import live.nodiyphoneshell.cend.modules.BannerBean;
-import live.nodiyphoneshell.cend.modules.ImageBanner;
 import live.nodiyphoneshell.cend.rxbus.RxBackHomeTimer;
-import live.nodiyphoneshell.cend.rxbus.RxTimer;
-import live.nodiyphoneshell.cend.utils.JsonUtils;
 import live.nodiyphoneshell.cend.utils.SPUtils;
-import static com.lake.banner.BannerConfig.IMAGE;
 /**
  * Created by MaYangHua on 2017/2/21.
  */
 public class ProcessCancelActivity extends BaseActivity implements ProcessCancelContract.View {
 
-    @BindView(R.id.activity_process_cancel_banner)
-    HBanner activity_process_cancel_banner;
-
     @BindView(R.id.activity_process_cancel_contet)
     TextView activity_process_cancel_contet;
 
@@ -48,11 +23,8 @@ public class ProcessCancelActivity extends BaseActivity implements ProcessCancel
     @BindView(R.id.activity_process_cancel_customer_phone)
     TextView activity_process_cancel_customer_phone;
 
-    @BindView(R.id.activity_process_cancel_banner_image)
-    ImageView activity_process_cancel_banner_image;
-
     private ProcessCancelPresenter processCancelPresenter;
-    private List<ViewItemBean> viewItemBeanList = new ArrayList<>();
+
     private String gooSize;
 
     @Override
@@ -68,6 +40,7 @@ public class ProcessCancelActivity extends BaseActivity implements ProcessCancel
     @Override
     //初始化视图
     protected void initView() {
+        processCancelPresenter = new ProcessCancelPresenter(this, this);
         try {
             gooSize = getIntent().getStringExtra("goodSize");
             if (!TextUtils.isEmpty(gooSize)) {
@@ -80,86 +53,38 @@ public class ProcessCancelActivity extends BaseActivity implements ProcessCancel
         String phoneNumber = getResources().getString(R.string.callPhoneNumber);
         phoneNumber = String.format(phoneNumber, SPUtils.getStringValue("phoneNumber", "18938664545"));
         activity_process_cancel_phone.setText(phoneNumber);
-
         phoneNumber = getResources().getString(R.string.phoneNumber);
         phoneNumber = String.format(phoneNumber, SPUtils.getStringValue("phoneNumber", "18938664545"));
         activity_process_cancel_customer_phone.setText(phoneNumber);
-
-        processCancelPresenter = new ProcessCancelPresenter(this, this);
-        activity_process_cancel_banner.setViews(viewItemBeanList)
-                .setBannerAnimation(Transformer.Default)//换场方式
-                .setBannerStyle(BannerStyle.CIRCLE_INDICATOR)//指示器模式*/
-                .setCache(true)//可以不用设置，默认为true
-                .setCachePath(getExternalFilesDir(Environment.DIRECTORY_MOVIES).getAbsolutePath() + File.separator + "hbanner")
-                .setVideoGravity(VideoGravityType.FULL_SCREEN)//视频布局方式
-                .setImageGravity(ImageGravityType.FIT_XY)//图片布局方式
-                .setPageBackgroundColor(Color.TRANSPARENT)//设置背景
-                .setShowTitle(false)//是否显示标题
-                .setViewPagerIsScroll(true)//是否支持手滑
-                .start();
     }
 
-
     @Override
     protected void initData() {
-        getBanner(SPUtils.getStringValue("partner_id", ""), "phone_shell_pay");
-    }
-
 
-    @OnClick({
-            R.id.activity_process_cancel_back_home,
-            R.id.activity_process_cancel_le
-    })
-    void onclick(View button) {
-        switch (button.getId()) {
-            case R.id.activity_process_cancel_back_home:
-                RxTimer.getInstance(this).cancel();
-                SPUtils.putBooleanValue("stepFinish", false);
-                CustomApplication.allfinish();
-                finish();
-                break;
-            default:
-                break;
-        }
     }
 
-
     @Override
     protected void onResume() {
         super.onResume();
         RxBackHomeTimer.getInstance(this).initTimer(300);
-        if (activity_process_cancel_banner != null) {
-            activity_process_cancel_banner.onResume();
-        }
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        if (activity_process_cancel_banner != null) {
-            activity_process_cancel_banner.onPause();
-        }
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        if (activity_process_cancel_banner != null) {
-            activity_process_cancel_banner.onStop();
-        }
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();//销毁
         if (processCancelPresenter != null) {
             processCancelPresenter = null;
         }
-        if (activity_process_cancel_banner != null) {
-            activity_process_cancel_banner.onStop();
-            activity_process_cancel_banner = null;
-        }
     }
 
     @Override
@@ -169,58 +94,9 @@ public class ProcessCancelActivity extends BaseActivity implements ProcessCancel
 
     @Override
     public void getBannerSuccessed(String data) {
-        BannerBean bannerBean = JsonUtils.deserialize(data, BannerBean.class);
-        if (bannerBean == null) {
-            return;
-        }
-        List<BannerBean.DataBean> dataBeanList = bannerBean.getData();
-        if (dataBeanList == null || dataBeanList.size() == 0) {
-            return;
-        }
-        viewItemBeanList.clear();
-        List<ImageBanner> bannerList = new ArrayList<ImageBanner>();
-        for (BannerBean.DataBean dataBean : dataBeanList) {
-            ImageBanner imageBanner = new ImageBanner();
-            imageBanner.setName(dataBean.getFull_name());
-            imageBanner.setUrl(dataBean.getContent());
-            if (dataBean.getPlay_time() <= 0) {
-                imageBanner.setPlay_time(10);
-            } else {
-                imageBanner.setPlay_time(dataBean.getPlay_time());
-            }
-            bannerList.add(imageBanner);
-        }
-        for (ImageBanner imageBanner : bannerList) {
-            if (imageBanner.getName().contains("index_top_video")) {
-                //Uri path1 = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.video62);
-                //viewItemBeanList.add(new ViewItemBean(VIDEO, "标题1", path1, 38 * 1000));
-            } else {
-                Uri path2 = Uri.parse(imageBanner.getUrl());
-                viewItemBeanList.add(new ViewItemBean(IMAGE, "图片banner", path2, imageBanner.getPlay_time() * 1000));
-            }
-        }
-        if (viewItemBeanList == null || viewItemBeanList.size() == 0) {
-            activity_process_cancel_banner.setVisibility(View.GONE);
-        } else {
-
-            if (viewItemBeanList.size() == 1) {
-                activity_process_cancel_banner_image.setVisibility(View.VISIBLE);
-                activity_process_cancel_banner.setVisibility(View.GONE);
-                Glide.with(this).load(viewItemBeanList.get(0).getUrl()).into(activity_process_cancel_banner_image);
-            } else {
-                activity_process_cancel_banner_image.setVisibility(View.GONE);
-                activity_process_cancel_banner.setVisibility(View.VISIBLE);
-                activity_process_cancel_banner_image.setBackgroundResource(0);
-            }
 
-            activity_process_cancel_banner.setVisibility(View.VISIBLE);
-        }
-        if (viewItemBeanList != null && activity_process_cancel_banner != null) {
-            activity_process_cancel_banner.update(viewItemBeanList);
-        }
     }
 
-
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { //禁用返回键

app/src/main/java/live/nodiyphoneshell/cend/view/process/cancel/ProcessCancelPresenter.java

@@ -35,7 +35,6 @@ public class ProcessCancelPresenter extends BasePresenter implements ProcessCanc
                     public void onError(Call call, Exception e, int id) {
                         closeLoad();
                     }
-
                     @Override
                     public void onResponse(String response, int id) {
                         closeLoad();

app/src/main/java/live/nodiyphoneshell/cend/widget/DragScaleView.java

@@ -79,10 +79,9 @@ public class DragScaleView extends View implements View.OnTouchListener {
             oriBottom = v.getBottom();
             lastY = (int) event.getRawY();
             lastX = (int) event.getRawX();
-            dragDirection = getDirection(v, (int) event.getX(),
-                    (int) event.getY());
+            dragDirection = getDirection(v, (int) event.getX(), (int) event.getY());
         }
-        // 处理拖动事件
+        //处理拖动事件
         delDrag(v, event, action);
         invalidate();
         return false;
@@ -90,7 +89,6 @@ public class DragScaleView extends View implements View.OnTouchListener {
 
     /**
      * 处理拖动事件
-     *
      * @param v
      * @param event
      * @param action

app/src/main/java/live/nodiyphoneshell/cend/widget/MainView.java

-package live.nodiyphoneshell.cend.widget;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Camera;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import live.nodiyphoneshell.cend.R;
-
-public class MainView  extends View {
-
-    //Camera类
-    private Camera mCamera;
-    private Bitmap face;
-    private Matrix mMatrix = new Matrix();
-    private Paint mPaint = new Paint();
-    private int mLastMotionX, mLastMotionY;
-    //图片旋转时的中心点坐标
-    private int centerX, centerY;
-    //转动的总距离，跟度数比例1:1
-    private int deltaX, deltaY;
-    //图片宽度高度
-    private int bWidth, bHeight;
-    public MainView(Context context, AttributeSet attributeSet) {
-        super(context,attributeSet);
-        setWillNotDraw(false);
-        mCamera = new Camera();
-        mPaint.setAntiAlias(true);
-        face = BitmapFactory.decodeResource(getResources(), R.drawable.icon_phone_rote_one);
-        bWidth = face.getWidth();
-        bHeight = face.getHeight();
-        centerX = bWidth>>1;
-        centerY = bHeight>>1;
-    }
-    void rotate(int degreeX, int degreeY) {
-        deltaX += degreeX;
-        deltaY += degreeY;
-        mCamera.save();
-        mCamera.rotateY(deltaX);
-        mCamera.rotateX(-deltaY);
-        mCamera.translate(0, 0, -centerX);
-        mCamera.getMatrix(mMatrix);
-        mCamera.restore();
-        //以图片的中心点为旋转中心,如果不加这两句，就是以（0,0）点为旋转中心
-        mMatrix.preTranslate(-centerX, -centerY);
-        mMatrix.postTranslate(centerX, centerY);
-        mCamera.save();
-        postInvalidate();
-    }
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        int x = (int) event.getX();
-        int y = (int) event.getY();
-        switch(event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                mLastMotionX = x;
-                mLastMotionY = y;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                int dx = x - mLastMotionX;
-                int dy = y - mLastMotionY;
-                rotate(dx, dy);
-                mLastMotionX = x;
-                mLastMotionY = y;
-                break;
-            case MotionEvent.ACTION_UP:
-                break;
-        }
-        return true;
-    }
-    @Override
-    public void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-        canvas.drawBitmap(face, mMatrix, mPaint);
-    }
-}

app/src/main/res/drawable/animation_lis_imaget.xml

-<?xml version="1.0" encoding="utf-8"?>
-<animation-list
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="true">
-    <item android:drawable="@drawable/icon_phone_rote_three" android:duration="700" />
-    <item android:drawable="@drawable/icon_phone_rote_four" android:duration="700" />
-    <item android:drawable="@drawable/icon_phone_rote_five" android:duration="700" />
-    <item android:drawable="@drawable/icon_phone_rote_six" android:duration="700" />
-    <item android:drawable="@drawable/icon_phone_rote_seven" android:duration="700" />
-</animation-list>
\ No newline at end of file

app/src/main/res/drawable/good_select_phone_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white_FFFFFF" />
-    <corners android:radius="30dp" />
-    <size android:width="50dp" android:height="20dip"/>
-</shape>

app/src/main/res/drawable/home_after_sale_wx_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_999999" />
-    <corners
-        android:bottomRightRadius="3dp"
-        android:topRightRadius="3dp" />
-    <size
-        android:width="42dip"
-        android:height="30dip"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/home_after_wx_bt.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="70dp"
-        android:height="25dp"></size>
-    <solid android:color="@color/color_4A8D46" />
-    <corners android:radius="40dp"/>
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/home_diy_make_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
- <solid android:color="#984ace" />
-    <size android:height="50dp" android:width="140dp"/>
-    <gradient
-        android:angle="180"
-        android:endColor="#984ACE"
-        android:startColor="#178CE6"
-        android:type="linear"
-        android:useLevel="true" />
-   <corners
-        android:radius="30dp"/>
-</shape>
-
-

app/src/main/res/drawable/home_look_line_up_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_282932" />
-    <corners
-        android:radius="3dp" />
-
-    <size android:width="150dp" android:height="46dip"/>
-
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/home_problem_make_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#984ace" />
-    <size
-        android:width="38dp"
-        android:height="110dp" />
-    <gradient
-        android:angle="180"
-        android:endColor="#984ACE"
-        android:startColor="#178CE6"
-        android:type="linear"
-        android:useLevel="true" />
-    <corners android:radius="30dp" />
-</shape>
-
-

app/src/main/res/drawable/home_start_marquee_view_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#282932" />
-    <corners android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dip" />
-    <size android:width="80dp" android:height="20dip"/>
-    <stroke android:color="#B5B5B5" android:width="1dip"/>
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/layout_confirm_lucky_dialog_left_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-    <corners
-        android:radius="4dp" />
-    <stroke android:color="@color/white_FFFFFF" android:width="1dip"/>
-
-    <size
-        android:width="80dip" android:height="20dip"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/layout_confirm_lucky_dialog_right_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FDD840" />
-    <corners
-        android:radius="4dp" />
-
-    <size
-        android:width="80dip" android:height="20dip"/>
-
-    <gradient
-        android:startColor="#FDAA03"
-        android:endColor="#FFEDC6"
-        android:angle="90"
-        />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/layout_confirm_lucky_dialog_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#F94151" />
-    <corners
-        android:radius="3dp" />
-    <size
-        android:width="80dip" android:height="20dip"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/layout_confirm_lucky_dialog_top_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FFDB84" />
-    <corners
-        android:radius="2dp" />
-    <size
-        android:width="80dip" android:height="20dip"/>
-    <gradient
-        android:startColor="#FFDB84"
-        android:endColor="#FFEDC6"
-        android:angle="90"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/layout_good_size_float.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"
-    android:useLevel="false">
-    <solid android:color="@color/color_282932" />
-    <size
-        android:width="35dp"
-        android:height="35dp" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/layout_online_list_item_back_discharge.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--<item android:width="273dp" android:height="63dp">-->
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-        <size android:width="273dp" android:height="60dp"/>
-        <solid android:color="@color/color_131319" />
-        <corners android:radius="3dip" />
-</shape>
-<!--</item>-->

app/src/main/res/drawable/layout_online_list_item_back_wait.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--<item android:width="273dp" android:height="63dp">-->
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-        <size android:width="273dp" android:height="63dp"/>
-        <solid android:color="@color/white_FFFFFF" />
-        <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />
-    </shape>
-<!--</item>-->

app/src/main/res/drawable/layout_online_list_item_red_wait.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--<item android:width="273dp" android:height="63dp">-->
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-        <size android:width="273dp" android:height="63dp"/>
-        <solid android:color="@color/color_F89293" />
-        <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />
-    </shape>
-<!--</item>-->

app/src/main/res/drawable/layout_select_phone_model_cancel_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/transparent"/>
-
-    <corners android:radius="20dp" />
-    <stroke android:width="1dp" android:color="@color/color_1A7DCD" />
-
-
-    <size android:height="40dp" android:width="137dp"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/layout_stickers_classification_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/color_282932" />
-    <size
-        android:width="67dip"
-        android:height="26dip" />
-    <stroke
-        android:width="1dip"
-        android:color="@color/color_B5B5B5" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/login_background_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FF4135"/>
-    <corners android:radius="4dp"/>
-    <size android:height="40dip" android:width="160dip"/>
-</shape>

app/src/main/res/drawable/lucky_open_fail_again_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-    <corners
-        android:radius="2dp"  />
-
-    <stroke android:color="@color/white_FFFFFF" android:width="1dip"/>
-
-    <size android:width="80dip" android:height="46dip"
-
-        />
-
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/lucky_open_fail_custom_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FED839" />
-    <corners
-        android:radius="2dp" />
-
-    <size android:width="80dp" android:height="46dip"/>
-
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/machine_code_password_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="207dp"
-        android:height="33dp" />
-    <solid android:color="@color/transparent" />
-    <corners android:radius="5dip" />
-
-    <stroke android:color="@color/color_333333" android:width="1dip"/>
-
-</shape>
-

app/src/main/res/drawable/make_add_text_black_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/black_000000" />
-    <size
-        android:width="32dp"
-        android:height="32dp" />
-</shape>
-

app/src/main/res/drawable/make_add_text_blue_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_050BDE" />
-    <size
-        android:width="32dp"
-        android:height="32dp" />
-</shape>
-

app/src/main/res/drawable/make_add_text_orange_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_E65C00" />
-    <size
-        android:width="32dp"
-        android:height="32dp" />
-</shape>
-

app/src/main/res/drawable/make_add_text_red_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_E60012" />
-    <size
-        android:width="32dp"
-        android:height="32dp" />
-</shape>
-

app/src/main/res/drawable/make_add_text_white_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/white_FFFFFF" />
-    <size
-        android:width="32dp"
-        android:height="32dp" />
-
-    <!--<stroke android:width="1.33dip" android:color="@color/color_ef6162"/>-->
-
-</shape>
-

app/src/main/res/drawable/make_again_upload_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/color_282932" />
-    <size
-        android:width="67dip"
-        android:height="20dip" />
-    <stroke
-        android:width="1dip"
-        android:color="@color/color_ef6162" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_buttom_blue_delect_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="90dip"
-        android:topRightRadius="90dip" />
-    <solid android:color="@color/color_5CE6B6" />
-    <size android:height="70dip" android:width="150dip"/>
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_buttom_buy_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_F56364" />
-    <corners android:topLeftRadius="30dp" android:bottomLeftRadius="30dip"/>
-    <size
-        android:width="100dp" android:height="50dp"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_buttom_no_buy_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_302D2B" />
-    <corners
-        android:topLeftRadius="30dp"
-        android:bottomLeftRadius="30dp"
-        />
-    <size
-        android:width="90dp"
-        android:height="40dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_buttom_red_delect_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="90dip"
-        android:topRightRadius="90dip" />
-    <solid android:color="@color/color_F46365" />
-
-    <size android:height="70dip" android:width="150dip"/>
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_clear_gray_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="100dp"
-        android:height="33dp"/>
-    <solid android:color="@color/white_FFFFFF" />
-    <corners
-        android:bottomLeftRadius="7dp"
-        android:bottomRightRadius="7dp"
-        android:topLeftRadius="7dp"
-        android:topRightRadius="7dp" />
-
-    <stroke android:color="@color/color_999999" android:width="1dip"/>
-
-</shape>
-

app/src/main/res/drawable/make_clear_white_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="100dp"
-        android:height="33dp"/>
-    <solid android:color="@color/white_FFFFFF" />
-    <corners
-        android:bottomLeftRadius="7dp"
-        android:bottomRightRadius="7dp"
-        android:topLeftRadius="7dp"
-        android:topRightRadius="7dp" />
-</shape>
-

app/src/main/res/drawable/make_commit_works_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="3dp" />
-    <solid android:color="@color/color_131319" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_diy_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent"/>
-    <size android:height="20dip" android:width="20dip"/>
-    <stroke android:width="0.5dip" android:color="@color/color_979797"/>
-
-</shape>
-

app/src/main/res/drawable/make_diy_no_select_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent"/>
-</shape>
-

app/src/main/res/drawable/make_editor_text.xml

-<?xml version="1.0" encoding="utf-8"?><!--<item android:width="360dp" android:height="173dp">-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/color_403E4A" />
-
-    <size
-        android:width="360dp"
-        android:height="29dip" />
-
-    <corners android:radius="5dp" />
-
-
-</shape><!--
-</item>-->

app/src/main/res/drawable/make_left_buttom_real_make_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-    <corners
-        android:bottomRightRadius="13dp"
-        android:topRightRadius="13dp" />
-    <size
-        android:width="40dip" android:height="180dip"/>
-
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_no_now_buy_bt_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_282932" />
-    <corners
-        android:radius="3dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_no_now_buy_bt_sure_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_302D2B" />
-    <corners
-        android:radius="3dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_now_buy_bt_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_F56364" />
-    <corners
-        android:radius="3dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_now_buy_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white_FFFFFF" />
-    <!--android:color="@color/color_282932"-->
-    <corners
-        android:radius="3dp" />
-
-    <size android:width="40dip" android:height="40dip"/>
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/make_now_no_select_buy_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/black_000000" />
-    <corners
-        android:radius="3dp" />
-
-    <size android:width="40dip" android:height="40dip"/>
-
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/make_pay_top_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#717175" />
-    <size
-        android:width="287dp"
-        android:height="13dp" />
-    <solid android:color="#717175" />
-    <corners android:radius="10dp" />
-
-</shape>
-

app/src/main/res/drawable/make_price_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_EF5253" />
-
-    <size android:width="20dp" android:height="9dp"/>
-
-    <corners android:topLeftRadius="3dp" android:topRightRadius="0dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp"/>
-
-    <!--<stroke android:width="1.33dip" android:color="@color/color_ef6162"/>-->
-
-</shape>
-

app/src/main/res/drawable/make_right_buttom_real_make_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/transparent" />
-    <corners
-        android:bottomLeftRadius="13dp"
-        android:topLeftRadius="13dp" />
-    <size
-        android:width="52dip" android:height="257dp"/>
-
-
-
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_top_blue_delect_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:bottomRightRadius="90dip"
-        android:bottomLeftRadius="90dip" />
-    <solid android:color="@color/color_5CE5B5" />
-    <size android:height="70dip" android:width="150dip"/>
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_top_contain_round_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_F56364" />
-    <size
-        android:width="50dp"
-        android:height="50dp" />
-</shape>
-

app/src/main/res/drawable/make_top_green_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_F56364" />
-    <size
-        android:width="20dp"
-        android:height="20dp" />
-</shape>
-

app/src/main/res/drawable/make_top_red_delect_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:bottomRightRadius="90dip"
-        android:bottomLeftRadius="90dip" />
-    <solid android:color="@color/color_F46365" />
-    <size android:height="70dip" android:width="150dip"/>
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_top_red_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/color_F56364" />
-    <size
-        android:width="20dp"
-        android:height="20dp" />
-</shape>
-

app/src/main/res/drawable/make_top_white_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/transparent" />
-    <size
-        android:width="20dp"
-        android:height="20dp" />
-
-    <stroke android:width="1dp" android:color="@color/white_FFFFFF"/>
-
-</shape>
-

app/src/main/res/drawable/make_uplaod_image_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white_FFFFFF" />
-    <corners
-        android:bottomLeftRadius="5dp"
-        android:bottomRightRadius="5dp" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_upload_image_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_F56364"/>
-    <corners android:radius="7dp"/>
-    <size android:height="37dp" android:width="209dp"/>
-</shape>
-
-
-<!--<item android:width="209dp" android:height="37dp">
-<shape android:shape="rectangle">
-    <solid android:color="#fff56364" />
-    <corners android:topLeftRadius="7dp" android:topRightRadius="7dp" android:bottomLeftRadius="7dp" android:bottomRightRadius="7dp" />
-</shape>
-</item>-->

app/src/main/res/drawable/make_work_green_line_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <stroke android:color="@color/color_E60012"
-        android:width="0.5dp"
-        android:dashGap="2dp"
-        android:dashWidth="2dp"
-        />
-    <size android:height="0.8dp"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_work_green_vertital_line_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="90"
-    android:toDegrees="90">
-    <shape android:shape="line">
-        <stroke
-            android:dashGap="6dp"
-            android:dashWidth="3dp"
-            android:width="0.5dp"
-            android:color="@color/color_5CE6B6" />
-        <size android:height="1dp" />
-    </shape>
-
-</rotate>
\ No newline at end of file

app/src/main/res/drawable/make_work_red_line_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-
-   <!-- @color/color_5CE6B6-->
-
-   <!-- color/color_E60012-->
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/color_1A7DCD" />
-    <!-- 虚线的高度 -->
-    <size android:height="0.7dp" />
-
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/make_work_red_vertital_line_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="-300dp"
-        android:right="-300dp">
-        <rotate
-            android:drawable="@drawable/make_work_red_line_shap"
-            android:fromDegrees="90" />
-    </item>
-</layer-list>
-
-
-<!--
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-android:fromDegrees="90"
-android:toDegrees="90">
-
-<shape android:shape="line">
-    <stroke
-        android:color="@color/color_5CE6B6"
-        android:dashGap="2dp"
-        android:dashWidth="2dp"
-        android:width="0.5dp" />
-</shape>
-
-</rotate>-->

app/src/main/res/drawable/make_works_shap.xml

-<?xml version="1.0" encoding="utf-8"?><!--<item android:width="100dp" android:height="33dp">-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="100dp"
-        android:height="33dp" />
-    <solid android:color="@color/white_FFFFFF" />
-    <stroke
-        android:width="0.5dip"
-        android:color="@color/color_999999" />
-    <corners android:radius="7dip" />
-</shape><!--
-</item>-->

app/src/main/res/drawable/no_empt_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FF3835"/>
-    <corners android:radius="20dp"/>
-    <size android:height="40dip" android:width="160dip"/>
-</shape>

app/src/main/res/drawable/online_float_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_5CE6B6" />
-
-    <size android:width="22dp" android:height="12dp"/>
-
-    <corners android:radius="10dip"/>
-
-
-</shape>
-

app/src/main/res/drawable/pay_code_white_back.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white_FFFFFF" />
-    <corners android:radius="8dp" />
-    <size android:width="60dp" android:height="100dip"/>
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/pay_succeed_bt_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#ffffff"/>
-    <corners android:radius="20dp"/>
-    <size android:height="40dip" android:width="160dip"/>
-    <stroke android:width="1dip" android:color="#979797"/>
-
-</shape>

app/src/main/res/drawable/picture_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-    <corners
-        android:bottomRightRadius="40dp"
-        android:topRightRadius="40dp" />
-    <size
-        android:layout_width="62dp"
-        android:layout_height="26dp"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/process_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-    <corners
-        android:bottomRightRadius="40dp"
-        android:topRightRadius="40dp" />
-    <size
-        android:layout_width="62dp"
-        android:layout_height="26dp"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/process_image_diy_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white_FFFFFF" />
-    <corners android:radius="6dp" />
-    <size
-        android:width="100dip"
-        android:height="100dip" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/process_pick_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/transparent" />
-    <corners
-        android:radius="5dp" />
-    <size
-        android:width="209dp"
-        android:height="37dp"/>
-
-    <stroke android:color="@color/color_F56364" android:width="1dip"/>
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/process_pick_print_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_F56364" />
-    <corners
-        android:radius="5dp" />
-    <size
-        android:width="209dp"
-        android:height="37dp"/>
-</shape>
\ No newline at end of file

app/src/main/res/drawable/process_white_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="62dp"
-        android:height="26dp"/>
-
-    <solid android:color="@color/white_FFFFFF" />
-    <corners
-        android:bottomRightRadius="40dp"
-        android:topRightRadius="40dp" />
-
-</shape>
\ No newline at end of file

app/src/main/res/drawable/select_phone_brand_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#363743" />
-    <corners android:radius="5dip" />
-    <size
-        android:width="138dp"
-        android:height="29dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/select_phone_model_list_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="55dip"
-        android:height="22dp" />
-    <solid android:color="@color/color_131319" />
-    <corners android:radius="15dip" />
-
-</shape>
-

app/src/main/res/drawable/shape_red_dash_line.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <size android:height="10dp" android:width="20dip" />
-    <stroke
-
-        android:color="@color/color_ef6162" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/shape_white_dash_line.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <size android:height="0.5dp" />
-    <stroke
-        android:dashGap="3dp"
-        android:dashWidth="2dp"
-        android:width="0.5dp"
-        android:color="@color/color_B6B6B6" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/sticker_black_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/black_000000" />
-    <size android:width="200dp" android:height="50dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/sticker_blue_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_050BDE" />
-    <size android:width="200dp" android:height="50dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/sticker_orange_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_E65C00" />
-    <size android:width="200dp" android:height="50dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/sticker_red_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_E60012" />
-    <size android:width="200dp" android:height="50dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/sticker_white_background.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white_FFFFFF" />
-    <size android:width="200dp" android:height="50dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/tab_button_addtext_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/icon_make_select_typeface"/>
-<!-- not selected -->
-<item android:state_pressed="false" android:drawable="@drawable/icon_make_no_select_typeface"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_make_delect_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/icon_make_delect_select_default"/>
-<!-- not selected -->
-<item android:state_pressed="false" android:drawable="@drawable/icon_make_delect_default"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_make_edit_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/icon_make_editor_select_default"/>
-<!-- not selected -->
-<item android:state_pressed="false" android:drawable="@drawable/icon_make_editor_default"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_make_no_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/icon_make_on_default"/>
-<!-- not selected -->
-<item android:state_pressed="false" android:drawable="@drawable/icon_make_on_default"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_make_up_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/icon_make_up_select_default"/>
-<!-- not selected -->
-<item android:state_pressed="false" android:drawable="@drawable/icon_make_up_select_default"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_picture_frame_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/icon_make_select_form"/>
-    <!-- not selected -->
-    <item android:state_pressed="false" android:drawable="@drawable/icon_make_no_select_form"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_sticker_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/icon_make_select_stickers"/>
-    <!-- not selected -->
-    <item android:state_pressed="false" android:drawable="@drawable/icon_make_no_select_stickers"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/tab_button_upload_image.xml

-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:state_pressed="true" android:drawable="@drawable/icon_make_no_select_photo"/>
-<!-- not selected -->
-<item android:state_pressed="false" android:drawable="@drawable/icon_make_select_photo"/>
-</selector>
\ No newline at end of file

app/src/main/res/drawable/text_cursor_white_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:width="1dp" android:height="5dip" />
-    <solid android:color="@color/white_FFFFFF" />
-
-</shape>
-

app/src/main/res/drawable/toast_background_shape.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#141415" />
-    <corners android:radius="2dp" />
-    <size android:height="20dip" android:width="80dip"/>
-</shape>

app/src/main/res/drawable/work_list_item_back_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_282932" />
-    <corners
-        android:radius="3dp" />
-</shape>
\ No newline at end of file

app/src/main/res/drawable/work_make_now_buy_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_F56364" />
-    <corners
-        android:radius="3dp" />
-
-    <size android:width="40dip" android:height="40dip"/>
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/drawable/work_make_now_no_select_buy_shap.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_CCCCCC" />
-    <corners
-        android:radius="3dp" />
-
-    <size android:width="40dip" android:height="40dip"/>
-
-   <!-- 150dp
-    46.67dp-->
-</shape>

app/src/main/res/layout/activity_log_file.xml

@@ -9,7 +9,6 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/process_back_shap"
         android:orientation="horizontal">
 
         <TextView

app/src/main/res/layout/activity_machine_code.xml

@@ -4,11 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black_000000"
-
     android:orientation="vertical">
-
-
-
     <LinearLayout
         android:id="@+id/activity_home_machine_back_back_le"
         android:layout_width="65dp"
@@ -17,8 +13,7 @@
         android:gravity="center_vertical"
         android:layout_marginTop="10dip"
         android:orientation="horizontal"
-        android:visibility="gone"
-        >
+        android:visibility="gone">
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -31,16 +26,12 @@
             android:textColor="@color/white_FFFFFF"
             android:textSize="13sp"/>
     </LinearLayout>
-
-
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="80dip"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/icon_machine_logo" />
-
-
+        android:background="@drawable/app_logo" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -49,7 +40,6 @@
         android:layout_gravity="center_horizontal"
         android:textColor="@color/white_FFFFFF"
         android:textSize="21sp" />
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -58,7 +48,6 @@
         android:layout_gravity="center_horizontal"
         android:textColor="@color/white_FFFFFF"
         android:textSize="12sp" />
-
     <EditText
         android:id="@+id/activity_machine_code_text"
         android:layout_width="wrap_content"
@@ -72,7 +61,6 @@
         android:textColor="@color/white_FFFFFF"
         android:textColorHint="@color/white_FFFFFF"
         android:textSize="12sp" />
-
     <Button
         android:id="@+id/activity_machine_code_bt"
         android:layout_width="wrap_content"
@@ -83,12 +71,10 @@
         android:layout_gravity="center_horizontal"
         android:textColor="@color/white_FFFFFF"
         android:textSize="12sp" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="0.9" />
-
+        android:layout_weight="0.9"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -96,7 +82,5 @@
         android:layout_gravity="center_horizontal"
         android:text="深圳市瑞丰彩科技有限公司出品"
         android:textColor="@color/white_FFFFFF"
-        android:textSize="11sp" />
-
-
+        android:textSize="11sp"/>
 </LinearLayout>

app/src/main/res/layout/activity_process.xml

@@ -7,28 +7,39 @@
     android:background="@drawable/icon_process_bg"
     android:orientation="vertical">
 
-    <live.nodiyphoneshell.cend.widget.RecyclerScrollview
-        android:layout_width="720dp"
+
+    <ImageView
+        android:id="@+id/activity_process_top_start_come"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/icon_process_back_print"
+        />
+
+
+    <!--<live.nodiyphoneshell.cend.widget.RecyclerScrollview
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="-10dp"
         android:orientation="horizontal"
         android:overScrollMode="never">
         <LinearLayout
             android:id="@+id/activity_process_top_on_start_come_le"
-            android:layout_width="720dp"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
-            <ImageView
+          &lt;!&ndash;  <ImageView
                 android:id="@+id/activity_process_top_on_start_come"
                 android:layout_width="360dp"
                 android:layout_height="match_parent"
-                android:background="@drawable/icon_pay_back" />
+                android:background="@drawable/icon_pay_back" />&ndash;&gt;
             <ImageView
                 android:id="@+id/activity_process_top_start_come"
-                android:layout_width="360dp"
-                android:layout_height="match_parent"/>
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/icon_process_back_print"
+                />
         </LinearLayout>
-    </live.nodiyphoneshell.cend.widget.RecyclerScrollview>
+    </live.nodiyphoneshell.cend.widget.RecyclerScrollview>-->
 
    <!-- <RelativeLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_process_cancel.xml

@@ -41,17 +41,7 @@
             android:textColor="@color/white_FFFFFF"
             android:textSize="16sp" />
 
-        <TextView
-            android:id="@+id/activity_process_cancel_back_home"
-            android:layout_width="209dp"
-            android:layout_height="37dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="34dip"
-            android:background="@drawable/process_pick_back_shap"
-            android:gravity="center"
-            android:text="返回首页"
-            android:textColor="@color/white_FFFFFF"
-            android:textSize="16sp" />
+
 
         <TextView
             android:id="@+id/activity_process_cancel_customer_phone"
@@ -66,7 +56,7 @@
 
     </LinearLayout>
 
-    <com.lake.banner.HBanner
+   <!-- <com.lake.banner.HBanner
         android:id="@+id/activity_process_cancel_banner"
         android:layout_width="match_parent"
         android:layout_height="87dip"
@@ -79,7 +69,7 @@
         android:layout_height="87dip"
         android:visibility="gone"
         />
-
+-->
 
 
     <!--<com.youth.banner.Banner

app/src/main/res/layout/activity_process_complete.xml

@@ -20,12 +20,12 @@
             android:orientation="vertical">
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="730dp"
-                android:background="@drawable/icon_process_print_strat"/>
+                android:layout_height="730dp" />
+            <!--android:background="@drawable/icon_process_print_strat"-->
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="730dp"
-                android:background="@drawable/icon_complete_start"/>
+                android:layout_height="730dp" />
+            <!-- android:background="@drawable/icon_complete_start"-->
         </LinearLayout>
     </live.nodiyphoneshell.cend.widget.RecyclerScrollview>
 
@@ -51,34 +51,31 @@
             android:textColor="@color/white_FFFFFF"
             android:textSize="13sp"/>
     </LinearLayout>
-
     <RelativeLayout
         android:id="@+id/activity_process_complete_diy_image_back_le"
         android:layout_width="122dip"
         android:layout_height="251dp"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"
-        >
+        app:layout_constraintTop_toTopOf="parent">
         <ImageView
             android:id="@+id/activity_complete_proces_diy_image_white"
             android:layout_width="100dp"
             android:layout_height="210dp"
             android:layout_centerInParent="true"
             android:background="@color/white_FFFFFF"
-            android:visibility="gone"/>
+            android:visibility="gone" />
         <ImageView
             android:id="@+id/activity_complete_proces_diy_image"
             android:layout_width="121dp"
             android:layout_height="246dp"
-            android:layout_centerInParent="true"/>
+            android:layout_centerInParent="true" />
         <ImageView
             android:id="@+id/activity_complete_process_diy_image_back"
             android:layout_width="122dip"
             android:layout_height="251dp" />
     </RelativeLayout>
-
     <LinearLayout
         android:id="@+id/activity_process_complete_time_le"
         android:layout_width="wrap_content"
@@ -113,9 +110,6 @@
             android:text="打印完成，请取货"
             android:textColor="@color/color_F46365"
             android:textSize="16sp" />
-
     </LinearLayout>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_home.xml

@@ -77,15 +77,5 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-    <include
-        android:id="@+id/layout_my_prompt_message_le"
-        layout="@layout/layout_my_prompt_message"
-        android:layout_width="wrap_content"
-        android:layout_height="25dip"
-        android:layout_marginLeft="25dip"
-        android:layout_marginTop="100dip"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/layout_base_dialog.xml

@@ -2,9 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/make_commit_works_shap"
     android:orientation="vertical">
-
     <TextView
         android:id="@+id/txt_title"
         android:layout_width="match_parent"
@@ -14,7 +12,6 @@
         android:text="提示"
         android:textColor="@color/color_333333"
         android:textSize="15sp" />
-
     <TextView
         android:id="@+id/txt_message"
         android:layout_width="match_parent"
@@ -24,7 +21,6 @@
         android:text="是否提交作品？"
         android:textColor="@color/color_333333"
         android:textSize="15sp" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,7 +37,6 @@
             android:gravity="center"
             android:text="继续完善"
             android:textColor="@color/color_666666"
-            android:background="@drawable/make_works_shap"
             android:textSize="15sp" />
         <TextView
             android:id="@+id/txt_right"
@@ -49,7 +44,6 @@
             android:layout_height="32dip"
             android:gravity="center"
             android:text="提交作品"
-            android:background="@drawable/make_works_shap"
             android:textColor="#ffef6162"
             android:layout_marginLeft="13dip"
             android:textSize="15sp" />

app/src/main/res/layout/layout_change_seet.xml

@@ -15,8 +15,7 @@
         android:gravity="center"
         android:paddingRight="15dip"
         android:paddingLeft="15dip"
-        android:layout_marginTop="40dip"
-        android:background="@drawable/select_phone_model_list_shap" />
+        android:layout_marginTop="40dip" />
 
     <TextView
         android:id="@+id/layout_change_seet_test"
@@ -29,7 +28,6 @@
         android:paddingRight="15dip"
         android:paddingLeft="15dip"
         android:layout_marginTop="20dip"
-        android:layout_marginBottom="40dip"
-        android:background="@drawable/select_phone_model_list_shap" />
+        android:layout_marginBottom="40dip" />
 
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/layout_clear_all_dialog.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="245dip"
-    android:layout_height="160dp"
-    android:background="@drawable/make_pay_succeed_shap"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="199dp"
-        android:layout_height="wrap_content"
-        android:text="使用当前模板将会清空DIY区域的内容。确定使用吗？"
-        android:textColor="@color/color_333333"
-        android:textSize="16sp"
-        android:lineSpacingExtra="3dip"
-        android:layout_marginTop="37dip"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="37dip"
-        android:orientation="horizontal">
-        <TextView
-            android:id="@+id/layout_clear_all_dialog_confirm"
-            android:layout_width="100dip"
-            android:layout_height="33dip"
-            android:background="@drawable/make_clear_gray_shap"
-            android:text="确定"
-            android:gravity="center"
-            android:textColor="@color/color_666666"
-            android:textSize="16sp" />
-        <TextView
-            android:id="@+id/layout_clear_all_dialog_cancel"
-            android:layout_width="100dip"
-            android:layout_height="33dip"
-            android:background="@drawable/make_clear_gray_shap"
-            android:text="取消"
-            android:gravity="center"
-            android:layout_marginLeft="20dip"
-            android:textColor=" #ffef6162"
-            android:textSize="16sp" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/layout_crop_top.xml

@@ -13,15 +13,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:padding="15dip"
-        android:src="@drawable/icon_crop_cancel" />
+        android:padding="15dip" />
 
     <ImageView
         android:id="@+id/layout_crop_view_top_confirm"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:padding="15dip"
-        android:src="@drawable/icon_crop_confirm" />
+        android:padding="15dip" />
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/layout_crop_view.xml

-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_crop_view_re"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:clipChildren="true"
-    android:background="@color/color_F56364"
-    android:gravity="center">
-
-    <FrameLayout
-        android:id="@+id/layout_crop_view_fra_re"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        >
-        <ImageView
-            android:id="@+id/layout_crop_view_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            />
-    </FrameLayout>
-
-</RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/layout_disable_dialog.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/make_commit_works_shap"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/txt_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dip"
-        android:gravity="center"
-        android:text="提示"
-        android:textColor="@color/white_FFFFFF"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/txt_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dip"
-        android:gravity="center"
-        android:text="是否提交作品？"
-        android:textColor="@color/white_FFFFFF"
-        android:textSize="14sp"
-        android:layout_marginBottom="25dip"
-        />
-
-<!--    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="40dip"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_marginBottom="10dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip">
-        <TextView
-            android:id="@+id/txt_left"
-            android:layout_width="100dip"
-            android:layout_height="32dip"
-            android:gravity="center"
-            android:text="继续完善"
-            android:textColor="@color/color_666666"
-            android:background="@drawable/make_works_shap"
-            android:textSize="15sp" />
-        <TextView
-            android:id="@+id/txt_right"
-            android:layout_width="100dip"
-            android:layout_height="32dip"
-            android:gravity="center"
-            android:text="提交作品"
-            android:background="@drawable/make_works_shap"
-            android:textColor="#ffef6162"
-            android:layout_marginLeft="13dip"
-            android:textSize="15sp" />
-    </LinearLayout>-->
-
-</LinearLayout>

app/src/main/res/layout/layout_home_enter_back.xml

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="245dip"
     android:layout_height="180dp"
-    android:background="@drawable/make_pay_succeed_shap"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -10,7 +9,6 @@
         android:id="@+id/layout_machine_home_back_code_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/machine_code_password_shap"
         android:hint="输入机器密码"
         android:paddingLeft="15dip"
         android:layout_gravity="center_horizontal"
@@ -25,7 +23,6 @@
         android:layout_width="wrap_content"
         android:layout_height="35dip"
         android:layout_marginTop="20dip"
-        android:background="@drawable/machine_code_bt_shap"
         android:text="确定"
         android:layout_gravity="center_horizontal"
         android:textColor="@color/white_FFFFFF"

app/src/main/res/layout/layout_make_process.xml

@@ -5,7 +5,6 @@
     android:layout_height="wrap_content"
     android:background="@color/color_131319"
     android:orientation="vertical">
-
     <LinearLayout
         android:id="@+id/activity_make_back_le"
         android:layout_width="62dp"
@@ -14,8 +13,7 @@
         android:background="@drawable/make_back_shap"
         android:gravity="center"
         android:orientation="horizontal"
-        android:visibility="gone"
-        >
+        android:visibility="gone">
         <ImageView
             android:layout_width="8dip"
             android:layout_height="16dip"
@@ -29,211 +27,4 @@
             android:textSize="13sp"/>
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dip"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="-17dip">
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal" />
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-                <ImageView
-                    android:id="@+id/layout_make_process_step_one_image"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:layout_gravity="center_horizontal"
-                    android:background="@drawable/make_top_green_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_diy_white" />
-                <ImageView
-                    android:id="@+id/layout_make_process_step_one_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@color/color_F56364" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal">
-                <ImageView
-                    android:id="@+id/layout_make_process_step_two_image"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5.5dip"
-                    android:src="@drawable/icon_make_payment"/>
-                <ImageView
-                    android:id="@+id/layout_make_process_step_two_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:visibility="gone">
-                <ImageView
-                    android:id="@+id/layout_make_process_step_three_image"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_discharge"/>
-                <ImageView
-                    android:id="@+id/layout_make_process_step_three_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:visibility="gone">
-                <ImageView
-                    android:id="@+id/layout_make_process_step_four_image"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_cargo"/>
-                <ImageView
-                    android:id="@+id/layout_make_process_step_four_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal">
-                <ImageView
-                    android:id="@+id/layout_make_process_step_five_image"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_printing"/>
-                <ImageView
-                    android:id="@+id/layout_make_process_step_five_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:orientation="horizontal">
-                <ImageView
-                    android:id="@+id/layout_make_process_step_six_image"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5.5dip"
-                    android:src="@drawable/icon_make_take"/>
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="7dip"
-            android:paddingLeft="-17dip"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="@color/color_F56364"
-                android:textSize="11sp" />
-            <TextView
-                android:id="@+id/layout_make_process_step_one_text"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="定制"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp"/>
-            <TextView
-                android:id="@+id/layout_make_process_step_two_text"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="支付"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp"/>
-            <TextView
-                android:id="@+id/layout_make_process_step_three_text"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:layout_marginLeft="6dip"
-                android:text="出料"
-                android:visibility="gone"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp"/>
-            <TextView
-                android:id="@+id/layout_make_process_step_four_text"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="入货"
-                android:visibility="gone"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp"/>
-            <TextView
-                android:id="@+id/layout_make_process_step_five_text"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="打印"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
-            <TextView
-                android:id="@+id/layout_make_process_step_six_text"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="取货"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
-        </LinearLayout>
-    </LinearLayout>
-
-
 </LinearLayout>

app/src/main/res/layout/layout_make_process_pay.xml

@@ -40,142 +40,59 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal"/>
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:layout_gravity="center_horizontal"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_diy_ash" />
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="1dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_white_dash_line"
-                    android:layerType="software"/>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_red_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_payment_white" />
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="1dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_red_dash_line"
-                    android:layerType="software" />
-            </LinearLayout>
-
 
             <LinearLayout
-                android:layout_width="0dip"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
+                android:layout_marginTop="7dip"
                 android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_printing" />
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="1dip"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_white_dash_line"
-                    android:layerType="software" />
-            </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_take" />
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="@color/color_F56364"
+                    android:textSize="11sp" />
+
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="-8dip"
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:text="T恤定制"
+                    android:textColor="@color/white_FFFFFF"
+                    android:textSize="10.5sp" />
+
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="2dip"
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:text="去支付"
+                    android:textColor="@color/color_F56364"
+                    android:textSize="10.5sp" />
+
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dip"
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:text="冲印"
+                    android:textColor="@color/color_666666"
+                    android:textSize="10.5sp"/>
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="left"
+                    android:text="取衣"
+                    android:textColor="@color/color_666666"
+                    android:textSize="10.5sp"/>
             </LinearLayout>
         </LinearLayout>
 
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="7dip"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="@color/color_F56364"
-                android:textSize="11sp" />
-
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="-8dip"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="T恤定制"
-                android:textColor="@color/white_FFFFFF"
-                android:textSize="10.5sp" />
-
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="2dip"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="去支付"
-                android:textColor="@color/color_F56364"
-                android:textSize="10.5sp" />
-
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dip"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="冲印"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
-
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="取衣"
-                android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
-        </LinearLayout>
     </LinearLayout>
-
-
+</LinearLayout>
\ No newline at end of file
-</LinearLayout>

app/src/main/res/layout/layout_make_work_process.xml

@@ -5,8 +5,7 @@
     android:layout_height="40dip"
     android:background="@color/color_131319"
     android:orientation="vertical"
-    app:layout_constraintTop_toTopOf="parent"
-    >
+    app:layout_constraintTop_toTopOf="parent">
     <LinearLayout
         android:id="@+id/activity_make_back_le"
         android:layout_width="65dp"
@@ -14,8 +13,7 @@
         android:background="@drawable/make_back_shap"
         android:gravity="center_vertical"
         android:layout_marginTop="10dip"
-        android:orientation="horizontal"
-        >
+        android:orientation="horizontal">
         <ImageView
             android:id="@+id/activity_make_back_image"
             android:layout_width="wrap_content"
@@ -29,14 +27,12 @@
             android:textColor="@color/white_FFFFFF"
             android:textSize="13sp"/>
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
         android:orientation="vertical"
-        android:visibility="gone"
-        >
+        android:visibility="gone">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -46,7 +42,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="horizontal" />
+                android:orientation="horizontal"/>
             <LinearLayout
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
@@ -57,15 +53,13 @@
                     android:layout_width="20dip"
                     android:layout_height="20dip"
                     android:layout_gravity="center_horizontal"
-                    android:background="@drawable/make_top_green_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_diy_white" />
+                    android:padding="5dip"/>
                 <ImageView
                     android:id="@+id/layout_make_process_step_one_line"
                     android:layout_width="match_parent"
                     android:layout_height="0.5dip"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/color_5CE5B5" />
+                    android:background="@color/color_5CE5B5"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="0dip"
@@ -77,15 +71,13 @@
                     android:id="@+id/layout_make_process_step_two_image"
                     android:layout_width="20dip"
                     android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5.5dip"
-                    android:src="@drawable/icon_make_payment"/>
+                    android:padding="5.5dip"/>
                 <ImageView
                     android:id="@+id/layout_make_process_step_two_line"
                     android:layout_width="match_parent"
                     android:layout_height="0.5dip"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5" />
+                    android:background="@color/color_B5B5B5"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="0dip"
@@ -93,21 +85,19 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:visibility="gone"
-                >
+                android:visibility="gone">
                 <ImageView
                     android:id="@+id/layout_make_process_step_three_image"
                     android:layout_width="20dip"
                     android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
                     android:padding="5dip"
-                    android:src="@drawable/icon_make_discharge" />
+                    android:src="@drawable/icon_make_discharge"/>
                 <ImageView
                     android:id="@+id/layout_make_process_step_three_line"
                     android:layout_width="match_parent"
                     android:layout_height="0.5dip"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5" />
+                    android:background="@color/color_B5B5B5"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="0dip"
@@ -115,21 +105,19 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:visibility="gone"
-                >
+                android:visibility="gone">
                 <ImageView
                     android:id="@+id/layout_make_process_step_four_image"
                     android:layout_width="20dip"
                     android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
                     android:padding="5dip"
-                    android:src="@drawable/icon_make_cargo" />
+                    android:src="@drawable/icon_make_cargo"/>
                 <ImageView
                     android:id="@+id/layout_make_process_step_four_line"
                     android:layout_width="match_parent"
                     android:layout_height="0.5dip"
                     android:layout_gravity="center_vertical"
-                    android:background="@color/color_B5B5B5" />
+                    android:background="@color/color_B5B5B5"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="0dip"
@@ -141,9 +129,7 @@
                     android:id="@+id/layout_make_process_step_five_image"
                     android:layout_width="20dip"
                     android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
-                    android:padding="5dip"
-                    android:src="@drawable/icon_make_printing" />
+                    android:padding="5dip" />
                 <ImageView
                     android:id="@+id/layout_make_process_step_five_line"
                     android:layout_width="match_parent"
@@ -161,13 +147,11 @@
                     android:id="@+id/layout_make_process_step_six_image"
                     android:layout_width="20dip"
                     android:layout_height="20dip"
-                    android:background="@drawable/make_top_white_shap"
                     android:padding="5.5dip"
-                    android:src="@drawable/icon_make_take" />
+                    android:src="@drawable/icon_make_take"/>
             </LinearLayout>
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -179,7 +163,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textColor="@color/color_F56364"
-                android:textSize="11sp" />
+                android:textSize="11sp"/>
             <TextView
                 android:id="@+id/layout_make_process_step_one_text"
                 android:layout_width="0dip"
@@ -189,7 +173,7 @@
                 android:gravity="left"
                 android:text="定制"
                 android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
+                android:textSize="10.5sp"/>
             <TextView
                 android:id="@+id/layout_make_process_step_two_text"
                 android:layout_width="0dip"
@@ -199,7 +183,7 @@
                 android:layout_marginLeft="-8dip"
                 android:text="支付"
                 android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
+                android:textSize="10.5sp"/>
             <TextView
                 android:id="@+id/layout_make_process_step_three_text"
                 android:layout_width="0dip"
@@ -210,7 +194,7 @@
                 android:text="出料"
                 android:visibility="gone"
                 android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
+                android:textSize="10.5sp"/>
             <TextView
                 android:id="@+id/layout_make_process_step_four_text"
                 android:layout_width="0dip"
@@ -220,7 +204,7 @@
                 android:text="入货"
                 android:visibility="gone"
                 android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
+                android:textSize="10.5sp"/>
             <TextView
                 android:id="@+id/layout_make_process_step_five_text"
                 android:layout_width="0dip"
@@ -239,9 +223,8 @@
                 android:text="取货"
                 android:layout_marginLeft="4dip"
                 android:textColor="@color/color_666666"
-                android:textSize="10.5sp" />
+                android:textSize="10.5sp"/>
         </LinearLayout>
     </LinearLayout>
 
-
 </LinearLayout>

app/src/main/res/layout/layout_my_prompt_message.xml

-<?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:layout_width="wrap_content"
-    android:layout_height="25dip"
-    android:background="@drawable/home_start_marquee_view_shap"
-    android:gravity="center"
-    android:orientation="horizontal"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/layout_my_prompt_message_image"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_marginLeft="8dip"
-        app:civ_border_color="#B5B5B5"
-        app:civ_border_width="1dp" />
-    <TextView
-        android:id="@+id/layout_my_prompt_message_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="8dip"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text=""
-        android:textColor="@color/color_999999"
-        android:textSize="12sp" />
-</LinearLayout>
-

app/src/main/res/layout/layout_pay_dialog.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="140dp"
-    android:layout_height="235dp"
-    android:background="@drawable/pay_code_white_back"
-    android:orientation="vertical"
-    android:id="@+id/layout_pay_code_le"
-    android:visibility="gone">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="20dip"
-        android:text="微信扫码领取"
-        android:textColor="@color/color_333333"
-        android:textSize="14sp"
-        android:textStyle="bold"/>
-    <TextView
-        android:id="@+id/layout_pay_countdown"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="5dip"
-        android:text="请在60秒内完成支付"
-        android:textColor="@color/color_333333"
-        android:textSize="10sp"/>
-    <ImageView
-        android:id="@+id/layout_pay_qr_code"
-        android:layout_width="90dip"
-        android:layout_height="90dip"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="15dip"
-        android:background="@drawable/icon_defalut_code"/>
-    <TextView
-        android:id="@+id/layout_pay_template_money"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dip"
-        android:layout_gravity="center"
-        android:text=""
-        android:textColor="@color/color_F46365"
-        android:textSize="20sp"/>
-</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/layout_pay_succeed_dialog.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="250dip"
-    android:layout_height="250dip"
-    android:background="@drawable/make_pay_succeed_shap"
-    android:gravity="center"
-    android:orientation="vertical">
-    <ImageView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:background="@drawable/icon_pay_success" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="支付成功"
-        android:textColor="@color/color_333333"
-        android:textSize="19sp" />
-</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/layout_pay_succeed_fail.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="250dip"
-    android:layout_height="250dip"
-    android:background="@drawable/make_pay_succeed_shap"
-    android:gravity="center"
-    android:orientation="vertical">
-    <ImageView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:background="@drawable/icon_pay_fail" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="支付失败"
-        android:layout_marginTop="20dip"
-        android:textColor="@color/color_333333"
-        android:textSize="19sp" />
-</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/toast_layout.xml

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/make_commit_works_shap"
     android:gravity="center"
     android:orientation="vertical">
     <TextView
@@ -15,5 +14,5 @@
         android:layout_marginBottom="10dip"
         android:text=""
         android:textColor="@color/white_FFFFFF"
-        android:textSize="14sp" />
+        android:textSize="14sp"/>
 </LinearLayout>
\ No newline at end of file

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

@@ -2,7 +2,6 @@
     <string name="app_name">色彩手机壳</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-
     <string name="empty_msg">数据被外星人劫走了~~</string>
     <string name="load_more">加载更多</string>
     <string name="main_tab_home_title">首页</string>
@@ -18,32 +17,11 @@
     <string name="aby_setting_msg">找到并勾选\"色彩手机壳服务\"。</string>
     <string name="unknow_setting_title">\"未知来源\"设置</string>
     <string name="yes">确定</string>
-    <string name="aby_label">色彩手机壳服务</string>
+    <string name="aby_label">自动色彩手机壳服务</string>
     <string name="aby_desc">开启本服务后，在安装应用的过程中会辅助点击相应按钮，实现自动安装和启动应用，省去频繁手动点击。</string>
     <string name="aby_set">打开系统设置：\n1.在辅助功能(无障碍)中，找到并勾选\"色彩手机壳服务\"；\n2.在安全中，找到并勾选\"未知来源\"。</string>
     <string name="unknow_setting_msg">找到并勾选\"未知来源\"。</string>
 
-
-    <string-array name="lucy_names">
-        <item>王 者 皮 肤</item>
-        <item>1 8 0 积 分</item>
-        <item>L O L 皮 肤</item>
-        <item>谢 谢 参 与</item>
-        <item>2 8 积 分</item>
-        <item>微 信 红 包</item>
-        <item>5 Q 币</item>
-    </string-array>
-
-    <string-array name="lucy_icons">
-        <item>iphone</item>
-        <item>iphone</item>
-        <item>iphone</item>
-        <item>iphone</item>
-        <item>iphone</item>
-        <item>iphone</item>
-        <item>iphone</item>
-    </string-array>
-
     <string-array name="lucy_colors">
         <item>#fef9f7</item>
         <item>#fbc6a9</item>

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

@@ -71,7 +71,6 @@
         <item name="android:textColor">#ffffff</item>
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/login_background_shap</item>
     </style>
 
     <style name="ButtonStyle_RED" parent="@style/Widget.AppCompat.Button.Borderless">
@@ -82,7 +81,6 @@
         <item name="android:textColor">#ffffff</item>
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/login_background_shap</item>
     </style>
 
 
@@ -96,7 +94,6 @@
         <item name="android:textColor">#ffffff</item>
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/login_background_shap</item>
     </style>
 
 

app/unused.txt

@@ -1514,8 +1514,6 @@ com.zzhoujay.richtext.ig.DefaultImageGetter$1:
     final synthetic com.zzhoujay.richtext.ig.DefaultImageGetter this$0
 androidx.core.graphics.TypefaceCompatBaseImpl$1:
     final synthetic androidx.core.graphics.TypefaceCompatBaseImpl this$0
-live.nodiyphoneshell.cend.dialog.ShowClearDialog$2:
-    final synthetic live.nodiyphoneshell.cend.dialog.ShowClearDialog this$0
 com.alibaba.sdk.android.oss.common.utils.HttpdnsMini$HostObject:
     final synthetic com.alibaba.sdk.android.oss.common.utils.HttpdnsMini this$0
 live.nodiyphoneshell.cend.utils.Upload$1$1:
@@ -1575,8 +1573,6 @@ live.nodiyphoneshell.cend.utils.GlideCatchUtil$1:
     final synthetic live.nodiyphoneshell.cend.utils.GlideCatchUtil this$0
 androidx.constraintlayout.solver.widgets.ConstraintTableLayout$HorizontalSlice:
     final synthetic androidx.constraintlayout.solver.widgets.ConstraintTableLayout this$0
-live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding$1:
-    final synthetic live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding this$0
 androidx.work.impl.model.WorkSpecDao_Impl$8:
     final synthetic androidx.work.impl.model.WorkSpecDao_Impl this$0
 androidx.transition.TransitionSet$1:
@@ -1589,8 +1585,6 @@ live.nodiyphoneshell.cend.utils.AnimationUtil$2:
     final synthetic live.nodiyphoneshell.cend.utils.AnimationUtil this$0
 com.ashokvarma.bottomnavigation.BadgeItem$1:
     final synthetic com.ashokvarma.bottomnavigation.BadgeItem this$0
-live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding$2:
-    final synthetic live.nodiyphoneshell.cend.view.process.cancel.ProcessCancelActivity_ViewBinding this$0
 io.reactivex.internal.operators.flowable.FlowableReplay$MulticastFlowable$DisposableConsumer:
     final synthetic io.reactivex.internal.operators.flowable.FlowableReplay$MulticastFlowable this$0
 okhttp3.internal.http2.Http2Stream:
@@ -1633,8 +1627,6 @@ com.alibaba.sdk.android.oss.common.LogThreadPoolManager$2:
     final synthetic com.alibaba.sdk.android.oss.common.LogThreadPoolManager this$0
 androidx.core.app.ActivityCompat$SharedElementCallback21Impl$1:
     final synthetic androidx.core.app.ActivityCompat$SharedElementCallback21Impl this$0
-live.nodiyphoneshell.cend.view.process.ProcessActivity$17:
-    final synthetic live.nodiyphoneshell.cend.view.process.ProcessActivity this$0
 okhttp3.Cache$CacheResponseBody$1:
     final synthetic okhttp3.Cache$CacheResponseBody this$0
 live.nodiyphoneshell.cend.utils.AnimationUtil$4:
@@ -1790,8 +1782,6 @@ com.alibaba.sdk.android.oss.internal.InternalRequestOperation$2:
     final synthetic com.alibaba.sdk.android.oss.internal.InternalRequestOperation this$0
 androidx.work.impl.model.WorkSpecDao_Impl$1:
     final synthetic androidx.work.impl.model.WorkSpecDao_Impl this$0
-live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1:
-    final synthetic live.nodiyphoneshell.cend.view.process.ProcessActivity$16 this$1
 androidx.arch.core.executor.DefaultTaskExecutor$1:
     final synthetic androidx.arch.core.executor.DefaultTaskExecutor this$0
 androidx.appcompat.widget.ActionBarContextView$1: