风险管理5月28日提交代码-liu.bolan——部分千海金代码

RMA/app/build.gradle

@@ -164,4 +164,6 @@ dependencies {
     implementation 'q.rorbin:badgeview:1.1.3'
     api 'com.luozm.captcha:captcha:1.1.2'
 
+    implementation 'com.google.zxing:core:3.3.0'
+
 }

RMA/app/src/main/AndroidManifest.xml

@@ -31,6 +31,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.RMA"
         android:usesCleartextTraffic="true">
@@ -267,6 +268,8 @@
         <activity android:name=".view.base.home.rolemanagement.ResetAccountPasswordActivity"/>
 
         <activity android:name=".view.base.home.reportquery.reportdetail.ReportCommonDetailsActivity"/>
+
+        <activity android:name=".view.base.main.promotioncode.MyPromotionCodeActivity"/>
     </application>
 
 </manifest>

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/photopicter/PhotoUtils.kt

@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Camera
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Build
@@ -13,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.view.autoWidget.toArrayList
+import com.blankj.utilcode.util.ImageUtils
 import com.tbruyelle.rxpermissions2.RxPermissions
 import mtp.polymer.com.autowidget.dialog.createWarningDialog
 
@@ -81,7 +83,7 @@ class PhotoUtils {
 
     fun showPicker(activity: AppCompatActivity, imageCount: Int = 1, selectedList: List<String>? = null, onPickerAction: ((List<String>) -> Unit)){
 
-        RxPermissions(activity).request(Manifest.permission.READ_EXTERNAL_STORAGE)
+        RxPermissions(activity).request(Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.CAMERA)
                 .subscribe { granted ->
                     if (granted) {
                         startPickerActivity(activity, imageCount, selectedList, onPickerAction)

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/photopicter/adapter/PhotoGridAdapter.java

@@ -11,6 +11,7 @@ import android.widget.ImageView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.blankj.utilcode.util.ImageUtils;
 import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.request.RequestOptions;
 import java.io.File;
@@ -118,7 +119,7 @@ public class PhotoGridAdapter extends SelectableAdapter<PhotoGridAdapter.PhotoVi
             .error(R.mipmap.__picker_ic_broken_image_black_48dp);
 
         glide.setDefaultRequestOptions(options)
-                .load(new File(photo.getPath()))
+                .load(ImageUtils.getBitmap(photo.getPath()))
                 .thumbnail(0.5f)
                 .into(holder.ivPhoto);
       }

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/utils/QRCodeUtils.java

@@ -0,0 +1,244 @@
+package cn.muchinfo.rma.view.autoWidget.utils;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.text.TextUtils;
+
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Description: 二维码操作
+ * Copyright  : Copyright (c) 2016
+ * Email      : jusenr@163.com
+ * Company    :
+ * Author     : Jusenr
+ * Date       : 2016/12/16 15:11.
+ */
+
+public class QRCodeUtils {
+
+    /**
+     * 生成二维码
+     *
+     * @param content                  内容
+     * @param widthPix                 图片宽度
+     * @param heightPix                图片高度
+     * @param openErrorCorrectionLevel 开启容错率
+     * @param logoBitmap               二维码中心的Logo图标（可以为null）
+     * @param filePath                 用于存储二维码图片的文件路径
+     * @return 生成二维码及保存文件是否成功
+     */
+    public static boolean createQRCode(String content, int widthPix, int heightPix, boolean openErrorCorrectionLevel, Bitmap logoBitmap, String filePath) {
+        try {
+            if (TextUtils.isEmpty(content) || TextUtils.equals("null", content) || "".equals(content)) {
+                return false;
+            }
+            Map hints = openErrorCorrectionLevel(openErrorCorrectionLevel);
+            // 图像数据转换，使用了矩阵转换
+            BitMatrix bitMatrix = new QRCodeWriter().encode(new String(content.getBytes("UTF-8"), "iso-8859-1"), BarcodeFormat.QR_CODE, widthPix, heightPix, hints);
+
+            Bitmap bitmap = generateQRBitmap(bitMatrix);
+
+            if (logoBitmap != null) {
+                bitmap = addLogo(bitmap, logoBitmap);
+            }
+            boolean compress = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, new FileOutputStream(filePath));
+//            ImageUtils
+            //必须使用compress方法将bitmap保存到文件中再进行读取。直接返回的bitmap是没有任何压缩的，内存消耗巨大！
+            return bitmap != null && bitmap.compress(Bitmap.CompressFormat.JPEG, 100, new FileOutputStream(filePath));
+        } catch (WriterException | IOException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+    /**
+     * 生成一个二维码图像
+     *
+     * @param content                  传入的字符串，通常是一个URL
+     * @param widthAndHeight           图像的宽高
+     * @param openErrorCorrectionLevel 开启容错率
+     */
+    public static Bitmap createQRCode(String content, int widthAndHeight, boolean openErrorCorrectionLevel) {
+        try {
+            if (TextUtils.isEmpty(content) || TextUtils.equals("null", content) || "".equals(content)) {
+                return null;
+            }
+            // 处理汉字，如果不用更改源码，将字符串转换成ISO-8859-1编码
+            Map hints = openErrorCorrectionLevel(openErrorCorrectionLevel);
+            BitMatrix matrix = new MultiFormatWriter().encode(new String(content.getBytes("UTF-8"), "ISO-8859-1"), BarcodeFormat.QR_CODE, widthAndHeight, widthAndHeight, hints);
+            matrix = updateBit(matrix, 8);
+            Bitmap bitmap = generateQRBitmap(matrix);
+            return bitmap;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static BitMatrix updateBit(BitMatrix matrix, int margin) {
+        int tempM = margin * 2;
+        int[] rec = matrix.getEnclosingRectangle();   //获取二维码图案的属性
+        int resWidth = rec[2] + tempM;
+        int resHeight = rec[3] + tempM;
+        BitMatrix resMatrix = new BitMatrix(resWidth, resHeight); // 按照自定义边框生成新的BitMatrix
+        resMatrix.clear();
+        for (int i = margin; i < resWidth - margin; i++) {   //循环，将二维码图案绘制到新的bitMatrix中
+            for (int j = margin; j < resHeight - margin; j++) {
+                if (matrix.get(i - margin + rec[0], j - margin + rec[1])) {
+                    resMatrix.set(i, j);
+                }
+            }
+        }
+        return resMatrix;
+    }
+
+    /**
+     * 生成一个二维码图像
+     *
+     * @param content
+     * @return
+     */
+    public static Bitmap createQRCode(String content) {
+        try {
+            if (TextUtils.isEmpty(content) || TextUtils.equals("null", content) || "".equals(content)) {
+                return null;
+            }
+            BitMatrix matrix = new MultiFormatWriter().encode(new String(content.getBytes("UTF-8"), "iso-8859-1"), BarcodeFormat.QR_CODE, 200, 200);
+            Bitmap bitmap = generateQRBitmap(matrix);
+            return bitmap;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 生成一个二维码图像
+     *
+     * @param qrCodeUrl
+     * @param width
+     * @param height
+     * @return
+     */
+    public static Bitmap createQRCode(String qrCodeUrl, int width, int height) {
+        Bitmap bitmap = createQRCode(qrCodeUrl, width, height, false);
+        return bitmap;
+    }
+
+    /**
+     * 生成一个二维码图像
+     *
+     * @param content
+     * @param width
+     * @param height
+     * @return
+     */
+    public static Bitmap createQRCode(String content, int width, int height, boolean openFaultTolerantRate) {
+        try {
+            if (TextUtils.isEmpty(content) || TextUtils.equals("null", content) || "".equals(content)) {
+                return null;
+            }
+            Map hints = openErrorCorrectionLevel(openFaultTolerantRate);
+            BitMatrix matrix = new MultiFormatWriter().encode(new String(content.getBytes("UTF-8"), "iso-8859-1"), BarcodeFormat.QR_CODE, width, height, hints);
+            Bitmap bitmap = generateQRBitmap(matrix);
+            return bitmap;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 绘制二维码
+     *
+     * @param matrix
+     * @return
+     */
+    public static Bitmap generateQRBitmap(BitMatrix matrix) {
+        int w = matrix.getWidth();
+        int h = matrix.getHeight();
+        int[] rawData = new int[w * h];
+        for (int i = 0; i < w; i++) {
+            for (int j = 0; j < h; j++) {
+                int color = Color.WHITE;
+                if (matrix.get(i, j)) {
+                    color = Color.BLACK;
+                }
+                rawData[i + (j * w)] = color;
+            }
+        }
+        Bitmap bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.RGB_565);
+        bitmap.setPixels(rawData, 0, w, 0, 0, w, h);
+        return bitmap;
+    }
+
+    /**
+     * 配置参数
+     *
+     * @param tag
+     * @return
+     */
+    public static Map openErrorCorrectionLevel(boolean tag) {
+        Map<EncodeHintType, Object> hints = new HashMap<>();
+        if (tag) {
+            hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);  //容错级别
+//            hints.put(EncodeHintType.MARGIN, 2);  //设置空白边距的宽度 default is 4
+        }
+        return hints;
+    }
+
+    /**
+     * 在二维码中间添加Logo图案
+     */
+    public static Bitmap addLogo(Bitmap src, Bitmap logo) {
+        if (src == null) {
+            return null;
+        }
+        if (logo == null) {
+            return src;
+        }
+        //获取图片的宽高
+        int srcWidth = src.getWidth();
+        int srcHeight = src.getHeight();
+        int logoWidth = logo.getWidth();
+        int logoHeight = logo.getHeight();
+        if (srcWidth == 0 || srcHeight == 0) {
+            return null;
+        }
+        if (logoWidth == 0 || logoHeight == 0) {
+            return src;
+        }
+        //logo大小为二维码整体大小的1/5
+        float scaleFactor = srcWidth * 1.0f / 5 / logoWidth;
+        Bitmap bitmap = Bitmap.createBitmap(srcWidth, srcHeight, Bitmap.Config.ARGB_8888);
+        try {
+            Canvas canvas = new Canvas(bitmap);
+            canvas.drawBitmap(src, 0, 0, null);
+            canvas.scale(scaleFactor, scaleFactor, srcWidth / 2, srcHeight / 2);
+            canvas.drawBitmap(logo, (srcWidth - logoWidth) / 2, (srcHeight - logoHeight) / 2, null);
+
+            canvas.save();
+            canvas.restore();
+        } catch (Exception e) {
+            bitmap = null;
+            e.printStackTrace();
+        }
+        return bitmap;
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/CommodityInformationViewModel.kt

@@ -373,15 +373,15 @@ class CommodityInformationViewModel : BaseViewModel() {
         } else if (type == "2") {//删除
             oldDatacacheList?.forEach {
                 if (id.toInt() < it.id.toInt()) {
-                    newDataList.add(it.copy(id = oldDatacacheList.indexOf(it).toString(),value = it.value))
+                    newDataList.add(it.copy(id = oldDatacacheList.indexOf(it).toString(),value = it.value,coefficientwarehouse = it.coefficientwarehouse))
                 }else if (id.toInt() > it.id.toInt()){
-                    newDataList.add(it.copy(id = oldDatacacheList.indexOf(it).toString(),value = it.value))
+                    newDataList.add(it.copy(id = oldDatacacheList.indexOf(it).toString(),value = it.value,coefficientwarehouse = it.coefficientwarehouse))
                 }
             }
             spotModelList.postValue(newDataList)
             spotModelcacheList.postValue(newDataList)
         } else if (type == "3") {//更换资料
-            oldDataList?.forEach {
+            oldDatacacheList?.forEach {
                 var newValue = ""
                 var newEnumdicnameid = ""
                 var newEnumdicname = ""
@@ -423,7 +423,7 @@ class CommodityInformationViewModel : BaseViewModel() {
 //            spotModelList.postValue(newDataList)
             spotModelcacheList.postValue(newDataList)
         }else if (type == "4") {//更换资料
-            oldDataList?.forEach {
+            oldDatacacheList?.forEach {
                 var newValue = ""
                 var newEnumdicnameid = ""
                 var newEnumdicname = ""

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/viewholder/AddSpotCategoryViewHolder.kt

@@ -78,7 +78,7 @@ class AddSpotCategoryViewHolder(
                     textChangedListener {
                         afterTextChanged {
                             if (it.toString().isNotEmpty()) {//修改品类
-                                viewModel.changeSpotModelList(id = data.value?.id.toString(),type = "3",value = it.toString())
+                                viewModel.changeSpotModelList(id = data.value?.id.toString(),type = "3",value = it.toString(),coefficientwarehouse = "")
                             }
                         }
                     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/ContractActivity.kt

@@ -293,7 +293,7 @@ class UnSubmitUI(
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(30)
                     }
-                }.lparams(autoSize(SizeUtils.dp2px(135f)), autoSize(100))
+                }.lparams(autoSize(SizeUtils.dp2px(90f)), autoSize(100))
 
                 inflateLayout<CustomHorizontalScrollView>(R.layout.scrollview) {
                     horScrollview = this
@@ -440,7 +440,7 @@ class ToAuditUI(
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(30)
                     }
-                }.lparams(autoSize(SizeUtils.dp2px(135f)), autoSize(100))
+                }.lparams(autoSize(SizeUtils.dp2px(90f)), autoSize(100))
 
                 inflateLayout<CustomHorizontalScrollView>(R.layout.scrollview) {
                     horScrollview = this
@@ -584,7 +584,7 @@ class PerformanceUI(
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(30)
                     }
-                }.lparams(autoSize(SizeUtils.dp2px(135f)), autoSize(100))
+                }.lparams(autoSize(SizeUtils.dp2px(90f)), autoSize(100))
 
                 inflateLayout<CustomHorizontalScrollView>(R.layout.scrollview) {
                     horScrollview = this
@@ -728,7 +728,7 @@ class FinishUI(
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(30)
                     }
-                }.lparams(autoSize(SizeUtils.dp2px(135f)), autoSize(100))
+                }.lparams(autoSize(SizeUtils.dp2px(90f)), autoSize(100))
 
                 inflateLayout<CustomHorizontalScrollView>(R.layout.scrollview) {
                     horScrollview = this

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/ContractViewModel.kt

@@ -385,17 +385,17 @@ class ContractViewModel : BaseViewModel() {
                         newList?.sortWith(Comparator { t1, t2 ->
                             (TimeUtils.string2Millis(t1.audittime) - TimeUtils.string2Millis(t2.audittime)).toInt()
                         })
-                        toAuditList.postValue(newList)
+                        toAuditList.postValue(resetContraData(newList ?: arrayListOf()))
                     }
                     "3" -> {
                         val newList = respData?.toArrayList()
                         newList?.sortWith(Comparator { t1, t2 ->
                             (TimeUtils.string2Millis(t1.updatetime) - TimeUtils.string2Millis(t2.updatetime)).toInt()
                         })
-                        performanceList.postValue(newList)
+                        performanceList.postValue(resetContraData(newList ?: arrayListOf()))
                     }
                     "4" -> {
-                        finishList.postValue(respData)
+                        finishList.postValue(resetContraData(respData ?: arrayListOf()))
                     }
                 }
             } else {
@@ -648,9 +648,9 @@ class ContractViewModel : BaseViewModel() {
         MyApplication.getInstance()?.commonManager?.queryTableDefine(params = params) { isSuccess, respData, error ->
             if (isSuccess) {
                 if (respData?.isNotEmpty() == true){
-                    val newlist = respData?.get(0)?.columns?.toArrayList()
-                    newlist?.sortWith(Comparator { t1, t2 ->
-                        t1.orderindex?.toInt()?.minus(t2.orderindex?.toInt() ?: 0) ?: 0
+                    val newlist = respData.get(0).columns.toArrayList()
+                    newlist.sortWith(Comparator { t1, t2 ->
+                        t1.autoid?.toInt()?.minus(t2.autoid?.toInt() ?: 0) ?: 0
                     })
                     if (type == "1"){
                         unSubmitTitle.postValue(newlist)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/adapter/ContractAdapter.java

@@ -24,6 +24,7 @@ import java.util.List;
 import cn.muchinfo.rma.R;
 import cn.muchinfo.rma.business.contract.SpotContractInfo;
 import cn.muchinfo.rma.global.GlobalDataCollection;
+import cn.muchinfo.rma.global.ViewEnumUtils;
 import cn.muchinfo.rma.global.data.ContractData;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
 import cn.muchinfo.rma.view.base.home.contract.ContractDetailsActivity;
@@ -95,8 +96,8 @@ public class ContractAdapter extends RecyclerView.Adapter<ContractAdapter.ItemVi
     public void onBindViewHolder(@NonNull final ItemViewHolder itemViewHolder, int i) {
         this.index = i;
         ContractData contractData = datas.get(i);
-        itemViewHolder.tvLeftTitle.setText(datas.get(i).getAccountname());
-        itemViewHolder.tv_left_bottom_title.setText(datas.get(i).getContractno());
+        itemViewHolder.tvLeftTitle.setText(datas.get(i).getContractno());
+        itemViewHolder.tv_left_bottom_title.setText(ViewEnumUtils.INSTANCE.getContractType(contractData.getContracttype()) + "/" + ViewEnumUtils.INSTANCE.getContractStatus(contractData.getContracctstatus()));
         //右边滑动部分
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/customerdata/AddCustomerDataActivity.kt

@@ -80,7 +80,7 @@ class AddCustomerDataActivity : BaseActivity<CustomerDataViewModel>() {
         MutableLiveData<String>().apply { value = "" } // 文件地址
 
     /**
-     * 身份证正面照片
+     * 身份证反面照片
      */
     private var backIdCarduploadFile: String = "" // 上传成功后服务给的图片地址
     private val backIdCardimageString: MutableLiveData<String> =

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventoryaudit/InventoryContentAdapter.java

@@ -229,7 +229,7 @@ public class InventoryContentAdapter extends RecyclerView.Adapter<InventoryConte
             spot_subsidiary = itemView.findViewById(R.id.spot_subsidiary);
             futures_subsidiary = itemView.findViewById(R.id.futures_subsidiary);
             place_the_order = itemView.findViewById(R.id.place_the_order);
-            exposure_tvLeftTitle = itemView.findViewById(R.id.exposure_tv_left_title);
+            exposure_tvLeftTitle = itemView.findViewById(R.id.inventory_tv_left_title);
             exposure_rvItemRight = itemView.findViewById(R.id.exposure_rv_item_right);
             exposure_horItemScrollview = itemView.findViewById(R.id.exposure_hor_item_scrollview);
             exposure_allView = itemView.findViewById(R.id.exposure_all_view);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventorymanager/adapter/ApplyRecordAdapter.java

@@ -174,12 +174,12 @@ public class ApplyRecordAdapter extends RecyclerView.Adapter<ApplyRecordAdapter.
             super(itemView);
             futures_subsidiary = itemView.findViewById(R.id.futures_subsidiary);
             place_the_order = itemView.findViewById(R.id.place_the_order);
-            exposure_tvLeftTitle = itemView.findViewById(R.id.exposure_tv_left_title);
+            exposure_tvLeftTitle = itemView.findViewById(R.id.tv_left_title);
             exposure_rvItemRight = itemView.findViewById(R.id.exposure_rv_item_right);
             exposure_horItemScrollview = itemView.findViewById(R.id.exposure_hor_item_scrollview);
             exposure_allView = itemView.findViewById(R.id.exposure_all_view);
-            exposure_tv_left_bottom_title = itemView.findViewById(R.id.exposure_tv_left_bottom_title);
-            exposure_all_click_View = itemView.findViewById(R.id.exposure_all_click_View);
+            exposure_tv_left_bottom_title = itemView.findViewById(R.id.tv_left_bottom_title);
+            exposure_all_click_View = itemView.findViewById(R.id.all_click_View);
             exposure_roots_view = itemView.findViewById(R.id.exposure_roots_view);
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventorymanager/adapter/InventoryCurrentAdapter.java

@@ -216,12 +216,12 @@ public class InventoryCurrentAdapter extends RecyclerView.Adapter<InventoryCurre
             super(itemView);
             futures_subsidiary = itemView.findViewById(R.id.futures_subsidiary);
             place_the_order = itemView.findViewById(R.id.place_the_order);
-            exposure_tvLeftTitle = itemView.findViewById(R.id.exposure_tv_left_title);
+            exposure_tvLeftTitle = itemView.findViewById(R.id.tv_left_title);
             exposure_rvItemRight = itemView.findViewById(R.id.exposure_rv_item_right);
             exposure_horItemScrollview = itemView.findViewById(R.id.exposure_hor_item_scrollview);
             exposure_allView = itemView.findViewById(R.id.exposure_all_view);
             exposure_tv_left_bottom_title = itemView.findViewById(R.id.exposure_tv_left_bottom_title);
-            exposure_all_click_View = itemView.findViewById(R.id.exposure_all_click_View);
+            exposure_all_click_View = itemView.findViewById(R.id.all_click_View);
             exposure_roots_view = itemView.findViewById(R.id.exposure_roots_view);
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/rolemanagement/AddRoleSetActivity.kt

@@ -65,11 +65,11 @@ class AddRoleSetActivity : BaseActivity<RoleSetViewModel>() {
                 commonLeftButton()
                 commonTitle {
                     if (type == "1") {
-                        text = "新增角色"
+                        text = "新增权限模板"
                     } else if (type == "2") {
-                        text = "修改角色信息"
+                        text = "修改权限模板"
                     } else {
-                        text = "详情"
+                        text = "权限模板详情"
                     }
                 }
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/rolemanagement/RoleSetViewModel.kt

@@ -117,14 +117,16 @@ class RoleSetViewModel : BaseViewModel(){
     fun queryAccMgrRoleMenu(roleid : String = ""){
         val params = mutableMapOf<String, String>().apply {
             put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
-//            put("roleid","0")
+            if (roleid.isNotEmpty()){
+                put("roleid",roleid)
+            }
         }
         MyApplication.getInstance()?.accountManager?.queryAccMgrRoleMenu(params = params){isSuccess, respData, error ->
             if (isSuccess){
                 roleMenuDataList.postValue(respData)
-                if (roleid.isNotEmpty()){
-                    queryHaveAccMgrRoleMenu(roleid)
-                }
+//                if (roleid.isNotEmpty()){
+//                    queryHaveAccMgrRoleMenu(roleid)
+//                }
             }
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/SeaKingMainFragment.kt

@@ -1,19 +1,19 @@
 package cn.muchinfo.rma.view.base.main
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import cn.muchinfo.rma.R
-import cn.muchinfo.rma.view.autoWidget.autoSize
-import cn.muchinfo.rma.view.autoWidget.createRoundRectDrawable
+import cn.muchinfo.rma.view.autoWidget.*
 
-import cn.muchinfo.rma.view.autoWidget.textColorInt
-import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import cn.muchinfo.rma.view.base.BaseFragment
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.emptyView
+import cn.muchinfo.rma.view.base.main.promotioncode.MyPromotionCodeActivity
+import com.blankj.utilcode.util.ActivityUtils
 
 import com.qmuiteam.qmui.kotlin.matchParent
 import org.jetbrains.anko.*
@@ -80,15 +80,39 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>(){
                                         }
                                     }.lparams(0, autoSize(100),1f)
 
-                                    linearLayout {
+                                    linearLayout{
+                                        onThrottleFirstClick {
+                                            val intent = Intent()
+                                            intent.setClass(context,MyPromotionCodeActivity::class.java)
+                                            ActivityUtils.startActivity(intent)
+                                        }
                                         backgroundResource = R.drawable.qhj_main_recommended_bg
-                                        gravity = Gravity.CENTER
-                                        textView {
-                                            text = "申请推广码"
-                                            textSizeAuto = 29
-                                            textColorInt = R.color.white
-                                        }.lparams(wrapContent, wrapContent)
-                                    }.lparams(autoSize(200), autoSize(60))
+                                        gravity = Gravity.CENTER_VERTICAL
+                                        imageView {
+                                            imageResource = R.mipmap.qhj_qrcode
+                                        }.lparams(autoSize(55), autoSize(55)){
+                                            marginStart = autoSize(32)
+                                        }
+
+                                        verticalLayout {
+                                            textView {
+                                                text = "推广码"
+                                                textSizeAuto = 26
+                                                textColorInt = R.color.text_hint_color_two
+                                            }.lparams(wrapContent, wrapContent){
+                                                topMargin = autoSize(10)
+                                            }
+                                            textView {
+                                                text = "1321"
+                                                textSizeAuto = 36
+                                                textColorInt = R.color.rma_black_33
+                                            }.lparams(wrapContent, wrapContent){
+                                                topMargin = autoSize(10)
+                                            }
+                                        }.lparams(matchParent, autoSize(96)){
+                                            marginStart = autoSize(32)
+                                        }
+                                    }.lparams(autoSize(228), autoSize(96))
 
                                 }.lparams(matchParent, autoSize(100))
                             }.lparams(matchParent, autoSize(213))
@@ -161,7 +185,7 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>(){
                                 }.lparams(0, autoSize(110),1f)
 
                             }.lparams(matchParent, autoSize(110)){
-                                topMargin = autoSize(40)
+                                topMargin = autoSize(20)
                             }
 
                             linearLayout {
@@ -192,13 +216,13 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>(){
                                     marginEnd = autoSize(78)
                                 }
                             }.lparams(matchParent, autoSize(100)){
-                                topMargin = autoSize(45)
+                                topMargin = autoSize(25)
                             }
 
                         }.lparams(matchParent, autoSize(440))
 
                         view {
-                            background = resources.getDrawable(R.color.rma_hint_text_color_ccc)
+                            background = resources.getDrawable(R.color.rma_item_bg)
                         }.lparams(matchParent, autoSize(20))
 
                         linearLayout {
@@ -278,7 +302,7 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>(){
                         }.lparams(matchParent, autoSize(200))
 
                         view {
-                            background = resources.getDrawable(R.color.rma_hint_text_color_ccc)
+                            background = resources.getDrawable(R.color.rma_item_bg)
                         }.lparams(matchParent, autoSize(20))
 
                         linearLayout {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/castsurely/MyCastSurelyActivity.kt

@@ -0,0 +1,62 @@
+package cn.muchinfo.rma.view.base.main.castsurely
+
+import android.os.Bundle
+import android.view.Gravity
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.view.autoWidget.autoSize
+import cn.muchinfo.rma.view.autoWidget.textColorInt
+import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.home.contract.emptyView
+import com.qmuiteam.qmui.kotlin.matchParent
+import org.jetbrains.anko.*
+
+/**
+ * 我的定投页面
+ */
+class MyCastSurelyActivity : BaseActivity<MyCastSurelyViewModel>() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                imageView {
+                    imageResource = R.mipmap.back
+                }.lparams(autoSize(48),autoSize(48)){
+                    marginStart = autoSize(36)
+                }
+                view {
+
+                }.lparams(autoSize(48),autoSize(48)){
+                    marginStart = autoSize(36)
+                }
+
+                emptyView()
+
+                textView {
+                    text = "我的"
+                    textColorInt = R.color.white
+                    textSizeAuto = 43
+                }.lparams(wrapContent, wrapContent)
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.qhj_history_icon
+                }.lparams(autoSize(48),autoSize(48)){
+                    marginEnd = autoSize(36)
+                }
+
+                imageView {
+                    imageResource = R.mipmap.qhj_add_icon
+                }.lparams(autoSize(48),autoSize(48)){
+                    marginEnd = autoSize(36)
+                }
+            }.lparams(matchParent, autoSize(120))
+
+
+        }
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/castsurely/MyCastSurelyViewModel.kt

@@ -0,0 +1,10 @@
+package cn.muchinfo.rma.view.base.main.castsurely
+
+import cn.muchinfo.rma.view.base.BaseViewModel
+
+/**
+ * 定投页面viewmodel
+ */
+class MyCastSurelyViewModel : BaseViewModel(){
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/MyPromotionCodeActivity.kt

@@ -0,0 +1,118 @@
+package cn.muchinfo.rma.view.base.main.promotioncode
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.QRCodeUtils
+import cn.muchinfo.rma.view.base.BaseActivity
+import com.blankj.utilcode.util.ToastUtils
+import org.jetbrains.anko.*
+
+/**
+ * 我的推广码页面
+ */
+class MyPromotionCodeActivity : BaseActivity<MyPromotionCodeViewModel>(){
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            background = resources.getDrawable(R.color.main_title_bg_color)
+            topBar {
+                // 返回
+                commonLeftButton()
+                commonTitle {
+                    text = "我的推广码"
+                }
+            }
+
+            relativeLayout {
+                gravity = Gravity.CENTER_HORIZONTAL
+
+                verticalLayout {
+                    backgroundDrawable = createRoundRectDrawable("#ffffff", 24)
+                    gravity = Gravity.CENTER_HORIZONTAL
+                    imageView {
+                        setOnLongClickListener(object : View.OnLongClickListener{
+                            override fun onLongClick(p0: View?): Boolean {
+                                ToastUtils.showLong("哈哈哈哈哈")
+                                return true
+                            }
+                        })
+                        setImageBitmap(QRCodeUtils.createQRCode("22222dakjshfkahfkajhskjahsdsayeiuahweakndjahsuahuias",220,true))
+                    }.lparams(autoSize(500), autoSize(500)){
+                        topMargin = autoSize(200)
+                    }
+
+                    textView {
+                        text = "长按保存二维码分享"
+                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textSizeAuto = 36
+                    }.lparams(wrapContent, wrapContent)
+
+                    relativeLayout {
+                        backgroundResource = R.drawable.bg_dot_line
+                        linearLayout {
+                            gravity = Gravity.CENTER_HORIZONTAL
+                            textView {
+                                text = "推广码"
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                            }.lparams(wrapContent, wrapContent)
+                        }.lparams(matchParent, wrapContent)
+                    }.lparams(matchParent, wrapContent){
+                        marginStart = autoSize(40)
+                        marginEnd = autoSize(40)
+                    }
+
+                    linearLayout {
+                        gravity = Gravity.CENTER_HORIZONTAL
+                        textView {
+                            text = "7931"
+                            textColorInt = R.color.rma_blue_color
+                            textSizeAuto = 72
+                        }.lparams(wrapContent, wrapContent)
+                    }.lparams(matchParent, wrapContent)
+
+
+
+                    linearLayout {
+                        backgroundResource = R.mipmap.qhj_promotion_bg
+                        gravity = Gravity.CENTER_HORIZONTAL
+                        textView {
+                            gravity = Gravity.CENTER
+                            backgroundResource = R.drawable.bg_transparent_line
+                            text = "复制推广码"
+                            textSizeAuto = 36
+                            textColorInt = R.color.rma_hint_text_color_ccc
+                        }.lparams(autoSize(288), autoSize(85)){
+                            topMargin = autoSize(20)
+                        }
+                    }.lparams(matchParent, autoSize(163)){
+                        gravity = Gravity.BOTTOM
+                    }
+
+                }.lparams(matchParent, autoSize(1100)){
+                    marginStart = autoSize(60)
+                    marginEnd = autoSize(60)
+                    topMargin = autoSize(166)
+                }
+
+                linearLayout {
+                    gravity = Gravity.CENTER_HORIZONTAL
+                    imageView {
+                        imageResource = R.mipmap.qhj_main_portrait
+                    }.lparams(autoSize(132), autoSize(132))
+                }.lparams(matchParent, autoSize(132)){
+                    topMargin = autoSize(100)
+                }
+            }.lparams(matchParent, matchParent){
+
+            }
+
+        }
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/MyPromotionCodeViewModel.kt

@@ -0,0 +1,12 @@
+package cn.muchinfo.rma.view.base.main.promotioncode
+
+import cn.muchinfo.rma.view.base.BaseViewModel
+
+/**
+ * 我的推广码页面viewmodel
+ */
+class MyPromotionCodeViewModel : BaseViewModel(){
+
+
+
+}

RMA/app/src/main/res/drawable/bg_dot_line.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="line">
+  <stroke
+      android:width="1dp"
+      android:color="#eaeaea"
+      android:dashGap="5dp"
+      android:dashWidth="5dp"/>
+</shape>

RMA/app/src/main/res/drawable/bg_transparent_line.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#00000000" />
+
+    <corners android:radius="10dp" />
+
+    <stroke
+        android:width="1dp"
+        android:color="#CCCCCC" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+
+</shape>

RMA/app/src/main/res/drawable/qhj_main_recommended_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/rma_blue_color"/>
+    <solid android:color="#DEEFFF"/>
     <corners android:topLeftRadius="100px"
         android:bottomLeftRadius="100px"/>
 </shape>

RMA/app/src/main/res/drawable/qhj_withdraw_bg.xml

@@ -11,7 +11,7 @@
         <shape>
             <gradient
                 android:startColor="#ffffffff"
-                android:endColor="#FBFBFB"
+                android:endColor="#6ABBFF"
                 android:centerX="0.5"
                 android:centerY="0.5"
                 android:angle="270"

RMA/app/src/main/res/layout/layout_item_contract.xml

@@ -12,13 +12,13 @@
         android:layout_height="55dp">
 
         <LinearLayout
-            android:layout_width="160dp"
+            android:layout_width="110dp"
             android:orientation="horizontal"
             android:layout_height="match_parent">
             <LinearLayout
                 android:gravity="center_vertical"
                 android:orientation="vertical"
-                android:layout_width="130dp"
+                android:layout_width="90dp"
                 android:layout_height="match_parent">
 
                 <TextView

RMA/app/src/main/res/layout/layout_item_inventory_content.xml

@@ -19,7 +19,7 @@
 
             <TextView
                 android:layout_marginStart="10dp"
-                android:id="@+id/exposure_tv_left_title"
+                android:id="@+id/inventory_tv_left_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="13sp"

RMA/app/src/main/res/layout/layout_item_inventory_current.xml

@@ -12,7 +12,7 @@
         android:layout_height="55dp">
 
         <LinearLayout
-            android:layout_width="160dp"
+            android:layout_width="110dp"
             android:orientation="horizontal"
             android:layout_height="match_parent">
             <LinearLayout