Bladeren bron

风险管理7月10日提交代码-liu.bolan-千海金

Liu.bolan 4 jaren geleden
bovenliggende
commit
305ff0de61
18 gewijzigde bestanden met toevoegingen van 1468 en 11 verwijderingen
  1. 2 0
      RMA/app/src/main/AndroidManifest.xml
  2. 922 2
      RMA/app/src/main/java/cn/muchinfo/rma/protobuf/protoclasses/ManageServiceMI3.java
  3. 1 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/MainActivity.kt
  4. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/MainViewModel.kt
  5. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/PayActivity.kt
  6. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/PaySuccessActivity.kt
  7. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/PayViewModel.kt
  8. 4 6
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/SeaKingMainFragment.kt
  9. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/integral/IntegralViewHolder.kt
  10. 0 2
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/integral/MyIntegralActivity.kt
  11. 514 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/ApplyPromotionCodeActivity.kt
  12. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/MyPromotionCodeActivity.kt
  13. 6 1
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/MyPromotionCodeViewModel.kt
  14. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/reward/MyRewardActivity.kt
  15. 1 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/reward/RewardRuleActivity.kt
  16. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/reward/RewardViewHolder.kt
  17. 2 0
      RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/team/MyTeamActivity.kt
  18. BIN
      RMA/app/src/main/res/mipmap-xhdpi/qhj_add_positive_idcard.png

+ 2 - 0
RMA/app/src/main/AndroidManifest.xml

@@ -364,6 +364,8 @@
 
         <activity android:name=".view.base.main.reward.RewardRuleActivity"/>
 
+        <activity android:name=".view.base.main.promotioncode.ApplyPromotionCodeActivity"/>
+
     </application>
 
 </manifest>

File diff suppressed because it is too large
+ 922 - 2
RMA/app/src/main/java/cn/muchinfo/rma/protobuf/protoclasses/ManageServiceMI3.java


+ 1 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/MainActivity.kt

@@ -44,6 +44,7 @@ import kotlin.concurrent.schedule
 
 class MainActivity : BaseActivity<MainViewModel>() {
 
+
     /** 首页 **/
     val homeFragment by lazy {
         NewHomeFragment()

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/MainViewModel.kt

@@ -20,6 +20,8 @@ import java.lang.Exception
 
 class MainViewModel : BaseViewModel() {
 
+
+
     /**
      * 加载状态控制
      */

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/PayActivity.kt

@@ -37,6 +37,8 @@ import org.jetbrains.anko.*
  */
 class PayActivity : BaseActivity<PayViewModel>() {
 
+
+
     //用于余额支付时,传入后台的状态,// uint32 支付类型 - 1:成交支付 2:尾款支付
     val paytype by lazy { intent.getStringExtra("paytype") }
 

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/PaySuccessActivity.kt

@@ -19,6 +19,8 @@ import org.jetbrains.anko.*
  */
 class PaySuccessActivity : BaseActivity<PayViewModel>(){
 
+
+
     /**
      * 1 是支付成功 2 是充值成功
      */

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/PayViewModel.kt

@@ -25,6 +25,8 @@ import org.json.JSONObject
 //支付页面的viewmodel
 class PayViewModel : BaseViewModel(){
 
+
+
     /**
      * 数据初始化状态控制
      */

+ 4 - 6
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/SeaKingMainFragment.kt

@@ -25,8 +25,10 @@ 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.addressmanagement.MyAddressManagementActivity
 import cn.muchinfo.rma.view.base.main.castsurely.MyCastSurelyActivity
+import cn.muchinfo.rma.view.base.main.integral.MyIntegralActivity
 import cn.muchinfo.rma.view.base.main.pickup.PickUpGoodsSearchActivity
 import cn.muchinfo.rma.view.base.main.promotioncode.MyPromotionCodeActivity
+import cn.muchinfo.rma.view.base.main.reward.MyRewardActivity
 import cn.muchinfo.rma.view.base.main.team.MyTeamActivity
 import cn.muchinfo.rma.view.base.main.withdrawmanagement.WithDrawManagementActivity
 import cn.muchinfo.rma.view.base.main.withdrawmanagement.WithdrawalActivity
@@ -548,7 +550,6 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                         itemView()
 
                         linearLayout {
-                            visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
                                 val intent = Intent()
@@ -598,11 +599,10 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                         itemView()
 
                         linearLayout {
-                            visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
                                 val intent = Intent()
-                                intent.setClass(context, MyTeamActivity::class.java)
+                                intent.setClass(context, MyRewardActivity::class.java)
                                 ActivityUtils.startActivity(intent)
                             }
                             imageView {
@@ -751,11 +751,10 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                         itemView()
 
                         linearLayout {
-                            visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
                                 val intent = Intent()
-                                intent.setClass(context, MyTeamActivity::class.java)
+                                intent.setClass(context, MyIntegralActivity::class.java)
                                 ActivityUtils.startActivity(intent)
                             }
                             imageView {
@@ -799,7 +798,6 @@ class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>() {
                         }.lparams(matchParent, autoSize(140))
 
                         linearLayout {
-                            visibility = View.GONE
                             onThrottleFirstClick {
                                  if (ActivityCompat.checkSelfPermission(
                                          context,

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/integral/IntegralViewHolder.kt

@@ -19,6 +19,8 @@ class IntegralViewHolder(private val activity : AppCompatActivity) : BaseViewHol
     override fun _FrameLayout.createContentView() {
         verticalLayout {
 
+
+
             linearLayout {
                 linearLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT

+ 0 - 2
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/integral/MyIntegralActivity.kt

@@ -35,11 +35,9 @@ class MyIntegralActivity : BaseActivity<MyIntegralViewModel>(){
         endTime.postValue(TimeUtils.getNowString(SimpleDateFormat("yyyy-MM-dd")))
     }
 
-
     private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
 
-
     //我的奖励viewholder
     private val integralAdapter: BaseAdapter<ScoreLogData, IntegralViewHolder> =
         BaseAdapter { _, _ -> IntegralViewHolder(this) }

+ 514 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/ApplyPromotionCodeActivity.kt

@@ -0,0 +1,514 @@
+package cn.muchinfo.rma.view.base.main.promotioncode
+
+import android.Manifest
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import androidx.lifecycle.MutableLiveData
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.netManage.base.InteractiveException
+import cn.muchinfo.rma.netManage.utils.UpLoadUtils
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.photopicter.PhotoUtils
+import cn.muchinfo.rma.view.autoWidget.photopicter.utils.ImageCaptureManager
+import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.app.Constant
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import com.alibaba.fastjson.JSON
+import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.LogUtils
+import com.blankj.utilcode.util.SPUtils
+import com.tbruyelle.rxpermissions2.RxPermissions
+import com.zhy.http.okhttp.callback.StringCallback
+import mtp.polymer.com.autowidget.dialog.SelectData
+import mtp.polymer.com.autowidget.dialog.creatBottomSheetDialog
+import mtp.polymer.com.autowidget.utils.TaskUiModel
+import okhttp3.Call
+import org.jetbrains.anko.*
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.File
+
+/**
+ * 申请推广码页面
+ */
+class ApplyPromotionCodeActivity : BaseActivity<MyPromotionCodeViewModel>(){
+
+    //以下是正面照
+    private var positiveUploadFile: String = ""//上传成功后服务给的图片地址
+    val positiveImageString: MutableLiveData<String> =
+        MutableLiveData<String>().apply { value = "" }//文件地址
+
+    val positiveImagePhotoString: MutableLiveData<String> =
+        MutableLiveData<String>().apply { value = "" }//拍照后的文件地址
+
+    val positiveImageCaptureManager by lazy { ImageCaptureManager(this) }
+
+    //以下是反面照
+    private var reverseUploadFile: String = ""//上传成功后服务给的图片地址
+    val reverseImageString: MutableLiveData<String> =
+        MutableLiveData<String>().apply { value = "" }//文件地址
+
+    val reverseImagePhotoString: MutableLiveData<String> =
+        MutableLiveData<String>().apply { value = "" }//拍照后的文件地址
+    val reverseImageCaptureManager by lazy { ImageCaptureManager(this) }
+
+    //输入的姓名
+    lateinit var name_edittext : EditText
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == 101 && resultCode == Activity.RESULT_OK) {//正面照拍照后
+            positiveImageCaptureManager.galleryAddPic()
+            positiveImagePhotoString.postValue(positiveImageCaptureManager.currentPhotoPath)
+            LogUtils.eTag("dasdasdsadasdad", positiveImageCaptureManager.currentPhotoPath)
+        }else if (requestCode == 102 && resultCode == Activity.RESULT_OK) {//反面照拍照后
+            reverseImageCaptureManager.galleryAddPic()
+            reverseImagePhotoString.postValue(reverseImageCaptureManager.currentPhotoPath)
+            LogUtils.eTag("dasdasdsadasdad", reverseImageCaptureManager.currentPhotoPath)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            background = resources.getDrawable(R.color.main_hit_bg_color)
+            //页面标题
+            topBar {
+                commonLeftButton()
+                commonTitle {
+                    text = "申请推广码"
+                }
+            }
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                linearLayout {
+                    gravity = Gravity.CENTER_VERTICAL
+                    textView {
+                        text = "姓名"
+                        textSizeAuto = 31
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(autoSize(260), wrapContent) {
+                        marginStart = autoSize(36)
+                    }
+                }.lparams(autoSize(260), autoSize(132))
+
+
+                editText {
+                    name_edittext = this
+                    hint = "请输入姓名"
+                    background = null
+                    inputType = EditorInfo.TYPE_CLASS_TEXT
+                    hintColorStr = "#CCCCCC"
+                    textSizeAuto = 31
+                    textColorStr = "#333333"
+                }.lparams(matchParent, autoSize(132))
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                linearLayout {
+                    gravity = Gravity.CENTER_VERTICAL
+                    textView {
+                        text = "身份证号码"
+                        textSizeAuto = 31
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(autoSize(260), wrapContent) {
+                        marginStart = autoSize(36)
+                    }
+                }.lparams(autoSize(260), autoSize(132))
+
+
+                editText {
+                    name_edittext = this
+                    hint = "请输入身份证号码"
+                    background = null
+                    inputType = EditorInfo.TYPE_CLASS_TEXT
+                    hintColorStr = "#CCCCCC"
+                    textSizeAuto = 31
+                    textColorStr = "#333333"
+                }.lparams(matchParent, autoSize(132))
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+
+                linearLayout {
+                    gravity = Gravity.CENTER_VERTICAL
+                    textView {
+                        text = "上传证件照"
+                        textSizeAuto = 31
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(autoSize(260), wrapContent) {
+                        marginStart = autoSize(36)
+                    }
+                }.lparams(autoSize(260), autoSize(132))
+
+            }.lparams(matchParent, autoSize(132))
+
+            linearLayout {
+                gravity = Gravity.CENTER_HORIZONTAL
+                linearLayout {
+                    backgroundResource = R.mipmap.qhj_add_positive_idcard
+                    positiveImageString.bindOptional(context) {
+                        visibility = if (it.isNullOrEmpty()) {
+                            View.VISIBLE
+                        } else {
+                            View.GONE
+                        }
+                    }
+                    visibility = View.VISIBLE
+                    onThrottleFirstClick {
+                        if (positiveImageString.value.isNullOrEmpty().not()){
+                            return@onThrottleFirstClick
+                        }
+
+                        val selectDataList = arrayListOf(
+                            SelectData(id = "1", value = "拍照"),
+                            SelectData(id = "2", value = "相册")
+                        )
+                        creatBottomSheetDialog("请选择上传", selectDataList) {
+                            if (this.id == "1"){
+                                RxPermissions(this@ApplyPromotionCodeActivity).request(
+                                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                                    Manifest.permission.CAMERA)
+                                    .subscribe { granted ->
+                                        if (granted) {//打开相机拍照
+                                            val intent = positiveImageCaptureManager.dispatchTakePictureIntent()
+                                            ActivityUtils.startActivityForResult(this@ApplyPromotionCodeActivity, intent, 101)
+                                        }
+                                    }
+                            }else if (this.id == "2"){
+                                PhotoUtils().showPicker(this@ApplyPromotionCodeActivity) {
+                                    it.firstOrNull()?.let {
+                                        viewModel.loadingDialogStatus.value =
+                                            TaskUiModel.inFlight()
+                                        UpLoadUtils(this@ApplyPromotionCodeActivity).uploadPicture(
+                                            File(it),
+                                            object : StringCallback() {
+                                                override fun onError(
+                                                    call: Call,
+                                                    e: Exception,
+                                                    id: Int
+                                                ) {
+                                                    LogUtils.e("hidahdashdsdasd", e.message)
+                                                    viewModel.loadingDialogStatus.value =
+                                                        TaskUiModel.failed(
+                                                            InteractiveException(
+                                                                errorMessage = e.message ?: ""
+                                                            )
+                                                        )
+                                                }
+
+                                                override fun onResponse(
+                                                    response: String,
+                                                    id: Int
+                                                ) {
+                                                    /*[{"originalName":"tem.jpg","fileName":"201907161657044712.jpg","fileSize":"0KB","fileType":"image/jpeg","filePath":"./uploadFile/20190716/201907161657044712.jpg","submitName":null}]*/
+                                                    try {
+                                                        viewModel.loadingDialogStatus.value =
+                                                            TaskUiModel.success("上传成功")
+                                                        val jsonArray = JSONArray(response)
+                                                        LogUtils.eTag(
+                                                            "图片",
+                                                            JSON.toJSONString(jsonArray)
+                                                        )
+                                                        for (i in 0 until jsonArray.length()) {
+                                                            positiveUploadFile =
+                                                                (jsonArray.get(i) as JSONObject).getString(
+                                                                    "filePath"
+                                                                )
+                                                            positiveImageString.value = it
+                                                            LogUtils.e("hidahdashd", positiveUploadFile)
+                                                        }
+                                                    } catch (e: JSONException) {
+                                                        e.printStackTrace()
+                                                    }
+
+                                                }
+                                            },
+                                            10000.0,
+                                            SPUtils.getInstance().getString(Constant.uploadUrl)
+                                        )
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    positiveImagePhotoString.bindOptional(context) {
+                        if (it.isNullOrEmpty().not()) {
+                            viewModel.loadingDialogStatus.value =
+                                TaskUiModel.inFlight()
+                            UpLoadUtils(this@ApplyPromotionCodeActivity).uploadPicture(
+                                File(it),
+                                object : StringCallback() {
+                                    override fun onError(
+                                        call: Call,
+                                        e: Exception,
+                                        id: Int
+                                    ) {
+                                        LogUtils.e("hidahdashdsdasd", e.message)
+                                        viewModel.loadingDialogStatus.value =
+                                            TaskUiModel.failed(
+                                                InteractiveException(
+                                                    errorMessage = e.message ?: ""
+                                                )
+                                            )
+                                    }
+
+                                    override fun onResponse(
+                                        response: String,
+                                        id: Int
+                                    ) {
+                                        /*[{"originalName":"tem.jpg","fileName":"201907161657044712.jpg","fileSize":"0KB","fileType":"image/jpeg","filePath":"./uploadFile/20190716/201907161657044712.jpg","submitName":null}]*/
+                                        try {
+                                            viewModel.loadingDialogStatus.value =
+                                                TaskUiModel.success("上传成功")
+                                            val jsonArray = JSONArray(response)
+                                            LogUtils.eTag(
+                                                "图片",
+                                                JSON.toJSONString(jsonArray)
+                                            )
+                                            for (i in 0 until jsonArray.length()) {
+                                                positiveUploadFile =
+                                                    (jsonArray.get(i) as JSONObject).getString(
+                                                        "filePath"
+                                                    )
+                                                positiveImageString.value = it
+                                                LogUtils.e("hidahdashd", positiveUploadFile)
+                                            }
+                                        } catch (e: JSONException) {
+                                            e.printStackTrace()
+                                        }
+
+                                    }
+                                },
+                                10000.0,
+                                SPUtils.getInstance().getString(Constant.uploadUrl)
+                            )
+                        }
+                    }
+
+                }.lparams(autoSize(480), autoSize(288))
+
+                imageView {
+                    positiveImageString.bindOptional(context) {
+                        if (it.isNullOrEmpty()) {
+                            visibility = View.GONE
+                        } else {
+                            visibility = View.VISIBLE
+                            setImageURI(Uri.parse(it))
+                        }
+                    }
+                    visibility = View.GONE
+                    onThrottleFirstClick {
+                        val path = positiveImageString.value.guard {
+                            return@onThrottleFirstClick
+                        }
+                        PhotoUtils().showImageViewer(
+                            this@ApplyPromotionCodeActivity,
+                            1,
+                            arrayListOf(path)
+                        )
+                    }
+                }.lparams(autoSize(480), autoSize(288)) {
+                    marginStart = autoSize(250)
+                }
+            }.lparams(matchParent, autoSize(288)){
+                topMargin = autoSize(40)
+            }
+
+            linearLayout {
+                gravity = Gravity.CENTER_HORIZONTAL
+                linearLayout {
+                    backgroundResource = R.mipmap.qhj_add_positive_idcard
+                    reverseImageString.bindOptional(context) {
+                        visibility = if (it.isNullOrEmpty()) {
+                            View.VISIBLE
+                        } else {
+                            View.GONE
+                        }
+                    }
+                    visibility = View.VISIBLE
+                    onThrottleFirstClick {
+                        if (reverseImageString.value.isNullOrEmpty().not()){
+                            return@onThrottleFirstClick
+                        }
+
+                        val selectDataList = arrayListOf(
+                            SelectData(id = "1", value = "拍照"),
+                            SelectData(id = "2", value = "相册")
+                        )
+                        creatBottomSheetDialog("请选择上传", selectDataList) {
+                            if (this.id == "1"){
+                                RxPermissions(this@ApplyPromotionCodeActivity).request(
+                                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                                    Manifest.permission.CAMERA)
+                                    .subscribe { granted ->
+                                        if (granted) {//打开相机拍照
+                                            val intent = reverseImageCaptureManager.dispatchTakePictureIntent()
+                                            ActivityUtils.startActivityForResult(this@ApplyPromotionCodeActivity, intent, 102)
+                                        }
+                                    }
+                            }else if (this.id == "2"){
+                                PhotoUtils().showPicker(this@ApplyPromotionCodeActivity) {
+                                    it.firstOrNull()?.let {
+                                        viewModel.loadingDialogStatus.value =
+                                            TaskUiModel.inFlight()
+                                        UpLoadUtils(this@ApplyPromotionCodeActivity).uploadPicture(
+                                            File(it),
+                                            object : StringCallback() {
+                                                override fun onError(
+                                                    call: Call,
+                                                    e: Exception,
+                                                    id: Int
+                                                ) {
+                                                    LogUtils.e("hidahdashdsdasd", e.message)
+                                                    viewModel.loadingDialogStatus.value =
+                                                        TaskUiModel.failed(
+                                                            InteractiveException(
+                                                                errorMessage = e.message ?: ""
+                                                            )
+                                                        )
+                                                }
+
+                                                override fun onResponse(
+                                                    response: String,
+                                                    id: Int
+                                                ) {
+                                                    /*[{"originalName":"tem.jpg","fileName":"201907161657044712.jpg","fileSize":"0KB","fileType":"image/jpeg","filePath":"./uploadFile/20190716/201907161657044712.jpg","submitName":null}]*/
+                                                    try {
+                                                        viewModel.loadingDialogStatus.value =
+                                                            TaskUiModel.success("上传成功")
+                                                        val jsonArray = JSONArray(response)
+                                                        LogUtils.eTag(
+                                                            "图片",
+                                                            JSON.toJSONString(jsonArray)
+                                                        )
+                                                        for (i in 0 until jsonArray.length()) {
+                                                            reverseUploadFile =
+                                                                (jsonArray.get(i) as JSONObject).getString(
+                                                                    "filePath"
+                                                                )
+                                                            reverseImageString.value = it
+                                                            LogUtils.e("hidahdashd", reverseUploadFile)
+                                                        }
+                                                    } catch (e: JSONException) {
+                                                        e.printStackTrace()
+                                                    }
+
+                                                }
+                                            },
+                                            10000.0,
+                                            SPUtils.getInstance().getString(Constant.uploadUrl)
+                                        )
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    reverseImagePhotoString.bindOptional(context) {
+                        if (it.isNullOrEmpty().not()) {
+                            viewModel.loadingDialogStatus.value =
+                                TaskUiModel.inFlight()
+                            UpLoadUtils(this@ApplyPromotionCodeActivity).uploadPicture(
+                                File(it),
+                                object : StringCallback() {
+                                    override fun onError(
+                                        call: Call,
+                                        e: Exception,
+                                        id: Int
+                                    ) {
+                                        LogUtils.e("hidahdashdsdasd", e.message)
+                                        viewModel.loadingDialogStatus.value =
+                                            TaskUiModel.failed(
+                                                InteractiveException(
+                                                    errorMessage = e.message ?: ""
+                                                )
+                                            )
+                                    }
+
+                                    override fun onResponse(
+                                        response: String,
+                                        id: Int
+                                    ) {
+                                        /*[{"originalName":"tem.jpg","fileName":"201907161657044712.jpg","fileSize":"0KB","fileType":"image/jpeg","filePath":"./uploadFile/20190716/201907161657044712.jpg","submitName":null}]*/
+                                        try {
+                                            viewModel.loadingDialogStatus.value =
+                                                TaskUiModel.success("上传成功")
+                                            val jsonArray = JSONArray(response)
+                                            LogUtils.eTag(
+                                                "图片",
+                                                JSON.toJSONString(jsonArray)
+                                            )
+                                            for (i in 0 until jsonArray.length()) {
+                                                reverseUploadFile =
+                                                    (jsonArray.get(i) as JSONObject).getString(
+                                                        "filePath"
+                                                    )
+                                                reverseImageString.value = it
+                                                LogUtils.e("hidahdashd", reverseUploadFile)
+                                            }
+                                        } catch (e: JSONException) {
+                                            e.printStackTrace()
+                                        }
+
+                                    }
+                                },
+                                10000.0,
+                                SPUtils.getInstance().getString(Constant.uploadUrl)
+                            )
+                        }
+                    }
+
+                }.lparams(autoSize(480), autoSize(288))
+
+                imageView {
+                    reverseImageString.bindOptional(context) {
+                        if (it.isNullOrEmpty()) {
+                            visibility = View.GONE
+                        } else {
+                            visibility = View.VISIBLE
+                            setImageURI(Uri.parse(it))
+                        }
+                    }
+                    visibility = View.GONE
+                    onThrottleFirstClick {
+                        val path = reverseImageString.value.guard {
+                            return@onThrottleFirstClick
+                        }
+                        PhotoUtils().showImageViewer(
+                            this@ApplyPromotionCodeActivity,
+                            1,
+                            arrayListOf(path)
+                        )
+                    }
+                }.lparams(autoSize(480), autoSize(288)) {
+                    marginStart = autoSize(250)
+                }
+            }.lparams(matchParent, autoSize(288)){
+                topMargin = autoSize(40)
+            }
+        }
+    }
+
+}

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/MyPromotionCodeActivity.kt

@@ -24,6 +24,8 @@ class MyPromotionCodeActivity : BaseActivity<MyPromotionCodeViewModel>(){
     val code by lazy { intent.getStringExtra("code") }
 
 
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {

+ 6 - 1
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/promotioncode/MyPromotionCodeViewModel.kt

@@ -1,12 +1,17 @@
 package cn.muchinfo.rma.view.base.main.promotioncode
 
+import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.view.base.BaseViewModel
+import mtp.polymer.com.autowidget.utils.TaskUiModel
 
 /**
  * 我的推广码页面viewmodel
  */
 class MyPromotionCodeViewModel : BaseViewModel(){
 
-
+    /**
+     * 加载状态控制
+     */
+    val loadingDialogStatus: MutableLiveData<TaskUiModel> = MutableLiveData()
 
 }

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/reward/MyRewardActivity.kt

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.main.reward
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
@@ -43,6 +44,7 @@ class MyRewardActivity : BaseActivity<MyRewardViewModel>(){
     /**
      * 初始化查询起始和结束日期
      */
+    @SuppressLint("SimpleDateFormat")
     fun initTime() {
         startTime.postValue(GlobalDataCollection.instance?.oneMonth() ?: "")
         endTime.postValue(TimeUtils.getNowString(SimpleDateFormat("yyyy-MM-dd")))

+ 1 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/reward/RewardRuleActivity.kt

@@ -11,6 +11,7 @@ import org.jetbrains.anko.*
  * #DAEDFF 线颜色
  * 奖励规则页面
  */
+@Suppress("DEPRECATION")
 class RewardRuleActivity : BaseActivity<MyRewardViewModel>(){
 
     override fun onCreate(savedInstanceState: Bundle?) {

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/reward/RewardViewHolder.kt

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.main.reward
 
+import android.annotation.SuppressLint
 import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
@@ -21,6 +22,7 @@ import org.jetbrains.anko.*
 class RewardViewHolder(private val activity : AppCompatActivity) : BaseViewHolder<BrokerRewardLogData>(activity){
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
+    @SuppressLint("RtlHardcoded")
     override fun _FrameLayout.createContentView() {
         verticalLayout {
             linearLayout {

+ 2 - 0
RMA/app/src/main/java/cn/muchinfo/rma/view/base/main/team/MyTeamActivity.kt

@@ -37,6 +37,8 @@ import org.jetbrains.anko.sdk25.coroutines.textChangedListener
  */
 class MyTeamActivity : BaseActivity<MyTeamViewModel>(){
 
+
+
     lateinit var segment: QMUITabSegment
     var selectedTabIndex: Int = 0
     private lateinit var viewPager: ViewPager

BIN
RMA/app/src/main/res/mipmap-xhdpi/qhj_add_positive_idcard.png


Some files were not shown because too many files changed in this diff