修改

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "live.nodiyphoneshell.cend"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 10807
-        versionName "1.0807"
+        versionCode 11008
+        versionName "1.1008"
         multiDexEnabled true
         ndk { abiFilters "armeabi", "armeabi-v7a", "x86", "mips" }
     }

app/src/main/AndroidManifest.xml

@@ -47,7 +47,7 @@
         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"
@@ -78,7 +78,6 @@
         <activity
             android:name=".view.process.ProcessActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
         <activity

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

@@ -18,9 +18,9 @@ import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.VideoView;
+import com.bumptech.glide.Glide;
 import com.lake.banner.BannerStyle;
 import com.lake.banner.HBanner;
 import com.lake.banner.ImageGravityType;
@@ -34,6 +34,7 @@ import io.reactivex.functions.Consumer;
 import live.nodiyphoneshell.cend.BaseActivity;
 import live.nodiyphoneshell.cend.CustomApplication;
 import  live.nodiyphoneshell.cend.R;
+import live.nodiyphoneshell.cend.config.Config;
 import live.nodiyphoneshell.cend.dialog.DialogEnterBackDialog;
 import live.nodiyphoneshell.cend.modules.BannerBean;
 import live.nodiyphoneshell.cend.modules.ImageBanner;
@@ -43,7 +44,6 @@ import live.nodiyphoneshell.cend.modules.VideoInfoBean;
 import live.nodiyphoneshell.cend.rxbus.RxBackHomeTimer;
 import live.nodiyphoneshell.cend.rxbus.RxBus;
 import live.nodiyphoneshell.cend.rxbus.RxConstants;
-import live.nodiyphoneshell.cend.rxbus.RxMakePromptMessageTimer;
 import live.nodiyphoneshell.cend.rxbus.RxProduceTimer;
 import live.nodiyphoneshell.cend.rxbus.RxHomePromptMessageTimer;
 import live.nodiyphoneshell.cend.service.AccessibilityUtil;
@@ -52,8 +52,11 @@ import live.nodiyphoneshell.cend.service.InstallUtil;
 import live.nodiyphoneshell.cend.utils.CommonUtil;
 import live.nodiyphoneshell.cend.utils.FontCache;
 import live.nodiyphoneshell.cend.utils.GlideCatchUtil;
+import live.nodiyphoneshell.cend.utils.ImageUtils;
 import live.nodiyphoneshell.cend.utils.JsonUtils;
+import live.nodiyphoneshell.cend.utils.QRCodeUtil;
 import live.nodiyphoneshell.cend.utils.SPUtils;
+import live.nodiyphoneshell.cend.utils.ScreenUtils;
 import live.nodiyphoneshell.cend.utils.ToastUtil;
 import live.nodiyphoneshell.cend.view.log.FileLogActivity;
 import live.nodiyphoneshell.cend.view.machine.MachineCodeActivity;
@@ -87,6 +90,9 @@ public class MainActivity extends BaseActivity implements MainContract.View {
     @BindView(R.id.fragment_home_banner_text)
     TextView fragment_home_banner_text;
 
+    @BindView(R.id.activity_main_qr_code)
+    ImageView activity_main_qr_code;
+
     private Handler handler = new Handler();
     private List<ViewItemBean> viewItemBeanList = new ArrayList<>();
     private MainPresenter mainPresenter;
@@ -124,13 +130,13 @@ public class MainActivity extends BaseActivity implements MainContract.View {
         mainPresenter = new MainPresenter(this, this);
         InstallUtil.checkSetting(this); //"未知来源"设置
         AccessibilityUtil.checkSetting(MainActivity.this, AutoInstallService.class); // "辅助功能"设置
-        new Handler().postDelayed(new Runnable() {
+       /* new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
                 Intent intent =new Intent(MainActivity.this, ProcessActivity.class);
                 startActivity(intent);
             }
-        },6000);
+        },5000);*/
     }
 
     /**
@@ -143,7 +149,6 @@ public class MainActivity extends BaseActivity implements MainContract.View {
         getScoketData();
     }
 
-
     //授权管理
     private void authorizationManagement() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -388,6 +393,8 @@ public class MainActivity extends BaseActivity implements MainContract.View {
         if (dataBean == null) {
             return;
         }
+        Glide.with(this).load(dataBean.getMin_code()).into(activity_main_qr_code);
+        //activity_main_qr_code.setImageBitmap(QRCodeUtil.createQRCodeBitmap(url,ScreenUtils.dip2px(this, 60), ScreenUtils.dip2px(this, 60)));
         initMachinData = true;
         int available = dataBean.getAvailable();
         //下单按钮是可以点击的，为0时下单按钮是灰色不可点击的。默认为1
@@ -797,6 +804,4 @@ public class MainActivity extends BaseActivity implements MainContract.View {
         RxHomePromptMessageTimer.getInstance(this).cancel();
     }
 
-
-
 }

app/src/main/java/live/nodiyphoneshell/cend/config/Config.java

@@ -16,22 +16,25 @@ public class Config {
     public static String MACHINE_GETSTATUS = "";           //设置设备码
     public static String GET_DETAIL_COVE_WITH;             //获取图片宽度
     public static String GET_PRINT_QR_CODE;               //小程序二维码
-
+    public static String GET_H5_QR_CODE;               //小程序二维码
     static {
         int type = 5;
         SEETING_TYEP=type;
         selectOnLineAndTest(type);
     }
 
+    //http://h5.refinecolor.com/#/?machine_id=100013
     public static void selectOnLineAndTest(int type) {
         SEETING_TYEP=type;
         switch (type) {
             case 5:
                 //测试环境
                 URL_DOMAIN = "https://tprint.refinecolor.com";
+                GET_H5_QR_CODE="http://h5.refinecolor.com/#/";
                 break;
             case 6://正式环境
                 URL_DOMAIN = "https://tprint.colorpark.cn";
+                GET_H5_QR_CODE="http://h5.colorpark.cn/#/";
                 break;
             default:
                 break;

app/src/main/java/live/nodiyphoneshell/cend/modules/MachineInitRewriteBean.java

@@ -59,7 +59,6 @@ public class MachineInitRewriteBean {
          * ws_host : {"id":1,"name":"T恤服务器一","host":"ws.refinecolor.com","port":9503}
          * video : {"id":40,"short_name":"平板-推送视频","full_name":"index_top_video","status":{"value":1,"text":"上架"},"ad_category_id":7,"type":{"value":2,"text":"视频"},"content":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16185414556078fb8fa3dbe.mp4","go_url":"","remark":"","sort":1,"create_time":"2021-04-16 10:51:34","update_time":"2021-04-16 18:19:24","delete_time":null,"ad_position_id":16,"font_size":0,"font_family":"输入或者选择","font_place":"输入或者选择","font_color":"","play_time":23}
          */
-
         private int id;
         private String code;
         private String partner_id;

app/src/main/java/live/nodiyphoneshell/cend/modules/WorkShap.java

-package live.nodiyphoneshell.cend.modules;
-
-import java.util.List;
-
-/**
- * @author MaYnaghua
- * @version 1.0.0
- * @date 2020/12/31 12:09
- */
-public class WorkShap {
-    /**
-     * code : 0
-     * msg :
-     * data : [{"id":142,"table_name":"shape","relation_id":"shape_category_id","group_name":"形状图分类","key":"无规则","title":"无规则","icon":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092024835fea7b33ebd70.png","icon_click":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092024975fea7b4194f6b.png","remark":"11","sort":0,"status":{"value":1,"text":"启用"},"create_time":"2020-12-28 11:44:41","update_time":"2020-12-29 09:14:42"},{"id":143,"table_name":"shape","relation_id":"shape_category_id","group_name":"形状图分类","key":"规则形状","title":"规则形状","icon":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092024535fea7b157f897.png","icon_click":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092024635fea7b1f3ad51.png","remark":"1","sort":2,"status":{"value":1,"text":"启用"},"create_time":"2020-12-28 13:44:24","update_time":"2020-12-29 09:14:31"}]
-     */
-    private int code;
-    private String msg;
-    private List<DataBean> data;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public List<DataBean> getData() {
-        return data;
-    }
-
-    public void setData(List<DataBean> data) {
-        this.data = data;
-    }
-
-    public static class DataBean {
-        /**
-         * id : 142
-         * table_name : shape
-         * relation_id : shape_category_id
-         * group_name : 形状图分类
-         * key : 无规则
-         * title : 无规则
-         * icon : https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092024835fea7b33ebd70.png
-         * icon_click : https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092024975fea7b4194f6b.png
-         * remark : 11
-         * sort : 0
-         * status : {"value":1,"text":"启用"}
-         * create_time : 2020-12-28 11:44:41
-         * update_time : 2020-12-29 09:14:42
-         */
-        private String id;
-        private String table_name;
-        private String relation_id;
-        private String group_name;
-        private String key;
-        private String title;
-        private String icon;
-        private String icon_click;
-        private String remark;
-        private int sort;
-        private StatusBean status;
-        private String create_time;
-        private String update_time;
-
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getTable_name() {
-            return table_name;
-        }
-
-        public void setTable_name(String table_name) {
-            this.table_name = table_name;
-        }
-
-        public String getRelation_id() {
-            return relation_id;
-        }
-
-        public void setRelation_id(String relation_id) {
-            this.relation_id = relation_id;
-        }
-
-        public String getGroup_name() {
-            return group_name;
-        }
-
-        public void setGroup_name(String group_name) {
-            this.group_name = group_name;
-        }
-
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public String getIcon() {
-            return icon;
-        }
-
-        public void setIcon(String icon) {
-            this.icon = icon;
-        }
-
-        public String getIcon_click() {
-            return icon_click;
-        }
-
-        public void setIcon_click(String icon_click) {
-            this.icon_click = icon_click;
-        }
-
-        public String getRemark() {
-            return remark;
-        }
-
-        public void setRemark(String remark) {
-            this.remark = remark;
-        }
-
-        public int getSort() {
-            return sort;
-        }
-
-        public void setSort(int sort) {
-            this.sort = sort;
-        }
-
-        public StatusBean getStatus() {
-            return status;
-        }
-
-        public void setStatus(StatusBean status) {
-            this.status = status;
-        }
-
-        public String getCreate_time() {
-            return create_time;
-        }
-
-        public void setCreate_time(String create_time) {
-            this.create_time = create_time;
-        }
-
-        public String getUpdate_time() {
-            return update_time;
-        }
-
-        public void setUpdate_time(String update_time) {
-            this.update_time = update_time;
-        }
-
-        public static class StatusBean {
-            /**
-             * value : 1
-             * text : 启用
-             */
-            private int value;
-            private String text;
-
-            public int getValue() {
-                return value;
-            }
-
-            public void setValue(int value) {
-                this.value = value;
-            }
-
-            public String getText() {
-                return text;
-            }
-
-            public void setText(String text) {
-                this.text = text;
-            }
-        }
-    }
-
-
-}

app/src/main/java/live/nodiyphoneshell/cend/modules/WorkShapList.java

-package live.nodiyphoneshell.cend.modules;
-
-import java.util.List;
-
-/**
- * @author MaYnaghua
- * @version 1.0.0
- * @date 2020/12/31 12:09
- */
-public class WorkShapList {
-
-
-    /**
-     * code : 0
-     * msg :
-     * data : {"total":3,"per_page":10,"current_page":1,"last_page":1,"data":[{"id":1,"shape_category_id":142,"name":"三角星","sales_price":"12.00","image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049765fea84f0b4ae0.png","compose_image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042945fea8246a7f67.jpg","status":{"value":1,"text":"上架"},"create_time":"2020-12-28 11:52:01","update_time":"2020-12-29 09:22:57","delete_time":null},{"id":2,"shape_category_id":143,"name":"三角星","sales_price":"10.00","image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049635fea84e348eee.png","compose_image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042825fea823ab8424.jpg","status":{"value":1,"text":"上架"},"create_time":"2020-12-28 17:05:38","update_time":"2020-12-29 09:22:45","delete_time":null},{"id":3,"shape_category_id":142,"name":"五角星","sales_price":"10.00","image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049525fea84d8d2c93.png","compose_image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042655fea8229c5a1c.jpg","status":{"value":1,"text":"上架"},"create_time":"2020-12-28 17:07:00","update_time":"2020-12-29 09:22:35","delete_time":null}]}
-     */
-
-    private int code;
-    private String msg;
-    private DataBeanX data;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public DataBeanX getData() {
-        return data;
-    }
-
-    public void setData(DataBeanX data) {
-        this.data = data;
-    }
-
-    public static class DataBeanX {
-        /**
-         * total : 3
-         * per_page : 10
-         * current_page : 1
-         * last_page : 1
-         * data : [{"id":1,"shape_category_id":142,"name":"三角星","sales_price":"12.00","image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049765fea84f0b4ae0.png","compose_image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042945fea8246a7f67.jpg","status":{"value":1,"text":"上架"},"create_time":"2020-12-28 11:52:01","update_time":"2020-12-29 09:22:57","delete_time":null},{"id":2,"shape_category_id":143,"name":"三角星","sales_price":"10.00","image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049635fea84e348eee.png","compose_image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042825fea823ab8424.jpg","status":{"value":1,"text":"上架"},"create_time":"2020-12-28 17:05:38","update_time":"2020-12-29 09:22:45","delete_time":null},{"id":3,"shape_category_id":142,"name":"五角星","sales_price":"10.00","image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049525fea84d8d2c93.png","compose_image":"https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042655fea8229c5a1c.jpg","status":{"value":1,"text":"上架"},"create_time":"2020-12-28 17:07:00","update_time":"2020-12-29 09:22:35","delete_time":null}]
-         */
-
-        private int total;
-        private int per_page;
-        private int current_page;
-        private int last_page;
-        private List<DataBean> data;
-
-        public int getTotal() {
-            return total;
-        }
-
-        public void setTotal(int total) {
-            this.total = total;
-        }
-
-        public int getPer_page() {
-            return per_page;
-        }
-
-        public void setPer_page(int per_page) {
-            this.per_page = per_page;
-        }
-
-        public int getCurrent_page() {
-            return current_page;
-        }
-
-        public void setCurrent_page(int current_page) {
-            this.current_page = current_page;
-        }
-
-        public int getLast_page() {
-            return last_page;
-        }
-
-        public void setLast_page(int last_page) {
-            this.last_page = last_page;
-        }
-
-        public List<DataBean> getData() {
-            return data;
-        }
-
-        public void setData(List<DataBean> data) {
-            this.data = data;
-        }
-
-        public static class DataBean {
-            /**
-             * id : 1
-             * shape_category_id : 142
-             * name : 三角星
-             * sales_price : 12.00
-             * image : https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092049765fea84f0b4ae0.png
-             * compose_image : https://rfc.oss-cn-shenzhen.aliyuncs.com/back/16092042945fea8246a7f67.jpg
-             * status : {"value":1,"text":"上架"}
-             * create_time : 2020-12-28 11:52:01
-             * update_time : 2020-12-29 09:22:57
-             * delete_time : null
-             */
-
-            private int id;
-            private int shape_category_id;
-            private String name;
-            private double sales_price;
-            private String image;
-            private String compose_image;
-            private StatusBean status;
-            private String create_time;
-            private String update_time;
-            private Object delete_time;
-
-            public int getId() {
-                return id;
-            }
-
-            public void setId(int id) {
-                this.id = id;
-            }
-
-            public int getShape_category_id() {
-                return shape_category_id;
-            }
-
-            public void setShape_category_id(int shape_category_id) {
-                this.shape_category_id = shape_category_id;
-            }
-
-            public String getName() {
-                return name;
-            }
-
-            public void setName(String name) {
-                this.name = name;
-            }
-
-            public double getSales_price() {
-                return sales_price;
-            }
-
-            public void setSales_price(double sales_price) {
-                this.sales_price = sales_price;
-            }
-
-            public String getImage() {
-                return image;
-            }
-
-            public void setImage(String image) {
-                this.image = image;
-            }
-
-            public String getCompose_image() {
-                return compose_image;
-            }
-
-            public void setCompose_image(String compose_image) {
-                this.compose_image = compose_image;
-            }
-
-            public StatusBean getStatus() {
-                return status;
-            }
-
-            public void setStatus(StatusBean status) {
-                this.status = status;
-            }
-
-            public String getCreate_time() {
-                return create_time;
-            }
-
-            public void setCreate_time(String create_time) {
-                this.create_time = create_time;
-            }
-
-            public String getUpdate_time() {
-                return update_time;
-            }
-
-            public void setUpdate_time(String update_time) {
-                this.update_time = update_time;
-            }
-
-            public Object getDelete_time() {
-                return delete_time;
-            }
-
-            public void setDelete_time(Object delete_time) {
-                this.delete_time = delete_time;
-            }
-
-            public static class StatusBean {
-                /**
-                 * value : 1
-                 * text : 上架
-                 */
-
-                private int value;
-                private String text;
-
-                public int getValue() {
-                    return value;
-                }
-
-                public void setValue(int value) {
-                    this.value = value;
-                }
-
-                public String getText() {
-                    return text;
-                }
-
-                public void setText(String text) {
-                    this.text = text;
-                }
-            }
-        }
-    }
-}

app/src/main/java/live/nodiyphoneshell/cend/modules/WorksComponentImageBean.java

-package live.nodiyphoneshell.cend.modules;
-import android.graphics.Bitmap;
-/**
- * @author MaYnaghua
- * @version 1.0.0  //作品部件
- * @date 2020/8/17 15:36
- */
-public class WorksComponentImageBean {
-
-    private int id;
-
-    private Bitmap bitmap;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public Bitmap getBitmap() {
-        return bitmap;
-    }
-
-    public void setBitmap(Bitmap bitmap) {
-        this.bitmap = bitmap;
-    }
-
-}

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

@@ -15,7 +15,6 @@ public class NetworkUtil {
         NETWORK_3G("3G"),
         NETWORK_UNKNOWN("Unknown"),
         NETWORK_NO("No network");
-
         private String desc;
         NetworkType(String desc) {
             this.desc = desc;

app/src/main/java/live/nodiyphoneshell/cend/rxbus/RxBackHomeTimer.java

@@ -17,7 +17,7 @@ public class RxBackHomeTimer {
     private Disposable mDisposable;
     private static volatile RxBackHomeTimer instance;
     private Context context;
-    private int time = 1800;
+    private int time = 250;
 
     public static RxBackHomeTimer getInstance(Context context) {
         if (instance == null) {
@@ -38,7 +38,7 @@ public class RxBackHomeTimer {
         if (timeType == -1) {
             this.time = -1;
         } else {
-            this.time = 1800;
+            this.time = 250;
         }
     }
 
@@ -47,7 +47,7 @@ public class RxBackHomeTimer {
         if (timeType == -1) {
             this.time = -1;
         } else {
-            this.time = 1800;
+            this.time = 250;
         }
     }
 
@@ -55,7 +55,7 @@ public class RxBackHomeTimer {
      * 每隔milliseconds秒后执行指定动作
      */
     public void interval(int timeNow) {
-        time = timeNow;
+        //time = 250;
         if(mDisposable==null) {
             Observable.interval(1, TimeUnit.SECONDS)
                     .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/live/nodiyphoneshell/cend/rxbus/RxTimer.java

@@ -76,41 +76,6 @@ public class RxTimer {
     }
 
     /**
-     * milliseconds毫秒后执行指定动作
-     *
-     * @param rxAction
-     */
-    public void timer(long milliSeconds, RxAction rxAction) {
-        Observable.timer(milliSeconds, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<Long>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable disposable) {
-                        mDisposable = disposable;
-                    }
-
-                    @Override
-                    public void onNext(@NonNull Long number) {
-                        if (rxAction != null) {
-                            rxAction.action(number);
-                        }
-                    }
-
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-                        //取消订阅
-                        cancel();
-                    }
-
-                    @Override
-                    public void onComplete() {
-                        //取消订阅
-                        cancel();
-                    }
-                });
-    }
-
-    /**
      * 每隔milliseconds毫秒后执行指定动作
      */
     public void interval(long milliSeconds) {

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

@@ -34,7 +34,6 @@ public class InstallUtil {
         });
         dialog.show();
         WindowManager.LayoutParams lp = dialog.getWindow().getAttributes();
-        //设置宽高，高度默认是自适应的，宽度根据屏幕宽度比例设置
         lp.width = ScreenUtils.getScreenWidth(cxt) * 8 / 10;
         //这里设置居中
         lp.gravity = Gravity.CENTER;

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

@@ -24,8 +24,6 @@ public class Upload {
 
     private static volatile Upload instance;
 
-    //public boolean uplodIn = false;
-
     public static Upload getInstance(Context context) {
         if (instance == null) {
             synchronized (Upload.class) {
@@ -44,7 +42,7 @@ public class Upload {
     public void goToDownload(String downloadUrl) {
             //GlideCatchUtil.getInstance().clearApkUpLoadlCache(context);
             mNotifyManager = (NotificationManager) CustomApplication.getContext().getSystemService(Context.NOTIFICATION_SERVICE);
-            new InstallUtils(context, downloadUrl, "ruifengcai"/*+System.currentTimeMillis()*/, new InstallUtils.DownloadCallBack() {
+            new InstallUtils(context, downloadUrl, "nodiyphoneshell"/*+System.currentTimeMillis()*/, new InstallUtils.DownloadCallBack() {
                 @Override
                 public void onStart() {
                     //Log.i("onStart", "InstallUtils---onStart");
@@ -103,7 +101,7 @@ public class Upload {
             mNotifyManager.createNotificationChannel(mChannel);
             notification = new NotificationCompat.Builder(CustomApplication.getContext())
                     .setChannelId(id)
-                    .setContentTitle("色彩手机壳")
+                    .setContentTitle("无触摸色彩手机壳")
                     .setContentText(CustomApplication.getContext().getString(R.string.android_auto_update_download_progress, progress)).setProgress(100, progress, false)
                     .setSmallIcon(R.drawable.app_logo_image)
                     .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.app_logo_image))
@@ -111,7 +109,7 @@ public class Upload {
             mNotifyManager.notify(NOTIFICATION_ID, notification);
         } else {
             mBuilder = new NotificationCompat.Builder(CustomApplication.getContext());
-            mBuilder.setContentTitle("色彩手机壳").setSmallIcon(R.drawable.app_logo_image).setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.app_logo_image));
+            mBuilder.setContentTitle("无触摸色彩手机壳").setSmallIcon(R.drawable.app_logo_image).setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.app_logo_image));
             mBuilder.setContentText(CustomApplication.getContext().getString(R.string.android_auto_update_download_progress, progress)).setProgress(100, progress, false);
             mNotifyManager.notify(NOTIFICATION_ID, mBuilder.build());
         }

app/src/main/java/live/nodiyphoneshell/cend/view/process/complete/ProcessCompleteActivity.java

@@ -21,6 +21,7 @@ import live.nodiyphoneshell.cend.config.Config;
 import live.nodiyphoneshell.cend.rxbus.RxBackHomeTimer;
 import live.nodiyphoneshell.cend.rxbus.RxTimer;
 import live.nodiyphoneshell.cend.utils.ScreenUtils;
+
 /**
  * Created by MaYangHua on 2017/2/21.
  */
@@ -203,7 +204,7 @@ public class ProcessCompleteActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        RxBackHomeTimer.getInstance(this).initTimer(300);
+        RxBackHomeTimer.getInstance(this).interval(-250);
     }
 
     @Override

app/src/main/java/live/nodiyphoneshell/cend/websocket/XYDClient.java

@@ -436,7 +436,6 @@ public class XYDClient {
             intent.putExtra("order_id", dataBean.getOrder_id());  //订单Id
             context.startActivity(intent);
         }
-        context.startActivity(intent);
         OkHttpUtils.get()
                 .addParams("order_id", order_id)
                 .url(Config.GET_DETAIL_COVE_WITH)
@@ -460,10 +459,10 @@ public class XYDClient {
                             return;
                         }
                         double scale = formatDouble2(dataBean.getRender_cove_height() / dataBean.getRender_height());
-                        int width = (int) Math.round(ScreenUtils.dip2px(context, 243) * scale);
-                        width = (ScreenUtils.dip2px(context, 243) - width) / 2 + width;
-                        int height = (int) Math.round(ScreenUtils.dip2px(context, 468) * scale);
-                        height = (ScreenUtils.dip2px(context, 468) - height) / 2 + height + ScreenUtils.dip2px(context, 6);
+                        int width = (int) Math.round(ScreenUtils.dip2px(context, 190) * scale);
+                        width = (ScreenUtils.dip2px(context, 190) - width) / 2 + width;
+                        int height = (int) Math.round(ScreenUtils.dip2px(context, 366) * scale);
+                        height = (ScreenUtils.dip2px(context, 390) - height) / 2 + height + ScreenUtils.dip2px(context, 5);
                         SPUtils.putIntValue("coveHeight", height);
                         SPUtils.putIntValue("covewidth", width);
                         int sqNumber = (int) Math.sqrt(width * height / (1500 * 5));

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

@@ -30,7 +30,6 @@ public class YuanJiaoImageView extends androidx.appcompat.widget.AppCompatImageV
         Path path = new Path();
         int w = this.getWidth();
         int h = this.getHeight();
-        //绘制圆角imageview
         path.addRoundRect(new RectF(0, 0, w, h), rids, Path.Direction.CW);
         canvas.clipPath(path);
         super.onDraw(canvas);

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/layout/activity_process.xml

@@ -20,21 +20,21 @@
         android:layout_marginTop="360dp"/>
     <RelativeLayout
         android:id="@+id/activity_process_diy_image_back_le"
-        android:layout_width="254dp"
-        android:layout_height="468dp"
-        android:layout_marginLeft="85dp"
-        android:layout_marginTop="70dp">
+        android:layout_width="210dp"
+        android:layout_height="410dp"
+        android:layout_marginLeft="113dp"
+        android:layout_marginTop="120dp">
         <ImageView
             android:id="@+id/activity_proces_diy_image_white"
-            android:layout_width="232dp"
-            android:layout_height="430dp"
+            android:layout_width="140dp"
+            android:layout_height="260dp"
             android:layout_centerInParent="true"
             android:background="@color/white_FFFFFF"
             android:visibility="gone"/>
         <live.nodiyphoneshell.cend.widget.MyBitmapViewAnother
             android:id="@+id/activity_proces_diy_image"
-            android:layout_width="252dp"
-            android:layout_height="466dp"
+            android:layout_width="208dp"
+            android:layout_height="387dp"
             android:layout_centerInParent="true"/>
         <ImageView
             android:id="@+id/activity_process_diy_image_back"
@@ -56,11 +56,12 @@
         android:id="@+id/activity_process_online_image_bacl_all_le"
         android:layout_width="match_parent"
         android:layout_height="452dp"
-        android:layout_marginLeft="190dp"
-        android:layout_marginTop="110dp"
+        android:layout_marginLeft="250dp"
+        android:layout_marginTop="90dp"
         android:background="@color/transparent"
         android:orientation="horizontal"
-        android:visibility="gone">
+        android:visibility="gone"
+       >
         <ImageView
             android:id="@+id/activity_process_online_image_one"
             android:layout_width="20dip"
@@ -72,14 +73,14 @@
             android:layout_width="20dip"
             android:layout_height="234dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="5dip"
+            android:layout_marginLeft="8dip"
             android:background="@drawable/icon_proces_online_image_one"/>
         <ImageView
             android:id="@+id/activity_process_online_image_three"
             android:layout_width="20dip"
             android:layout_height="234dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="5dip"
+            android:layout_marginLeft="8dip"
             android:background="@drawable/icon_proces_online_image_one"/>
     </LinearLayout>
     <LinearLayout

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

@@ -20,8 +20,7 @@
             android:orientation="vertical">
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="730dp" />
-            <!--android:background="@drawable/icon_process_print_strat"-->
+                android:layout_height="730dp"/>
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="730dp" />
@@ -43,16 +42,16 @@
             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" />
+            android:layout_height="251dp"/>
     </RelativeLayout>
     <LinearLayout
         android:id="@+id/activity_process_complete_time_le"

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

@@ -58,7 +58,6 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
     <TextView
         android:id="@+id/fragment_home_banner_text"
         android:layout_width="match_parent"
@@ -77,5 +76,37 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <ImageView
+        android:id="@+id/activity_main_qr_code"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:layout_marginBottom="70dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:ignore="MissingConstraints"/>
+    <!--<TextView
+        android:id="@+id/activity_main_qr_code_text"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="20dp"
+        tools:ignore="MissingConstraints"
+        android:layout_marginLeft=""
+        />-->
+    <TextView
+        android:id="@+id/activity_main_qr_code_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="扫码定制"
+        android:textColor="@color/white_FFFFFF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:textSize="12sp"
+        android:layout_marginBottom="40dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:ignore="MissingConstraints"
+        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -3,21 +3,21 @@
     android:layout_width="245dip"
     android:layout_height="180dp"
     android:gravity="center"
-    android:orientation="vertical">
-
+    android:orientation="vertical"
+    android:background="@drawable/make_pay_succeed_shap">
     <EditText
         android:id="@+id/layout_machine_home_back_code_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:hint="输入机器密码"
         android:paddingLeft="15dip"
+        android:background="@drawable/machine_code_password_shap"
         android:layout_gravity="center_horizontal"
         android:textCursorDrawable="@color/color_333333"
         android:textColor="@color/color_333333"
         android:textColorHint="@color/color_333333"
         android:maxLength="20"
-        android:textSize="12sp" />
-
+        android:textSize="12sp"/>
     <Button
         android:id="@+id/layout_machine_home_back_bt"
         android:layout_width="wrap_content"
@@ -26,6 +26,5 @@
         android:text="确定"
         android:layout_gravity="center_horizontal"
         android:textColor="@color/white_FFFFFF"
-        android:textSize="12sp" />
-
+        android:textSize="12sp"/>
 </LinearLayout>
\ No newline at end of file