修复部分bug

o2android/app/assets/server.json

@@ -1,7 +1,7 @@
 {
   "id" : "o2CenterServer",
   "name" : "develop",
-  "centerHost" : "dev.o2oa.net",
+  "centerHost" : "dd.o2oa.net",
   "centerContext" : "/x_program_center",
   "centerPort" : 20030,
   "httpProtocol" : "http"

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/login/LoginActivity.kt

@@ -127,7 +127,8 @@ class LoginActivity: BaseMVPActivity<LoginContract.View, LoginContract.Presenter
         checkBioAuthLogin()
         if (BuildConfig.InnerServer) {
             login_edit_password_id.setHint(R.string.activity_login_password)
-            login_edit_password_id.inputType = InputType.TYPE_TEXT_VARIATION_PASSWORD
+            login_edit_password_id.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+//            InputType.TYPE_TEXT_VARIATION_PASSWORD
             button_login_phone_code.gone()
             tv_rebind_btn.gone()
             tv_bioauth_btn.gone()
@@ -253,7 +254,7 @@ class LoginActivity: BaseMVPActivity<LoginContract.View, LoginContract.Presenter
     }
 
     override fun loginFail() {
-        XToast.toastShort(this,  "登录失败, 请检查您的验证码是否输入正确！")
+        XToast.toastShort(this,  "登录失败, 请检查您的输入的用户名或密码是否正确！")
         hideLoadingDialog()
     }
 

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/main/IndexFragment.kt

@@ -405,19 +405,25 @@ class IndexFragment : BaseMVPViewPagerFragment<IndexContract.View, IndexContract
                     ApplicationEnum.isNativeApplication(t?.appId) -> holder?.setImageViewResource(R.id.app_id, ApplicationEnum.getApplicationByKey(t?.appId).iconResId)
                     t?.appId == ALL_APP_ID -> holder?.setImageViewResource(R.id.app_id, R.mipmap.ic_todo_more)
                     else -> {
-                        val bitmap = BitmapFactory.decodeFile(O2CustomStyle.processDefaultImagePath(activity))
-                        if (bitmap != null) {
-                            holder?.setImageViewBitmap(R.id.app_id, bitmap)
-                        } else {
-                            //holder?.setImageViewResource(R.id.app_id, R.mipmap.process_default)
-                            if (t?.appId != null){
-                                val portalIconUrl = APIAddressHelper.instance().getPortalIconUrl(t.appId!!)
-                                val icon = holder?.getView<ImageView>(R.id.app_id)
-                                if (icon !=null) {
-                                    O2ImageLoaderManager.instance().showImage(icon, portalIconUrl, O2ImageLoaderOptions(placeHolder = R.mipmap.process_default))
-                                }
-                            }
+
+                        val portalIconUrl = APIAddressHelper.instance().getPortalIconUrl(t?.appId!!)
+                        val icon = holder?.getView<ImageView>(R.id.app_id)
+                        if (icon !=null) {
+                            O2ImageLoaderManager.instance().showImage(icon, portalIconUrl, O2ImageLoaderOptions(placeHolder = R.mipmap.process_default))
                         }
+//                        val bitmap = BitmapFactory.decodeFile(O2CustomStyle.processDefaultImagePath(activity))
+//                        if (bitmap != null) {
+//                            holder?.setImageViewBitmap(R.id.app_id, bitmap)
+//                        } else {
+//                            //holder?.setImageViewResource(R.id.app_id, R.mipmap.process_default)
+//                            if (t?.appId != null){
+//                                val portalIconUrl = APIAddressHelper.instance().getPortalIconUrl(t.appId!!)
+//                                val icon = holder?.getView<ImageView>(R.id.app_id)
+//                                if (icon !=null) {
+//                                    O2ImageLoaderManager.instance().showImage(icon, portalIconUrl, O2ImageLoaderOptions(placeHolder = R.mipmap.process_default))
+//                                }
+//                            }
+//                        }
                     }
                 }
                 holder?.setText(R.id.app_name_id, t?.appTitle)

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/main/IndexPresenter.kt

@@ -74,25 +74,44 @@ class IndexPresenter : BasePresenterImpl<IndexContract.View>(), IndexContract.Pr
     }
 
     override fun getMyAppList() {
-        RealmDataService().findMyAppList()
-                .subscribeOn(Schedulers.io())
-                .flatMap { result ->
-                    XLog.debug("getmyApplist..........................${result.size}.")
-                    val list = ArrayList<MyAppListObject>()
-                    if (result.isEmpty()) {
-                        ApplicationEnum.values().mapIndexed { index, applicationEnum ->
-                            if (index < 4) {
-                                val myObj = MyAppListObject()
-                                myObj.appId = applicationEnum.key
-                                myObj.appTitle = applicationEnum.appName
-                                list.add(myObj)
-                            }
-                        }
-                    } else {
-                        list.addAll(result)
+        Observable.zip(RealmDataService().findAllNativeApp(), RealmDataService().findAllPortalList(), RealmDataService().findMyAppList()){ all, allPortal, my ->
+            val list = ArrayList<MyAppListObject>()
+            if (my.isEmpty()) {
+                for (appItemOnlineVo  in all) {
+                    if (list.size < 4 && appItemOnlineVo.enable) {
+                        val myObj = MyAppListObject()
+                        myObj.appId = appItemOnlineVo.key
+                        myObj.appTitle = appItemOnlineVo.name
+                        list.add(myObj)
+                    }
+                }
+            }else {
+                for (myAppListObject in my) {
+                    if (all.any { vo -> vo.key == myAppListObject.appId && vo.enable } || allPortal.any{ p -> p.id == myAppListObject.appId && p.enable}) {
+                        list.add(myAppListObject)
                     }
-                    Observable.just(list)
                 }
+//                list.addAll(my)
+            }
+            list
+        }.subscribeOn(Schedulers.io())
+//                .flatMap { result ->
+//                    XLog.debug("getmyApplist..........................${result.size}.")
+//                    val list = ArrayList<MyAppListObject>()
+//                    if (result.isEmpty()) {
+//                        ApplicationEnum.values().mapIndexed { index, applicationEnum ->
+//                            if (index < 4) {
+//                                val myObj = MyAppListObject()
+//                                myObj.appId = applicationEnum.key
+//                                myObj.appTitle = applicationEnum.appName
+//                                list.add(myObj)
+//                            }
+//                        }
+//                    } else {
+//                        list.addAll(result)
+//                    }
+//                    Observable.just(list)
+//                }
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         { result ->

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/process/StartProcessStepOneFragment.kt

@@ -4,6 +4,7 @@ import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
+import android.text.TextUtils
 import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.fragment_start_process_step_one.*
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.O2
@@ -140,7 +141,8 @@ class StartProcessStepOneFragment : BaseMVPFragment<StartProcessStepOneContract.
 
     override fun startProcessSuccess(workId: String) {
         hideLoadingDialog()
-        (activity as StartProcessActivity).go<TaskWebViewActivity>(TaskWebViewActivity.start(workId, "", "拟稿"))
+        val name = if (clickProcess != null && !TextUtils.isEmpty(clickProcess?.name)){ clickProcess?.name?: "拟稿"}else{"拟稿"}
+        (activity as StartProcessActivity).go<TaskWebViewActivity>(TaskWebViewActivity.start(workId, "", name))
         (activity as StartProcessActivity).finish()
     }
 

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/process/StartProcessStepTwoFragment.kt

@@ -14,6 +14,7 @@ import net.zoneland.x.bpm.mobile.v1.zoneXBPM.model.bo.api.o2.ProcessDraftWorkDat
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.DateHelper
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.XLog
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.XToast
+import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.extension.go
 import net.zoneland.x.bpm.mobile.v1.zoneXBPM.utils.extension.goThenKill
 import org.jetbrains.anko.dip
 
@@ -102,10 +103,8 @@ class StartProcessStepTwoFragment : BaseMVPFragment<StartProcessStepTwoContract.
 
     override fun startProcessSuccess(workId: String) {
         hideLoadingDialog()
-        val bundle = Bundle()
-        bundle.putString(TaskWebViewActivity.WORK_WEB_VIEW_WORK, workId)
-        bundle.putString(TaskWebViewActivity.WORK_WEB_VIEW_TITLE, "拟稿")
-        (activity as StartProcessActivity).goThenKill<TaskWebViewActivity>(bundle)
+        val name = if (!TextUtils.isEmpty(processName)){ processName}else{"拟稿"}
+        (activity as StartProcessActivity).goThenKill<TaskWebViewActivity>(TaskWebViewActivity.start(workId, "", name))
     }
 
     override fun startProcessFail(message:String) {

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/o2/process/TaskCompletedWorkListFragment.kt

@@ -38,7 +38,7 @@ class TaskCompletedWorkListFragment : DialogFragment(), TaskCompletedWorkListCon
             override fun convert(holder: CommonRecyclerViewHolder?, t: WorkVO?) {
                 if (t != null) {
                     val content = if (t is Work) {
-                        "文件于 ${t.startTime} 流转至 ${t.activityName} "
+                        "文件于 ${t.startTime} 流转至 ${t.activityName} ，处理人：${t.manualTaskIdentityText ?: ""}"
                     } else if (t is WorkCompleted) {
                         "${t.title} 文件于 ${t.completedTime} 流转完成"
                     } else {
@@ -122,6 +122,7 @@ class TaskCompletedWorkListFragment : DialogFragment(), TaskCompletedWorkListCon
 
     override fun loadWorkCompletedInfo(info: TaskCompleteInfoDataWithControl) {
         circleProgressBar_task_completed_work.gone()
+
         tv_fragment_task_completed_work_list_application?.text = info.applicationName ?: ""
         tv_fragment_task_completed_work_list_title?.text = formatTitle(info.title, info.processName)
         tv_fragment_task_completed_work_list_node?.text = info.activityName ?: ""

o2android/o2_auth_sdk/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/core/component/api/ExceptionHandler.kt

@@ -25,7 +25,7 @@ class ExceptionHandler(val context: Context?,
             is TimeoutException -> showConnectionErrorMessage()
             is SocketTimeoutException -> showConnectionErrorMessage()
             is ConnectException -> showConnectionErrorMessage()
-            is HttpException -> showO2ErrorMessage(t)
+            //is HttpException -> showO2ErrorMessage(t)
             else -> Log.e("ExceptionHandler", "", t)
         }
 

o2android/o2_auth_sdk/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/model/vo/WorkVO.kt

@@ -38,6 +38,8 @@ open class WorkVO(
 
         var processName: String? = null,
 
-        var control: WorkControlData? = null
+        var control: WorkControlData? = null,
+
+        var manualTaskIdentityText: String? = null
 
 )