Skip to content

N
nodiyphone
Commit 2b518366 by huahua
Options

修改

parent ba759519
Showing with 130 additions and 379 deletions
app/priguardMapping.txt
# compiler: R8 # compiler: R8
# compiler_version: 2.0.74 # compiler_version: 2.0.74
# min_api: 23 # min_api: 23
# pg_map_id: e5d2f9f # pg_map_id: d320cc8
# common_typos_disable # common_typos_disable
android.support.v4.app.INotificationSideChannel$Stub -> android.support.v4.app.INotificationSideChannel$Stub: android.support.v4.app.INotificationSideChannel$Stub -> android.support.v4.app.INotificationSideChannel$Stub:
20:22:void <init>() -> <init> 20:22:void <init>() -> <init>
...@@ -68889,16 +68889,16 @@ live.nodiyphoneshell.cend.activities.MainPresenter$4 -> live.nodiyphoneshell.cen ...@@ -68889,16 +68889,16 @@ live.nodiyphoneshell.cend.activities.MainPresenter$4 -> live.nodiyphoneshell.cen
104:104:void onResponse(java.lang.Object,int) -> onResponse 104:104:void onResponse(java.lang.Object,int) -> onResponse
111:114:void onResponse(java.io.File,int) -> onResponse 111:114:void onResponse(java.io.File,int) -> onResponse
live.nodiyphoneshell.cend.activities.SplashActivity -> live.nodiyphoneshell.cend.activities.SplashActivity: live.nodiyphoneshell.cend.activities.SplashActivity -> live.nodiyphoneshell.cend.activities.SplashActivity:
23:29:void <init>() -> <init> 22:22:void <init>() -> <init>
46:50:void launch() -> launch 39:43:void launch() -> launch
36:43:void onCreate(android.os.Bundle) -> onCreate 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$AnimationImpl -> live.nodiyphoneshell.cend.activities.SplashActivity$AnimationImpl:
live.nodiyphoneshell.cend.activities.SplashActivity this$0 -> a live.nodiyphoneshell.cend.activities.SplashActivity this$0 -> a
52:52:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init> 45:45:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init>
52:52:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,live.nodiyphoneshell.cend.activities.SplashActivity$1) -> <init> 45:45:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,live.nodiyphoneshell.cend.activities.SplashActivity$1) -> <init>
59:69:void onAnimationEnd(android.view.animation.Animation) -> onAnimationEnd 52:62:void onAnimationEnd(android.view.animation.Animation) -> onAnimationEnd
72:72:void onAnimationRepeat(android.view.animation.Animation) -> onAnimationRepeat 65:65:void onAnimationRepeat(android.view.animation.Animation) -> onAnimationRepeat
56:56:void onAnimationStart(android.view.animation.Animation) -> onAnimationStart 49:49:void onAnimationStart(android.view.animation.Animation) -> onAnimationStart
live.nodiyphoneshell.cend.activities.SplashActivity_ViewBinding -> live.nodiyphoneshell.cend.activities.SplashActivity_ViewBinding: live.nodiyphoneshell.cend.activities.SplashActivity_ViewBinding -> live.nodiyphoneshell.cend.activities.SplashActivity_ViewBinding:
19:20:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init> 19:20:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity) -> <init>
23:27:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,android.view.View) -> <init> 23:27:void <init>(live.nodiyphoneshell.cend.activities.SplashActivity,android.view.View) -> <init>
...@@ -68929,7 +68929,7 @@ live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog -> live.nodiyphoneshell.c ...@@ -68929,7 +68929,7 @@ live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog -> live.nodiyphoneshell.c
22:22:android.content.Context access$100(live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> b 22:22:android.content.Context access$100(live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> b
77:78:void dismissDiaLog() -> dismissDiaLog 77:78:void dismissDiaLog() -> dismissDiaLog
50:73:void initView() -> initView 50:73:void initView() -> initView
39:40:void setOnClickUpLoadListener(live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog$OnClickSaveListener) -> setOnClickUpLoadListener 41:42:void setOnClickUpLoadListener(live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog$OnClickSaveListener) -> setOnClickUpLoadListener
live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog$1 -> live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog$1: live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog$1 -> live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog$1:
live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog this$0 -> a live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog this$0 -> a
60:60:void <init>(live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> <init> 60:60:void <init>(live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog) -> <init>
...@@ -71962,44 +71962,44 @@ live.nodiyphoneshell.cend.view.machine.MachineCodePresenter$1 -> live.nodiyphone ...@@ -71962,44 +71962,44 @@ live.nodiyphoneshell.cend.view.machine.MachineCodePresenter$1 -> live.nodiyphone
31:31:void onResponse(java.lang.Object,int) -> onResponse 31:31:void onResponse(java.lang.Object,int) -> onResponse
38:39:void onResponse(java.lang.String,int) -> onResponse 38:39:void onResponse(java.lang.String,int) -> onResponse
live.nodiyphoneshell.cend.view.process.ProcessActivity -> live.nodiyphoneshell.cend.view.process.ProcessActivity: live.nodiyphoneshell.cend.view.process.ProcessActivity -> live.nodiyphoneshell.cend.view.process.ProcessActivity:
44:108:void <init>() -> <init> 44:102:void <init>() -> <init>
278:284:void clearBitmapView() -> clearBitmapView 270:276:void clearBitmapView() -> clearBitmapView
257:273:void comeInComplete() -> comeInComplete 249:265:void comeInComplete() -> comeInComplete
729:732:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent 713:716:boolean dispatchKeyEvent(android.view.KeyEvent) -> dispatchKeyEvent
182:249:void getScoketData() -> getScoketData 176:243:void getScoketData() -> getScoketData
44:44:int access$000(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> h 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 44:44:int access$002(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> i
149:177:void initData() -> initData 143:171:void initData() -> initData
521:548:void initDataStatus() -> initDataStatus 505:532:void initDataStatus() -> initDataStatus
552:589:void initDataStatusTimeOver() -> initDataStatusTimeOver 536:573:void initDataStatusTimeOver() -> initDataStatusTimeOver
117:117:int initLayout() -> initLayout 111:111:int initLayout() -> initLayout
632:634:void initSelectData() -> initSelectData 616:618:void initSelectData() -> initSelectData
124:137:void initView() -> initView 118:131:void initView() -> initView
597:598:boolean isDestroy(android.app.Activity) -> isDestroy 581:582:boolean isDestroy(android.app.Activity) -> isDestroy
44:44:void access$100(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> j 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$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$1100(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> l
607:627:void loadFireworks() -> loadFireworks 591:611:void loadFireworks() -> loadFireworks
44:44:void access$200(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> m 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$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$302(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean) -> o
112:113:void onCreate(android.os.Bundle) -> onCreate 106:107:void onCreate(android.os.Bundle) -> onCreate
289:291:void onDestroy() -> onDestroy 280:282:void onDestroy() -> onDestroy
461:516:void onLineShowAndHide(int) -> onLineShowAndHide 445:500:void onLineShowAndHide(int) -> onLineShowAndHide
719:720:void onPause() -> onPause 703:704:void onPause() -> onPause
713:715:void onResume() -> onResume 697:699:void onResume() -> onResume
724:725:void onStop() -> onStop 708:709:void onStop() -> onStop
44:44:void access$400(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> p 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$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$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 44:44:java.lang.String access$600(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> s
297:388:void selctStatus(int) -> selctStatus 287:375:void selctStatus(int) -> selctStatus
396:405:void startBrushImage() -> startBrushImage 380:389:void startBrushImage() -> startBrushImage
435:456:void startPrintAginprogress(int) -> startPrintAginprogress 419:440:void startPrintAginprogress(int) -> startPrintAginprogress
409:430:void startPrintprogress(int) -> startPrintprogress 393:414:void startPrintprogress(int) -> startPrintprogress
666:689:void statProcessOnLineImage() -> statProcessOnLineImage 650:673:void statProcessOnLineImage() -> statProcessOnLineImage
694:708:void statProcessPrintAgainImage(boolean,int) -> statProcessPrintAgainImage 678:692:void statProcessPrintAgainImage(boolean,int) -> statProcessPrintAgainImage
639:661:void statProcessPrintImage(boolean,int) -> statProcessPrintImage 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$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$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:java.lang.String access$702(live.nodiyphoneshell.cend.view.process.ProcessActivity,java.lang.String) -> v
...@@ -72007,100 +72007,100 @@ live.nodiyphoneshell.cend.view.process.ProcessActivity -> live.nodiyphoneshell.c ...@@ -72007,100 +72007,100 @@ live.nodiyphoneshell.cend.view.process.ProcessActivity -> live.nodiyphoneshell.c
44:44:void access$900(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> x 44:44:void access$900(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> x
live.nodiyphoneshell.cend.view.process.ProcessActivity$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$1: live.nodiyphoneshell.cend.view.process.ProcessActivity$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$1:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
182:182:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 176:176:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
182:182:void accept(java.lang.Object) -> accept 176:176:void accept(java.lang.Object) -> accept
186:247:void accept(live.nodiyphoneshell.cend.modules.RxProcessBean) -> accept 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$10 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$10:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
523:523:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 507:507:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
526:527:void run() -> run 510:511:void run() -> run
live.nodiyphoneshell.cend.view.process.ProcessActivity$11 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$11: live.nodiyphoneshell.cend.view.process.ProcessActivity$11 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$11:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
554:554:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 538:538:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
557:558:void run() -> run 541:542:void run() -> run
live.nodiyphoneshell.cend.view.process.ProcessActivity$12 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$12: live.nodiyphoneshell.cend.view.process.ProcessActivity$12 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$12:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
571:571:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 555:555:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
574:575:void run() -> run 558:559:void run() -> run
live.nodiyphoneshell.cend.view.process.ProcessActivity$13 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$13: live.nodiyphoneshell.cend.view.process.ProcessActivity$13 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$13:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
577:577:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 561:561:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
581:586:void run() -> run 565:570:void run() -> run
live.nodiyphoneshell.cend.view.process.ProcessActivity$14 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$14: live.nodiyphoneshell.cend.view.process.ProcessActivity$14 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$14:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
613:613:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 597:597:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
616:622:void run() -> run 600:606:void run() -> run
live.nodiyphoneshell.cend.view.process.ProcessActivity$14$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$14$1: live.nodiyphoneshell.cend.view.process.ProcessActivity$14$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$14$1:
live.nodiyphoneshell.cend.view.process.ProcessActivity$14 this$1 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity$14 this$1 -> a
616:616:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$14) -> <init> 600:600:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$14) -> <init>
619:620:void onAnimationEnd() -> onAnimationEnd 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$15 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$15:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> c live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> c
boolean val$IsComeProcess -> a boolean val$IsComeProcess -> a
int val$type -> b int val$type -> b
647:647:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> <init> 631:631:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,boolean,int) -> <init>
650:659:void onAnimationEnd() -> onAnimationEnd 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$16 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$16:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
673:673:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 657:657:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
676:687:void onAnimationEnd() -> onAnimationEnd 660:671:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1: live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$16$1:
681:681:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$16) -> <init> 665:665:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$16) -> <init>
685:685:void onAnimationEnd() -> onAnimationEnd 669:669:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$17 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$17: live.nodiyphoneshell.cend.view.process.ProcessActivity$17 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$17:
702:702:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 686:686:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
706:706:void onAnimationEnd() -> onAnimationEnd 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$2 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$2:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
257:257:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 249:249:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
260:271:void onAnimationEnd() -> onAnimationEnd 252:263:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$2$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$2$1: live.nodiyphoneshell.cend.view.process.ProcessActivity$2$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$2$1:
live.nodiyphoneshell.cend.view.process.ProcessActivity$2 this$1 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity$2 this$1 -> a
260:260:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$2) -> <init> 252:252:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$2) -> <init>
263:269:void onAnimationEnd() -> onAnimationEnd 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$3 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$3:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
309:309:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 299:299:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
309:309:void onResourceReady(java.lang.Object,com.bumptech.glide.request.transition.Transition) -> onResourceReady 299:299:void onResourceReady(java.lang.Object,com.bumptech.glide.request.transition.Transition) -> onResourceReady
312:314:void onResourceReady(android.graphics.Bitmap,com.bumptech.glide.request.transition.Transition) -> onResourceReady 302:304: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$4 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$4:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
345:345:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 332:332:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
348:349:void run() -> run 335:336:void run() -> run
live.nodiyphoneshell.cend.view.process.ProcessActivity$5 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$5: live.nodiyphoneshell.cend.view.process.ProcessActivity$5 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$5:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> b live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> b
int val$type -> a int val$type -> a
410:410:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init> 394:394:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init>
413:428:void onAnimationEnd() -> onAnimationEnd 397:412: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$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$5$1:
live.nodiyphoneshell.cend.view.process.ProcessActivity$5 this$1 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity$5 this$1 -> a
414:414:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$5) -> <init> 398:398:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$5) -> <init>
417:426:void onAnimationEnd() -> onAnimationEnd 401:410:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$6 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$6: live.nodiyphoneshell.cend.view.process.ProcessActivity$6 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$6:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> b live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> b
int val$type -> a int val$type -> a
436:436:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init> 420:420:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,int) -> <init>
439:454:void onAnimationEnd() -> onAnimationEnd 423:438: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$1 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$6$1:
live.nodiyphoneshell.cend.view.process.ProcessActivity$6 this$1 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity$6 this$1 -> a
440:440:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$6) -> <init> 424:424:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity$6) -> <init>
443:452:void onAnimationEnd() -> onAnimationEnd 427:436:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$7 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$7: live.nodiyphoneshell.cend.view.process.ProcessActivity$7 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$7:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
484:484:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 468:468:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
487:488:void onAnimationEnd() -> onAnimationEnd 471:472:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$8 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$8: live.nodiyphoneshell.cend.view.process.ProcessActivity$8 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$8:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
494:494:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 478:478:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
497:498:void onAnimationEnd() -> onAnimationEnd 481:482:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity$9 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$9: live.nodiyphoneshell.cend.view.process.ProcessActivity$9 -> live.nodiyphoneshell.cend.view.process.ProcessActivity$9:
live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a live.nodiyphoneshell.cend.view.process.ProcessActivity this$0 -> a
504:504:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 488:488:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
507:508:void onAnimationEnd() -> onAnimationEnd 491:492:void onAnimationEnd() -> onAnimationEnd
live.nodiyphoneshell.cend.view.process.ProcessActivity_ViewBinding -> live.nodiyphoneshell.cend.view.process.ProcessActivity_ViewBinding: live.nodiyphoneshell.cend.view.process.ProcessActivity_ViewBinding -> live.nodiyphoneshell.cend.view.process.ProcessActivity_ViewBinding:
23:24:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init> 22:23:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity) -> <init>
27:46:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,android.view.View) -> <init> 26:43:void <init>(live.nodiyphoneshell.cend.view.process.ProcessActivity,android.view.View) -> <init>
51:52:void unbind() -> unbind 48:49:void unbind() -> unbind
live.nodiyphoneshell.cend.view.process.ProcessPresenter -> live.nodiyphoneshell.cend.view.process.ProcessPresenter: 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> 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 16:16:live.nodiyphoneshell.cend.view.process.ProcessContract$View access$000(live.nodiyphoneshell.cend.view.process.ProcessPresenter) -> a
...@@ -72203,61 +72203,61 @@ live.nodiyphoneshell.cend.websocket.-$$Lambda$XYDClient$cfQ04nFyti_QA5vcO982mbFE ...@@ -72203,61 +72203,61 @@ live.nodiyphoneshell.cend.websocket.-$$Lambda$XYDClient$cfQ04nFyti_QA5vcO982mbFE
live.nodiyphoneshell.cend.websocket.XYDClient f$0 -> a live.nodiyphoneshell.cend.websocket.XYDClient f$0 -> a
live.nodiyphoneshell.cend.websocket.XYDClient -> live.nodiyphoneshell.cend.websocket.XYDClient: live.nodiyphoneshell.cend.websocket.XYDClient -> live.nodiyphoneshell.cend.websocket.XYDClient:
live.nodiyphoneshell.cend.wsmanager.listener.WsStatusListener wsStatusListener -> a live.nodiyphoneshell.cend.wsmanager.listener.WsStatusListener wsStatusListener -> a
93:101:void <init>(android.content.Context) -> <init> 98:106:void <init>(android.content.Context) -> <init>
60:60:java.lang.String access$000(live.nodiyphoneshell.cend.websocket.XYDClient) -> a 65:65:java.lang.String access$000(live.nodiyphoneshell.cend.websocket.XYDClient) -> a
60:60:android.content.Context access$100(live.nodiyphoneshell.cend.websocket.XYDClient) -> b 65:65:android.content.Context access$100(live.nodiyphoneshell.cend.websocket.XYDClient) -> b
60:60:void access$200(live.nodiyphoneshell.cend.websocket.XYDClient,org.json.JSONObject) -> c 65:65:void access$200(live.nodiyphoneshell.cend.websocket.XYDClient,org.json.JSONObject) -> c
60:60:void access$300(live.nodiyphoneshell.cend.websocket.XYDClient,int,live.nodiyphoneshell.cend.modules.ProcessBean) -> d 65:65:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$300(live.nodiyphoneshell.cend.websocket.XYDClient) -> d
60:60:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$400(live.nodiyphoneshell.cend.websocket.XYDClient) -> e 65:65:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$302(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.dialog.DialogMessageDialog) -> e
60:60:live.nodiyphoneshell.cend.dialog.DialogMessageDialog access$402(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.dialog.DialogMessageDialog) -> f 65:65:void access$400(live.nodiyphoneshell.cend.websocket.XYDClient) -> f
581:583:double formatDouble2(double) -> formatDouble2 503:505:double formatDouble2(double) -> formatDouble2
60:60:void access$500(live.nodiyphoneshell.cend.websocket.XYDClient) -> g 65:65:double access$500(live.nodiyphoneshell.cend.websocket.XYDClient,double) -> g
526:576:void getCoveWidth(java.lang.String,live.nodiyphoneshell.cend.modules.ProcessBean) -> getCoveWidth 451:499:void getCoveWidth(java.lang.String,live.nodiyphoneshell.cend.modules.ProcessBean) -> getCoveWidth
79:86:live.nodiyphoneshell.cend.websocket.XYDClient getInstance(android.content.Context) -> getInstance 84:91:live.nodiyphoneshell.cend.websocket.XYDClient getInstance(android.content.Context) -> getInstance
60:60:double access$600(live.nodiyphoneshell.cend.websocket.XYDClient,double) -> h 65:65:void access$600(live.nodiyphoneshell.cend.websocket.XYDClient,int,live.nodiyphoneshell.cend.modules.ProcessBean) -> h
134:134:void lambda$init$1(long) -> i 139:139:void lambda$init$1(long) -> i
108:136:void init() -> init 113:141:void init() -> init
502:523:void initFailData() -> initFailData 426:448:void initFailData() -> initFailData
100:100:void lambda$new$0(long) -> j 105:105:void lambda$new$0(long) -> j
191:198:void saveFileText(java.lang.String,java.lang.String) -> saveFileText 196:203:void saveFileText(java.lang.String,java.lang.String) -> saveFileText
143:142:void sendData(java.lang.String) -> sendData 148:147:void sendData(java.lang.String) -> sendData
175:184:void sendPingText() -> sendPingText 180:189:void sendPingText() -> sendPingText
591:614:void sendProcessData(int,live.nodiyphoneshell.cend.modules.ProcessBean) -> sendProcessData 512:522:void sendProcessData(int,live.nodiyphoneshell.cend.modules.ProcessBean) -> sendProcessData
206:220:void sendReceiveMessage(org.json.JSONObject) -> sendReceiveMessage 211:225:void sendReceiveMessage(org.json.JSONObject) -> sendReceiveMessage
160:168:void stopWebSocketRequest() -> stopWebSocketRequest 165:173:void stopWebSocketRequest() -> stopWebSocketRequest
live.nodiyphoneshell.cend.websocket.XYDClient$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$1: live.nodiyphoneshell.cend.websocket.XYDClient$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$1:
live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> a live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> a
226:226:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient) -> <init> 231:231:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient) -> <init>
489:490:void onClosed(int,java.lang.String) -> onClosed 413:414:void onClosed(int,java.lang.String) -> onClosed
483:484:void onClosing(int,java.lang.String) -> onClosing 407:408:void onClosing(int,java.lang.String) -> onClosing
495:496:void onFailure(java.lang.Throwable,okhttp3.Response) -> onFailure 419:420:void onFailure(java.lang.Throwable,okhttp3.Response) -> onFailure
261:466:void onMessage(java.lang.String) -> onMessage 266:390:void onMessage(java.lang.String) -> onMessage
471:472:void onMessage(okio.ByteString) -> onMessage 395:396:void onMessage(okio.ByteString) -> onMessage
229:252:void onOpen(okhttp3.Response) -> onOpen 234:257:void onOpen(okhttp3.Response) -> onOpen
477:478:void onReconnect() -> onReconnect 401:402:void onReconnect() -> onReconnect
live.nodiyphoneshell.cend.websocket.XYDClient$2 -> live.nodiyphoneshell.cend.websocket.XYDClient$2: live.nodiyphoneshell.cend.websocket.XYDClient$2 -> live.nodiyphoneshell.cend.websocket.XYDClient$2:
live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> b live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> b
int val$timeTime -> a int val$timeTime -> a
508:508:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,int) -> <init> 433:433:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,int) -> <init>
511:520:void action(int,int,int) -> action 436:445:void action(int,int,int) -> action
live.nodiyphoneshell.cend.websocket.XYDClient$2$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$2$1: live.nodiyphoneshell.cend.websocket.XYDClient$2$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$2$1:
511:511:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$2) -> <init> 436:436:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$2) -> <init>
515:515:void action(int,int) -> action 440:440:void action(int,int) -> action
live.nodiyphoneshell.cend.websocket.XYDClient$3 -> live.nodiyphoneshell.cend.websocket.XYDClient$3: live.nodiyphoneshell.cend.websocket.XYDClient$3 -> live.nodiyphoneshell.cend.websocket.XYDClient$3:
live.nodiyphoneshell.cend.modules.ProcessBean val$processBean -> a live.nodiyphoneshell.cend.modules.ProcessBean val$processBean -> a
live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> b live.nodiyphoneshell.cend.websocket.XYDClient this$0 -> b
530:530:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.modules.ProcessBean) -> <init> 455:455:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient,live.nodiyphoneshell.cend.modules.ProcessBean) -> <init>
533:534:void onError(okhttp3.Call,java.lang.Exception,int) -> onError 458:459:void onError(okhttp3.Call,java.lang.Exception,int) -> onError
530:530:void onResponse(java.lang.Object,int) -> onResponse 455:455:void onResponse(java.lang.Object,int) -> onResponse
538:574:void onResponse(java.lang.String,int) -> onResponse 463:497: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$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$3$1:
live.nodiyphoneshell.cend.websocket.XYDClient$3 this$1 -> b live.nodiyphoneshell.cend.websocket.XYDClient$3 this$1 -> b
int val$timeTime -> a int val$timeTime -> a
557:557:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3,int) -> <init> 482:482:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3,int) -> <init>
560:569:void action(int,int,int) -> action 485:494:void action(int,int,int) -> action
live.nodiyphoneshell.cend.websocket.XYDClient$3$1$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$3$1$1: live.nodiyphoneshell.cend.websocket.XYDClient$3$1$1 -> live.nodiyphoneshell.cend.websocket.XYDClient$3$1$1:
560:560:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3$1) -> <init> 485:485:void <init>(live.nodiyphoneshell.cend.websocket.XYDClient$3$1) -> <init>
564:564:void action(int,int) -> action 489:489:void action(int,int) -> action
live.nodiyphoneshell.cend.widget.CircleBackColorView -> live.nodiyphoneshell.cend.widget.CircleBackColorView: live.nodiyphoneshell.cend.widget.CircleBackColorView -> live.nodiyphoneshell.cend.widget.CircleBackColorView:
17:18:void <init>(android.content.Context) -> <init> 17:18:void <init>(android.content.Context) -> <init>
21:22:void <init>(android.content.Context,android.util.AttributeSet) -> <init> 21:22:void <init>(android.content.Context,android.util.AttributeSet) -> <init>
app/seeds.txt
This source diff could not be displayed because it is too large. You can view the blob instead.
app/src/main/java/live/nodiyphoneshell/cend/dialog/DialogEnterBackDialog.java
...@@ -31,6 +31,8 @@ public class DialogEnterBackDialog extends Dialog { ...@@ -31,6 +31,8 @@ public class DialogEnterBackDialog extends Dialog {
public Dialog dialog; public Dialog dialog;
private Context context;
public interface OnClickSaveListener { public interface OnClickSaveListener {
void OnClickSaveButton(); void OnClickSaveButton();
} }
...@@ -39,8 +41,6 @@ public class DialogEnterBackDialog extends Dialog { ...@@ -39,8 +41,6 @@ public class DialogEnterBackDialog extends Dialog {
this.onClickSaveListener = onClickSaveListener; this.onClickSaveListener = onClickSaveListener;
} }
private Context context;
public DialogEnterBackDialog(@NonNull Activity context) { public DialogEnterBackDialog(@NonNull Activity context) {
super(context); super(context);
this.context = context; this.context = context;
......
app/src/main/java/live/nodiyphoneshell/cend/view/process/ProcessActivity.java
...@@ -58,9 +58,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -58,9 +58,6 @@ public class ProcessActivity extends BaseActivity {
@BindView(R.id.activity_process_diy_image_brush) @BindView(R.id.activity_process_diy_image_brush)
ImageView activity_process_diy_image_brush; ImageView activity_process_diy_image_brush;
@BindView(R.id.activity_process_top_le)
RelativeLayout activity_process_top_le;
@BindView(R.id.activity_process_online_image_one) @BindView(R.id.activity_process_online_image_one)
ImageView activity_process_online_image_one; ImageView activity_process_online_image_one;
...@@ -70,9 +67,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -70,9 +67,6 @@ public class ProcessActivity extends BaseActivity {
@BindView(R.id.activity_process_online_image_three) @BindView(R.id.activity_process_online_image_three)
ImageView activity_process_online_image_three; ImageView activity_process_online_image_three;
@BindView(R.id.activity_proces_diy_image_white)
ImageView activity_proces_diy_image_white;
@BindView(R.id.activity_process_print_fireworks) @BindView(R.id.activity_process_print_fireworks)
ImageView activity_process_print_fireworks; ImageView activity_process_print_fireworks;
...@@ -249,8 +243,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -249,8 +243,6 @@ public class ProcessActivity extends BaseActivity {
} }
//进入完成页面 //进入完成页面
private void comeInComplete() { private void comeInComplete() {
//完成动画 //完成动画
...@@ -283,14 +275,12 @@ public class ProcessActivity extends BaseActivity { ...@@ -283,14 +275,12 @@ public class ProcessActivity extends BaseActivity {
} }
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy();//销毁 super.onDestroy();//销毁
clearBitmapView(); clearBitmapView();
} }
//0：等待出料，1：生产中 , 2: 生产完成待取货， 3：取消生产，4：出料中，5: 等待取料 6：等待入货，7：取货完成', //0：等待出料，1：生产中 , 2: 生产完成待取货， 3：取消生产，4：出料中，5: 等待取料 6：等待入货，7：取货完成',
//根据状态选择对应颜色 //根据状态选择对应颜色
private void selctStatus(int status) { private void selctStatus(int status) {
...@@ -320,14 +310,11 @@ public class ProcessActivity extends BaseActivity { ...@@ -320,14 +310,11 @@ public class ProcessActivity extends BaseActivity {
if (statusText.contains("排队中") && status == 1 && (position - 1) >= 0) { if (statusText.contains("排队中") && status == 1 && (position - 1) >= 0) {
position = position - 1; position = position - 1;
if (position > 0) { if (position > 0) {
//statProcessOnLineImage();
onLineShowAndHide(2); onLineShowAndHide(2);
int width = ScreenUtils.dip2px(this, 235); int width = ScreenUtils.dip2px(this, 235);
int height = ScreenUtils.dip2px(this, 436); int height = ScreenUtils.dip2px(this, 436);
activity_proces_diy_image.starNoDrawBitmapImage(width, height); activity_proces_diy_image.starNoDrawBitmapImage(width, height);
MediaPlayerHelper.getInstance().playAssetMusic(CustomApplication.getContext(), "mp3/works_queuing_up.mp3"); MediaPlayerHelper.getInstance().playAssetMusic(CustomApplication.getContext(), "mp3/works_queuing_up.mp3");
activity_process_status_text_content.setText("还有" + position + "个手机壳正在打印中，请稍等..."); activity_process_status_text_content.setText("还有" + position + "个手机壳正在打印中，请稍等...");
} else { } else {
initDataStatusTimeOver(); initDataStatusTimeOver();
...@@ -368,8 +355,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -368,8 +355,6 @@ public class ProcessActivity extends BaseActivity {
case 1: case 1:
initDataStatus(); initDataStatus();
break; break;
case 2:
break;
case 7: //取货完成 case 7: //取货完成
activity_process_diy_image_back_le.setVisibility(View.GONE); activity_process_diy_image_back_le.setVisibility(View.GONE);
activity_process_diy_image_back_le.setVisibility(View.GONE); activity_process_diy_image_back_le.setVisibility(View.GONE);
...@@ -391,8 +376,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -391,8 +376,6 @@ public class ProcessActivity extends BaseActivity {
//开始刷子 //开始刷子
private void startBrushImage() { private void startBrushImage() {
//测试 //测试
//SPUtils.putIntValue("initMinX", 650);
//RxBrushTime.getInstance(this).count=2;
int width = ScreenUtils.dip2px(ProcessActivity.this, 225); int width = ScreenUtils.dip2px(ProcessActivity.this, 225);
int height = ScreenUtils.dip2px(ProcessActivity.this, 450); int height = ScreenUtils.dip2px(ProcessActivity.this, 450);
width = SPUtils.getIntValue("covewidth", width); width = SPUtils.getIntValue("covewidth", width);
...@@ -537,7 +520,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -537,7 +520,6 @@ public class ProcessActivity extends BaseActivity {
} else { } else {
onLineShowAndHide(3); onLineShowAndHide(3);
//作品正在打印 //作品正在打印
MediaPlayerHelper.getInstance().playAssetMusic(CustomApplication.getContext(), "mp3/work_height_production.mp3"); MediaPlayerHelper.getInstance().playAssetMusic(CustomApplication.getContext(), "mp3/work_height_production.mp3");
activity_process_status_text.setVisibility(View.VISIBLE); activity_process_status_text.setVisibility(View.VISIBLE);
activity_process_status_text.setText("打印中"); activity_process_status_text.setText("打印中");
...@@ -630,7 +612,6 @@ public class ProcessActivity extends BaseActivity { ...@@ -630,7 +612,6 @@ public class ProcessActivity extends BaseActivity {
//选择之前初始化信息 //选择之前初始化信息
private void initSelectData() { private void initSelectData() {
activity_process_diy_image_back_le.setVisibility(View.GONE); activity_process_diy_image_back_le.setVisibility(View.GONE);
int status = XYDClient.getInstance(this).processStatus;
} }
......
app/src/main/java/live/nodiyphoneshell/cend/view/process/ProcessPresenter.java
package live.nodiyphoneshell.cend.view.process; package live.nodiyphoneshell.cend.view.process;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import com.zhy.http.okhttp.OkHttpUtils; import com.zhy.http.okhttp.OkHttpUtils;
import live.nodiyphoneshell.cend.BasePresenter; import live.nodiyphoneshell.cend.BasePresenter;
import live.nodiyphoneshell.cend.config.Config; import live.nodiyphoneshell.cend.config.Config;
import live.nodiyphoneshell.cend.utils.CommonUtil;
import live.nodiyphoneshell.cend.utils.MyStringCallback; import live.nodiyphoneshell.cend.utils.MyStringCallback;
import okhttp3.Call; import okhttp3.Call;
/** /**
* Created by MaYangHua on 2020/7/03. * Created by MaYangHua on 2020/7/03.
* email : 295965650@qq.com * email : 295965650@qq.com
...@@ -23,7 +19,6 @@ public class ProcessPresenter extends BasePresenter implements ProcessContract.P ...@@ -23,7 +19,6 @@ public class ProcessPresenter extends BasePresenter implements ProcessContract.P
this.context = context; this.context = context;
} }
@Override @Override
public void getBanner(String partner_id, String ad_position_key) { public void getBanner(String partner_id, String ad_position_key) {
showLoad(context); showLoad(context);
......
app/src/main/java/live/nodiyphoneshell/cend/view/process/complete/ProcessCompleteActivity.java
...@@ -88,7 +88,6 @@ public class ProcessCompleteActivity extends BaseActivity { ...@@ -88,7 +88,6 @@ public class ProcessCompleteActivity extends BaseActivity {
@Override @Override
public void onAnimationEnd(Animator animator) { public void onAnimationEnd(Animator animator) {
activity_process_complete_diy_image_back_le.setVisibility(View.VISIBLE); activity_process_complete_diy_image_back_le.setVisibility(View.VISIBLE);
//activity_process_complete_back_le.setVisibility(View.VISIBLE);
activity_complete_proces_diy_image_white.setVisibility(View.VISIBLE); activity_complete_proces_diy_image_white.setVisibility(View.VISIBLE);
ObjectAnimator y = ObjectAnimator.ofFloat(activity_process_complete_diy_image_back_le, "translationY", ScreenUtils.getScreenHeight(ProcessCompleteActivity.this) - ScreenUtils.dip2px(ProcessCompleteActivity.this, 100)); ObjectAnimator y = ObjectAnimator.ofFloat(activity_process_complete_diy_image_back_le, "translationY", ScreenUtils.getScreenHeight(ProcessCompleteActivity.this) - ScreenUtils.dip2px(ProcessCompleteActivity.this, 100));
AnimatorSet animatorSet = new AnimatorSet(); AnimatorSet animatorSet = new AnimatorSet();
...@@ -241,5 +240,4 @@ public class ProcessCompleteActivity extends BaseActivity { ...@@ -241,5 +240,4 @@ public class ProcessCompleteActivity extends BaseActivity {
} }
} }
} }
app/src/main/java/live/nodiyphoneshell/cend/websocket/XYDClient.java
package live.nodiyphoneshell.cend.websocket; package live.nodiyphoneshell.cend.websocket;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ut.device.UTDevice; import com.ut.device.UTDevice;
...@@ -24,9 +22,7 @@ import live.nodiyphoneshell.cend.modules.PingBean; ...@@ -24,9 +22,7 @@ import live.nodiyphoneshell.cend.modules.PingBean;
import live.nodiyphoneshell.cend.modules.ProcessBean; import live.nodiyphoneshell.cend.modules.ProcessBean;
import live.nodiyphoneshell.cend.modules.ReceiveMessageBean; import live.nodiyphoneshell.cend.modules.ReceiveMessageBean;
import live.nodiyphoneshell.cend.modules.RxOnLineBean; import live.nodiyphoneshell.cend.modules.RxOnLineBean;
import live.nodiyphoneshell.cend.modules.RxPayBean;
import live.nodiyphoneshell.cend.modules.RxProcessBean; import live.nodiyphoneshell.cend.modules.RxProcessBean;
import live.nodiyphoneshell.cend.modules.RxjavaBean;
import live.nodiyphoneshell.cend.modules.ScoketMachineInitBean; import live.nodiyphoneshell.cend.modules.ScoketMachineInitBean;
import live.nodiyphoneshell.cend.modules.SendQueryQueueBean; import live.nodiyphoneshell.cend.modules.SendQueryQueueBean;
import live.nodiyphoneshell.cend.modules.UpdateBean; import live.nodiyphoneshell.cend.modules.UpdateBean;
...@@ -35,8 +31,6 @@ import live.nodiyphoneshell.cend.rxbus.RxBrushTime; ...@@ -35,8 +31,6 @@ import live.nodiyphoneshell.cend.rxbus.RxBrushTime;
import live.nodiyphoneshell.cend.rxbus.RxBus; import live.nodiyphoneshell.cend.rxbus.RxBus;
import live.nodiyphoneshell.cend.rxbus.RxDelayTimer; import live.nodiyphoneshell.cend.rxbus.RxDelayTimer;
import live.nodiyphoneshell.cend.rxbus.RxOrderNoticeTimer; import live.nodiyphoneshell.cend.rxbus.RxOrderNoticeTimer;
import live.nodiyphoneshell.cend.rxbus.RxPayTimer;
import live.nodiyphoneshell.cend.rxbus.RxProduceTimer;
import live.nodiyphoneshell.cend.rxbus.RxScokerTimer; import live.nodiyphoneshell.cend.rxbus.RxScokerTimer;
import live.nodiyphoneshell.cend.rxbus.RxUpLoadApkTimer; import live.nodiyphoneshell.cend.rxbus.RxUpLoadApkTimer;
import live.nodiyphoneshell.cend.utils.CommonUtil; import live.nodiyphoneshell.cend.utils.CommonUtil;
...@@ -47,7 +41,6 @@ import live.nodiyphoneshell.cend.utils.ScreenUtils; ...@@ -47,7 +41,6 @@ import live.nodiyphoneshell.cend.utils.ScreenUtils;
import live.nodiyphoneshell.cend.utils.ToastUtil; import live.nodiyphoneshell.cend.utils.ToastUtil;
import live.nodiyphoneshell.cend.utils.UpLoadSceenShot; import live.nodiyphoneshell.cend.utils.UpLoadSceenShot;
import live.nodiyphoneshell.cend.utils.Upload; import live.nodiyphoneshell.cend.utils.Upload;
import live.nodiyphoneshell.cend.view.process.ProcessActivity;
import live.nodiyphoneshell.cend.wsmanager.WsManager; import live.nodiyphoneshell.cend.wsmanager.WsManager;
import live.nodiyphoneshell.cend.wsmanager.listener.WsStatusListener; import live.nodiyphoneshell.cend.wsmanager.listener.WsStatusListener;
import okhttp3.Call; import okhttp3.Call;
...@@ -65,7 +58,6 @@ public class XYDClient { ...@@ -65,7 +58,6 @@ public class XYDClient {
private RxScokerTimer rxScokerTimer; //定时器 private RxScokerTimer rxScokerTimer; //定时器
public List<OnLineListBean.DataBean> dataBeanList; //队列列表 public List<OnLineListBean.DataBean> dataBeanList; //队列列表
public ProcessBean processBean; //进度对象信息 public ProcessBean processBean; //进度对象信息
public OnLineListBean queryQueueBean; //列表返回信息对象
public int processStatus; //进度状态 public int processStatus; //进度状态
public List<FileLogText> logTextList = new ArrayList<>(); //日志文件 public List<FileLogText> logTextList = new ArrayList<>(); //日志文件
private String machine_code = ""; //机器编码 private String machine_code = ""; //机器编码
...@@ -135,7 +127,6 @@ public class XYDClient { ...@@ -135,7 +127,6 @@ public class XYDClient {
} }
} }
/** /**
* <>客户端发送信息给服务器</> * <>客户端发送信息给服务器</>
**/ **/
...@@ -152,7 +143,6 @@ public class XYDClient { ...@@ -152,7 +143,6 @@ public class XYDClient {
wsManager.sendMessage(message); wsManager.sendMessage(message);
} }
/** /**
* <>停止WebScoket</> * <>停止WebScoket</>
**/ **/
...@@ -183,7 +173,6 @@ public class XYDClient { ...@@ -183,7 +173,6 @@ public class XYDClient {
sendData(json); sendData(json);
} }
/** /**
* <>保存文件信息</> * <>保存文件信息</>
**/ **/
...@@ -197,7 +186,6 @@ public class XYDClient { ...@@ -197,7 +186,6 @@ public class XYDClient {
logTextList.add(fileLogText); logTextList.add(fileLogText);
} }
/** /**
* <>发送接收到信息</> * <>发送接收到信息</>
**/ **/
...@@ -219,7 +207,6 @@ public class XYDClient { ...@@ -219,7 +207,6 @@ public class XYDClient {
} }
} }
/** /**
* <>回调监听</> * <>回调监听</>
**/ **/
...@@ -251,7 +238,6 @@ public class XYDClient { ...@@ -251,7 +238,6 @@ public class XYDClient {
XYDClient.getInstance(context).sendData(jsonupdate); XYDClient.getInstance(context).sendData(jsonupdate);
} }
/** /**
* <>接收到信息</> * <>接收到信息</>
**/ **/
...@@ -268,31 +254,7 @@ public class XYDClient { ...@@ -268,31 +254,7 @@ public class XYDClient {
if (TextUtils.isEmpty(event)) { if (TextUtils.isEmpty(event)) {
return; return;
} }
if ("upload".equals(event)) {//1上传图片 if ("appUpdate".equals(event)) { //更新
RxjavaBean rxjavaBean = new RxjavaBean();
rxjavaBean.setType(1);
JSONObject data = jsonObject.has("data") ? jsonObject.getJSONObject("data") : null;
if (data != null) {
rxjavaBean.setMessage(data.getString("image"));
}
RxBus.getDefault().post(rxjavaBean);
} else if ("create".equals(event)) {//2创建作品
RxjavaBean rxjavaBean = new RxjavaBean();
rxjavaBean.setType(2);
JSONObject data = jsonObject.has("data") ? jsonObject.getJSONObject("data") : null;
if (data != null) {
rxjavaBean.setMessage(data.getString("works_id"));
rxjavaBean.setImage(data.getString("image"));
}
RxBus.getDefault().post(rxjavaBean);
} else if ("uploading".equals(event)) {//3上传中
RxjavaBean rxjavaBean = new RxjavaBean();
rxjavaBean.setType(3);
RxBus.getDefault().post(rxjavaBean);
} else if ("debug".equals(event)) { //debug调试 //挂起
ToastUtil.show(CustomApplication.getContext(), "设备调试管理中..");
DialogManager.getIntance().showError(context);
} else if ("appUpdate".equals(event)) { //更新
JSONObject data = jsonObject.has("data") ? jsonObject.getJSONObject("data") : null; JSONObject data = jsonObject.has("data") ? jsonObject.getJSONObject("data") : null;
String url = data.has("url") ? data.getString("url") : ""; String url = data.has("url") ? data.getString("url") : "";
if (RxUpLoadApkTimer.getInstance(context).getTime() <= 0) { if (RxUpLoadApkTimer.getInstance(context).getTime() <= 0) {
...@@ -300,23 +262,12 @@ public class XYDClient { ...@@ -300,23 +262,12 @@ public class XYDClient {
RxUpLoadApkTimer.getInstance(context).interval(120); //下载轮询 RxUpLoadApkTimer.getInstance(context).interval(120); //下载轮询
} }
} else if ("error".equals(event)) { //错误页面 //设备故障 } else if ("error".equals(event)) { //错误页面 //设备故障
//RxProduceTimer.getInstance(context).cancel();
RxBrushTime.getInstance(context).cancel(); RxBrushTime.getInstance(context).cancel();
DialogErrorManager.getIntance().showError(context); DialogErrorManager.getIntance().showError(context);
} else if ("normal".equals(event)) { //设备正常 } else if ("normal".equals(event)) { //设备正常
DialogManager.getIntance().dismissDiaLog(); DialogManager.getIntance().dismissDiaLog();
DialogErrorManager.getIntance().dismissDiaLog(); DialogErrorManager.getIntance().dismissDiaLog();
ToastUtil.show(CustomApplication.getContext(), "设备正常营业中..."); ToastUtil.show(CustomApplication.getContext(), "设备正常营业中...");
} else if ("paySuccess".equals(event)) { //支付成功
SPUtils.putBooleanValue("stepFinish", true);
RxPayBean rxPayBean = new RxPayBean();
rxPayBean.setType(5);
RxBus.getDefault().post(rxPayBean);
} else if ("payFail".equals(event)) { //支付失败
SPUtils.putBooleanValue("stepFinish", true);
RxPayBean rxPayBean = new RxPayBean();
rxPayBean.setType(6);
RxBus.getDefault().post(rxPayBean);
} else if ("disable".equals(event)) { //代理已被禁用 } else if ("disable".equals(event)) { //代理已被禁用
DialogManager.getIntance().showError(context); DialogManager.getIntance().showError(context);
} else if ("machineInit".equals(event)) { } else if ("machineInit".equals(event)) {
...@@ -331,49 +282,6 @@ public class XYDClient { ...@@ -331,49 +282,6 @@ public class XYDClient {
SPUtils.putStringValue("token", dataBean.getToken()); SPUtils.putStringValue("token", dataBean.getToken());
} else if ("screenshot".equals(event)) { //发起截图功能 } else if ("screenshot".equals(event)) { //发起截图功能
UpLoadSceenShot.get(context).getSceenShot(); UpLoadSceenShot.get(context).getSceenShot();
} else if ("updateQueue".equals(event)) {//获取队列信息
RxOnLineBean rxOnLineBean = new RxOnLineBean();
rxOnLineBean.setType(7);
rxOnLineBean.setMessage(text);
queryQueueBean = JsonUtils.deserialize(text, OnLineListBean.class);
OnLineListBean.DataBean dataBeanOld = null;
List<OnLineListBean.DataBean> dataBeanListOld = queryQueueBean.getData();
if (dataBeanListOld != null) {
if (dataBeanListOld.size() == 0 && dataBeanList.size() == 1) {
dataBeanOld = dataBeanList.get(0);
}
} else {
if (dataBeanList.size() == 1) {
dataBeanOld = dataBeanList.get(0);
}
}
dataBeanList = queryQueueBean.getData();
RxBus.getDefault().post(rxOnLineBean);
if ((dataBeanList != null && dataBeanList.size() == 0) || dataBeanList == null) {
RxProcessBean rxProcessBean = new RxProcessBean();
rxProcessBean.setType(10);
if (dataBeanOld != null) {
rxProcessBean.setGoosSize(dataBeanOld.getGoods_specs());
rxProcessBean.setProcessStatus(dataBeanOld.getStatus());
}
RxBus.getDefault().post(rxProcessBean);
}
} else if ("outputMaterial".equals(event)) { // 出料中 //0：等待出料，1：生产中 , 2: 生产完成待取货， 3：取消生产，4：出料中，5: 等待取料 6：等待入货，7：取货完成',
processBean = JsonUtils.deserialize(text, ProcessBean.class);
sendProcessData(4, processBean);
} else if ("takingMaterial".equals(event)) { //等待取料//event=takingMaterial
processBean = JsonUtils.deserialize(text, ProcessBean.class);
sendProcessData(5, processBean);
} else if ("takingGoods".equals(event)) { //等待取货
if (dataBeanList != null && dataBeanList.size() > 0) {
dataBeanList.remove(0);
RxOnLineBean rxOnLineBean = new RxOnLineBean();
rxOnLineBean.setType(7);
RxBus.getDefault().post(rxOnLineBean);
}
} else if ("inputGoods".equals(event)) {//等待入货
processBean = JsonUtils.deserialize(text, ProcessBean.class);
sendProcessData(6, processBean);
} else if ("producting".equals(event)) {//生产中 } else if ("producting".equals(event)) {//生产中
RxBrushTime.getInstance(context).cancelInitData(); RxBrushTime.getInstance(context).cancelInitData();
processBean = JsonUtils.deserialize(text, ProcessBean.class); processBean = JsonUtils.deserialize(text, ProcessBean.class);
...@@ -385,10 +293,6 @@ public class XYDClient { ...@@ -385,10 +293,6 @@ public class XYDClient {
return; return;
} }
getCoveWidth(dataBean.getOrder_id(), processBean); getCoveWidth(dataBean.getOrder_id(), processBean);
} else if ("takedGoods".equals(event)) { //取货完成
RxProduceTimer.getInstance(context).cancel();
processBean = JsonUtils.deserialize(text, ProcessBean.class);
sendProcessData(7, processBean);
} else if ("cancel".equals(event)) { //取消 } else if ("cancel".equals(event)) { //取消
RxBrushTime.getInstance(context).cancel(); RxBrushTime.getInstance(context).cancel();
JSONObject data = jsonObject.has("data") ? jsonObject.getJSONObject("data") : null; JSONObject data = jsonObject.has("data") ? jsonObject.getJSONObject("data") : null;
...@@ -532,7 +436,6 @@ public class XYDClient { ...@@ -532,7 +436,6 @@ public class XYDClient {
public void onError(Call call, Exception e, int id) { public void onError(Call call, Exception e, int id) {
initFailData(); initFailData();
} }
@Override @Override
public void onResponse(String response, int id) { public void onResponse(String response, int id) {
GetWidAndHeightBean getWidAndHeightBean = JsonUtils.deserialize(response, GetWidAndHeightBean.class); GetWidAndHeightBean getWidAndHeightBean = JsonUtils.deserialize(response, GetWidAndHeightBean.class);
...@@ -569,13 +472,10 @@ public class XYDClient { ...@@ -569,13 +472,10 @@ public class XYDClient {
} }
}); });
sendProcessData(1, processBean); sendProcessData(1, processBean);
//closeLoad();
//payFrag.getBannerSuccessed(response);
} }
}); });
} }
//小数点后两位四舍五入 //小数点后两位四舍五入
private double formatDouble2(double d) { private double formatDouble2(double d) {
BigDecimal bigDecimal = new BigDecimal(d); BigDecimal bigDecimal = new BigDecimal(d);
...@@ -583,25 +483,11 @@ public class XYDClient { ...@@ -583,25 +483,11 @@ public class XYDClient {
return bg; return bg;
} }
/** /**
* <>发送进度数据</> * <>发送进度数据</>
**/ **/
private void sendProcessData(int status, ProcessBean processBean) { private void sendProcessData(int status, ProcessBean processBean) {
this.processStatus = status; this.processStatus = status;
boolean stepFinish = SPUtils.getBooleanValue("stepFinish", false);
if (stepFinish && status == 4) {
Intent intent = new Intent(context, ProcessActivity.class);
intent.putExtra("status", status);
if (processBean != null && processBean.getData() != null) {
intent.putExtra("imageUrl", processBean.getData().getWorks_image());
intent.putExtra("backUrl", processBean.getData().getBack_image());
intent.putExtra("order_id", processBean.getData().getWorks_id());
}
intent.putExtra("comefrom", 1);
context.startActivity(intent);
RxPayTimer.getInstance(context).cancel();
}
RxProcessBean rxProcessBean = new RxProcessBean(); RxProcessBean rxProcessBean = new RxProcessBean();
rxProcessBean.setProcessStatus(status); rxProcessBean.setProcessStatus(status);
if (processBean != null && processBean.getData() != null) { if (processBean != null && processBean.getData() != null) {
...@@ -613,5 +499,4 @@ public class XYDClient { ...@@ -613,5 +499,4 @@ public class XYDClient {
RxBus.getDefault().post(rxProcessBean); RxBus.getDefault().post(rxProcessBean);
} }
} }
app/src/main/java/live/nodiyphoneshell/cend/widget/CustomViewPager.java
...@@ -13,11 +13,9 @@ public class CustomViewPager extends ViewPager { ...@@ -13,11 +13,9 @@ public class CustomViewPager extends ViewPager {
public CustomViewPager(Context context) { public CustomViewPager(Context context) {
super(context); super(context);
} }
public CustomViewPager(Context context, AttributeSet attrs) { public CustomViewPager(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }
/** /**
* 设置其是否能滑动换页 * 设置其是否能滑动换页
* @param isCanScroll false 不能换页， true 可以滑动换页 * @param isCanScroll false 不能换页， true 可以滑动换页
...@@ -41,5 +39,4 @@ public class CustomViewPager extends ViewPager { ...@@ -41,5 +39,4 @@ public class CustomViewPager extends ViewPager {
super.setCurrentItem(item,false); super.setCurrentItem(item,false);
} }
} }
app/src/main/java/live/nodiyphoneshell/cend/widget/DragScaleView.java
package live.nodiyphoneshell.cend.widget; package live.nodiyphoneshell.cend.widget;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
/** /**
* @author MaYnaghua * @author MaYnaghua
* @version 1.0.0 * @version 1.0.0
...@@ -36,7 +33,6 @@ public class DragScaleView extends View implements View.OnTouchListener { ...@@ -36,7 +33,6 @@ public class DragScaleView extends View implements View.OnTouchListener {
private static final int CENTER = 0x19; private static final int CENTER = 0x19;
private int offset = 20; private int offset = 20;
protected Paint paint = new Paint(); protected Paint paint = new Paint();
/** /**
* 初始化获取屏幕宽高 * 初始化获取屏幕宽高
*/ */
......
app/src/main/java/live/nodiyphoneshell/cend/widget/HProgressBar.java
...@@ -10,7 +10,6 @@ import android.graphics.Rect; ...@@ -10,7 +10,6 @@ import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.os.Build; import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import live.nodiyphoneshell.cend.R; import live.nodiyphoneshell.cend.R;
...@@ -49,36 +48,29 @@ public class HProgressBar extends View { ...@@ -49,36 +48,29 @@ public class HProgressBar extends View {
public HProgressBar(Context context) { public HProgressBar(Context context) {
super(context); super(context);
//Log.d(TAG, "HProgressBar: 1");
} }
public HProgressBar(Context context, AttributeSet attrs) { public HProgressBar(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
this.context = context; this.context = context;
//Log.d(TAG, "HProgressBar: 2");
initDefStyleAttr(attrs); initDefStyleAttr(attrs);
mOutLinePaint = new Paint(); mOutLinePaint = new Paint();
mOutLinePaint.setColor(mProgress_outline_color); mOutLinePaint.setColor(mProgress_outline_color);
mOutLinePaint.setAntiAlias(true); mOutLinePaint.setAntiAlias(true);
mOutLinePaint.setStrokeWidth(2); mOutLinePaint.setStrokeWidth(2);
mOutLinePaint.setStyle(Paint.Style.STROKE); mOutLinePaint.setStyle(Paint.Style.STROKE);
mProgressPaint = new Paint(); mProgressPaint = new Paint();
mProgressPaint.setColor(mProgress_color); mProgressPaint.setColor(mProgress_color);
mProgressPaint.setAntiAlias(true); mProgressPaint.setAntiAlias(true);
noMProgressPaint = new Paint(); noMProgressPaint = new Paint();
noMProgressPaint.setColor(noMProgress_color); noMProgressPaint.setColor(noMProgress_color);
noMProgressPaint.setAntiAlias(true); noMProgressPaint.setAntiAlias(true);
mCirClePaint = new Paint(); mCirClePaint = new Paint();
mCirClePaint.setColor(mProgress_circle_color); mCirClePaint.setColor(mProgress_circle_color);
mCirClePaint.setAntiAlias(true); mCirClePaint.setAntiAlias(true);
mTextBgPain = new Paint(); mTextBgPain = new Paint();
mTextBgPain.setColor(mProgress_text_bg_color); mTextBgPain.setColor(mProgress_text_bg_color);
mTextBgPain.setAntiAlias(true); mTextBgPain.setAntiAlias(true);
mTextPain = new Paint(); mTextPain = new Paint();
mTextPain.setColor(mProgress_text_color); mTextPain.setColor(mProgress_text_color);
mTextPain.setAntiAlias(true); mTextPain.setAntiAlias(true);
...@@ -87,12 +79,10 @@ public class HProgressBar extends View { ...@@ -87,12 +79,10 @@ public class HProgressBar extends View {
mTextPain.setTextSize(mProgress_text_size); mTextPain.setTextSize(mProgress_text_size);
} }
public HProgressBar(Context context, AttributeSet attrs, int defStyleAttr) { public HProgressBar(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
} }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public HProgressBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { public HProgressBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
...@@ -116,7 +106,6 @@ public class HProgressBar extends View { ...@@ -116,7 +106,6 @@ public class HProgressBar extends View {
mMaxProgress = attributes.getInteger(R.styleable.HProgress_hProgress_maxProgress, (int) mMaxProgress); mMaxProgress = attributes.getInteger(R.styleable.HProgress_hProgress_maxProgress, (int) mMaxProgress);
} }
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
...@@ -124,7 +113,6 @@ public class HProgressBar extends View { ...@@ -124,7 +113,6 @@ public class HProgressBar extends View {
setMeasuredDimension(mProgressWidth + ScreenUtils.dip2px(context, 10), (int) (mProgress_text_height + mProgress_circle_height)); setMeasuredDimension(mProgressWidth + ScreenUtils.dip2px(context, 10), (int) (mProgress_text_height + mProgress_circle_height));
} }
@Override @Override
protected void onDraw(Canvas canvas) { protected void onDraw(Canvas canvas) {
super.onDraw(canvas); super.onDraw(canvas);
...@@ -153,25 +141,6 @@ public class HProgressBar extends View { ...@@ -153,25 +141,6 @@ public class HProgressBar extends View {
canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG)); canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG));
} }
/*//画圆canvas.drawCircle(circleX,
mProgress_circle_height / 2,
mProgress_circle_height / 2, mCirClePaint);*/
/*//画progressBar 外边
RectF rectF = new RectF(progressMargin, spaceA,mProgressWidth - progressMargin, mProgress_height + spaceA);
canvas.drawRoundRect(rectF, mProgress_height / 2, mProgress_height / 2, mOutLinePaint);
//画progressBar 内进度条
RectF rectF1 = new RectF(startPoint,
spaceA + spaceB,
startPoint + mProgress_bar_height + changeRange * getProgress()/mMaxProgress,
mProgress_bar_height + spaceB + spaceA);
canvas.drawRoundRect(rectF1, mProgress_bar_height / 2, mProgress_bar_height / 2, mProgressPaint);
//画圆
canvas.drawCircle(circleX,
mProgress_circle_height / 2,
mProgress_circle_height / 2, mCirClePaint);*/
public float getProgress() { public float getProgress() {
return mProgress_progress_bar; return mProgress_progress_bar;
} }
......
app/src/main/java/live/nodiyphoneshell/cend/widget/MainView.java
package live.nodiyphoneshell.cend.widget; package live.nodiyphoneshell.cend.widget;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
...@@ -10,7 +9,6 @@ import android.graphics.Paint; ...@@ -10,7 +9,6 @@ import android.graphics.Paint;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import live.nodiyphoneshell.cend.R; import live.nodiyphoneshell.cend.R;
public class MainView extends View { public class MainView extends View {
......
app/src/main/java/live/nodiyphoneshell/cend/widget/MaskImage.java
...@@ -32,14 +32,11 @@ public class MaskImage extends androidx.appcompat.widget.AppCompatImageView { ...@@ -32,14 +32,11 @@ public class MaskImage extends androidx.appcompat.widget.AppCompatImageView {
Bitmap mask = Bitmap.createBitmap(maskRes, 0, 0, width, height, m, false); Bitmap mask = Bitmap.createBitmap(maskRes, 0, 0, width, height, m, false);
Bitmap result = Bitmap.createBitmap(mask.getWidth(), mask.getHeight(), Bitmap.Config.ARGB_8888); Bitmap result = Bitmap.createBitmap(mask.getWidth(), mask.getHeight(), Bitmap.Config.ARGB_8888);
//将遮罩层的图片放到画布中 //将遮罩层的图片放到画布中
//Canvas mCanvas = new Canvas(result);
//mCanvas.drawColor(Color.parseColor("#282932"));
mCanvas.setBitmap(result); mCanvas.setBitmap(result);
mCanvas.setDensity(targetDensityDpi); mCanvas.setDensity(targetDensityDpi);
Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
//设置两张图片相交时的模式 //设置两张图片相交时的模式
paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN)); paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
//paint.setColor(Color.parseColor("#282932"));
mCanvas.drawBitmap(original, 0, 0, null); mCanvas.drawBitmap(original, 0, 0, null);
mCanvas.drawBitmap(mask, 0, 0, paint); mCanvas.drawBitmap(mask, 0, 0, paint);
paint.setXfermode(null); paint.setXfermode(null);
...@@ -49,5 +46,4 @@ public class MaskImage extends androidx.appcompat.widget.AppCompatImageView { ...@@ -49,5 +46,4 @@ public class MaskImage extends androidx.appcompat.widget.AppCompatImageView {
setVisibility(VISIBLE); setVisibility(VISIBLE);
} }
} }
\ No newline at end of file
app/src/main/java/live/nodiyphoneshell/cend/widget/MyAutoLayoutManager.java
package live.nodiyphoneshell.cend.widget; package live.nodiyphoneshell.cend.widget;
import android.view.View; import android.view.View;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
public class MyAutoLayoutManager extends RecyclerView.LayoutManager { public class MyAutoLayoutManager extends RecyclerView.LayoutManager {
public MyAutoLayoutManager() { public MyAutoLayoutManager() {
setAutoMeasureEnabled(true);//layoutmanager必须调用此方法设为true才能在onMesure时自动布局 setAutoMeasureEnabled(true);//layoutmanager必须调用此方法设为true才能在onMesure时自动布局
} }
@Override @Override
public RecyclerView.LayoutParams generateDefaultLayoutParams() { public RecyclerView.LayoutParams generateDefaultLayoutParams() {
return new RecyclerView.LayoutParams( return new RecyclerView.LayoutParams(
......
app/src/main/java/live/nodiyphoneshell/cend/widget/MyBitmapViewAnother.java
...@@ -83,9 +83,7 @@ public class MyBitmapViewAnother extends View { ...@@ -83,9 +83,7 @@ public class MyBitmapViewAnother extends View {
//绘制蒙版的画笔 //绘制蒙版的画笔
mPaintRect = new Paint(); mPaintRect = new Paint();
mPaintRect.setAntiAlias(true); mPaintRect.setAntiAlias(true);
//mPaintRect.setColor(Color.LTGRAY);
mPaintRect.setColor(Color.WHITE); mPaintRect.setColor(Color.WHITE);
//mPaintRect.setColor(Color.TRANSPARENT);
//路径记录滑动屏幕的路径。 //路径记录滑动屏幕的路径。
mPath = new Path(); mPath = new Path();
} }
...@@ -137,7 +135,6 @@ public class MyBitmapViewAnother extends View { ...@@ -137,7 +135,6 @@ public class MyBitmapViewAnother extends View {
invalidate(); invalidate();
} }
//刷子全部刷完成 //刷子全部刷完成
public void hasBrushAllComplete() { public void hasBrushAllComplete() {
hasComplete = true; hasComplete = true;
......
app/src/main/java/live/nodiyphoneshell/cend/widget/MyCropMoveView.java
...@@ -29,19 +29,15 @@ public class MyCropMoveView extends View { ...@@ -29,19 +29,15 @@ public class MyCropMoveView extends View {
init(); init();
} }
public MyCropMoveView(Context context, AttributeSet attrs, int defStyleAttr) { public MyCropMoveView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
} }
private void init() { private void init() {
//mBitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.index_listattachment);
width = mBitmap.getWidth(); width = mBitmap.getWidth();
height = mBitmap.getHeight(); height = mBitmap.getHeight();
} }
@Override @Override
protected void onDraw(Canvas canvas) { protected void onDraw(Canvas canvas) {
super.onDraw(canvas); super.onDraw(canvas);
...@@ -75,58 +71,6 @@ public class MyCropMoveView extends View { ...@@ -75,58 +71,6 @@ public class MyCropMoveView extends View {
canvas.drawBitmap(bitmap, matrix, null); //绘制新位图 canvas.drawBitmap(bitmap, matrix, null); //绘制新位图
} }
//重置
/*textView1= (TextView) findViewById(R.id.activity_myview_textview1);
textView1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
myViews.setMethod(0);
}
});
//左倾
textView2= (TextView) findViewById(R.id.activity_myview_textview2);
textView2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
myViews.setMethod(1);
}
});
//右倾
textView3= (TextView) findViewById(R.id.activity_myview_textview3);
textView3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
myViews.setMethod(2);
}
});
//放大
textView4= (TextView) findViewById(R.id.activity_myview_textview4);
textView4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
myViews.setMethod(3);
}
});
//缩小
textView5= (TextView) findViewById(R.id.activity_myview_textview5);
textView5.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
myViews.setMethod(4);
}
});*/
public void setMethod(int i) { public void setMethod(int i) {
method = i; method = i;
postInvalidate(); postInvalidate();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment