任务 #93385 签约流程去掉“2.阅读风险提示”字样

任务 #93140  APP登录界面增加勾选项“记住密码”
任务 #93486 目前将银行支行的配置打开后管理端能看到支行名称信息，终端没有适配显示，需要增加  (管理端完成）

app/src/main/java/mtp/polymer/com/EntryActivity_BAK.java

@@ -300,7 +300,7 @@ public class EntryActivity_BAK extends MyAppCompatActivity implements View.OnCli
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 mtp_login_pass_del.setVisibility("".equals(s.toString().trim()) ? View.INVISIBLE : View.VISIBLE);
 //                if (isChangeAccount == 1){//20200603做的功能，过了一个晚上20200604不要了
-                if (Config.IS_JKD){//这里有记住密码的功能，但是只支持在金口袋和零边界上，其他暂时屏蔽
+//                if (Config.IS_JKD){//这里有记住密码的功能，但是只支持在金口袋和零边界上，其他暂时屏蔽
                     Map<String,String> oldMap = Utils.getHashMapData(DefaultPreference.MTP_LOGIN_ACCOUNT);
                     String psw = oldMap.get(s.toString().trim());
                     LogUtils.eTag("DefaultPreference.MTP_LOGIN_ACCOUNT", "==== " + psw + " ===");
@@ -317,7 +317,7 @@ public class EntryActivity_BAK extends MyAppCompatActivity implements View.OnCli
                     }
                 }
 //                }
-            }
+//            }
 
             @Override
             public void afterTextChanged(Editable s) {
@@ -367,11 +367,11 @@ public class EntryActivity_BAK extends MyAppCompatActivity implements View.OnCli
 
     private void initViews() {
         p_tips = findViewById(R.id.p_tips);
-        if (Config.IS_JKD){
+//        if (Config.IS_JKD){
             p_tips.setVisibility(View.VISIBLE);
-        }else {
-            p_tips.setVisibility(View.GONE);
-        }
+//        }else {
+//            p_tips.setVisibility(View.GONE);
+//        }
         p_tips.setChecked(SPUtils.getInstance().getBoolean(Constent.REMEMBERPSWTYPE,true));
         phone_login_all = findViewById(R.id.phone_login_all);
         forget_password = findViewById(R.id.forget_password);

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/FeedbackActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
+import android.text.InputType
 import android.text.TextUtils
 import android.view.Gravity
 import android.widget.EditText
@@ -28,6 +29,7 @@ class FeedbackActivity : MyAppCompatActivity() {
     }
 
     private lateinit var inputEdit: EditText
+    private lateinit var phoneEdit: EditText
     private var loadingDialog: Dialog? = null
     private lateinit var textAmount : TextView
 
@@ -108,12 +110,47 @@ class FeedbackActivity : MyAppCompatActivity() {
                 }
 
                 textView {
+                    text = "联系电话"
+                    textSizeAuto = 40
+                    textColorInt = R.color.p_global_black_color
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = margerding
+                    topMargin = autoSize(32)
+                }
+
+                editText{
+                    phoneEdit = this
+                    gravity = Gravity.TOP
+                    hintColorStr = "#cccccc"
+                    textColorStr = "#000000"
+                    inputType = InputType.TYPE_CLASS_PHONE
+                    hint = "请输入联系电话"
+                    maxLines = 1
+                    maxEms = 15
+                    ellipsize = TextUtils.TruncateAt.END
+                    backgroundDrawable = createRoundRectDrawable("#f6f6f8", 10)
+                    textSizeAuto = 36
+                    setPadding(autoSize(20), autoSize(20),0,autoSize(20))
+                }.lparams(matchParent, matchParent) {
+                    marginStart = autoSize(20)
+                    marginEnd = autoSize(20)
+                }
+
+                textView {
                     onThrottleFirstClick {
                         if (inputEdit.text.toString().isNullOrEmpty()) {
                             ToastUtils.showLong("请输入留言内容")
                             return@onThrottleFirstClick
                         }
-                        viewModule.addMessageBoard(message = inputEdit.text.toString())
+                        if (phoneEdit.text.toString().isNullOrEmpty()) {
+                            ToastUtils.showLong("请输入联系电话")
+                            return@onThrottleFirstClick
+                        }
+                        if (phoneEdit.text.toString().length < 7) {
+                            ToastUtils.showLong("请输入正确的联系电话")
+                            return@onThrottleFirstClick
+                        }
+                        viewModule.addMessageBoard(message = inputEdit.text.toString(), phone = phoneEdit.text.toString().trim())
                     }
                     text = "提交留言"
                     backgroundResource = R.drawable.hn_market_item_botton_bg_2
@@ -141,7 +178,7 @@ class FeedbackActivity : MyAppCompatActivity() {
 
                     viewModule.messgelist.bindOptional(context) {
                         it?.forEach { data ->
-                            feedbackItemUI(data.message, TimeUtils.covnDate(data.createtime))
+                            feedbackItemUI(data.message, TimeUtils.covnDate(data.createtime), data.contactnum)
                         }
                     }
 
@@ -162,13 +199,14 @@ class FeedbackActivity : MyAppCompatActivity() {
         }
     }
 
-    private fun _LinearLayout.feedbackItemUI(messge: String, time: String) {
+    private fun _LinearLayout.feedbackItemUI(messge: String, time: String, phone: String) {
         val marginpadding = autoSize(32)
         linearLayout {
             onThrottleFirstClick {
                 val intentAccount = Intent()
                 intentAccount.putExtra("messge",messge)
                 intentAccount.putExtra("time",time)
+                intentAccount.putExtra("phone", phone)
                 intentAccount.setClass(context, FeedbackDetailsActivity::class.java)
                 startActivity(intentAccount)
             }

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/FeedbackDetailsActivity.kt

@@ -16,6 +16,10 @@ class FeedbackDetailsActivity : MyAppCompatActivity(){
         intent.getStringExtra("messge")
     }
 
+    val phone : String by lazy {
+        intent.getStringExtra("phone")
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
@@ -54,6 +58,24 @@ class FeedbackDetailsActivity : MyAppCompatActivity(){
                 marginEnd = margerding
                 topMargin = margerding
             }
+
+            view {
+                background = resources.getDrawable(R.color.hn_text_hint_color)
+            }.lparams(matchParent, autoSize(1)){
+                marginStart = margerding
+                marginEnd = margerding
+                topMargin = margerding
+            }
+
+            textView {
+                text = phone
+                textColorInt = R.color.p_global_black_color
+                textSizeAuto = 34
+            }.lparams(wrapContent, wrapContent) {
+                marginStart = margerding
+                marginEnd = margerding
+                topMargin = margerding
+            }
         }
     }
 

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/HnSettingActivity.kt

@@ -355,7 +355,7 @@ class HnSettingActivity : MyAppCompatActivity() {
     }
 
     private fun isJumps() {
-        if (GlobalDataCollention.getInstance().authStatus == 0) {
+        if (GlobalDataCollention.getInstance().authStatus != 1) {  // fixme 任务 #93385  判断是否认证的问题
             val customDialog = CustomDialog(this, object : OnCustomClickListener {
                 override fun onOK(v: View) {
                     // 跳转到签约第一步

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/MainViewModel.kt

@@ -164,13 +164,14 @@ class MainViewModel : ViewModel() {
 //        val profit =  accountShowData.keep_profit_and_loss.toDouble() + accountShowData.close_watch_profit_and_loss.toDouble()
     }
 
-    fun addMessageBoard(message: String) {
+    fun addMessageBoard(message: String, phone: String) {
         if(isTouristor.value!!) return; // 游客模式下不访问该接口
         loadingDialogStatus.value = TaskUiModel.inFlight("留言提交中...")
         OkHttpUtils.post()
                 .url(AddressConfig.AUTH_GO_URL + "/User/AddMessageBoard")
                 .addParams("userID", GlobalDataCollention.getInstance().accountInfoData.userID.toString())
                 .addParams("message", message)
+                .addParams("contactNum", phone)
                 .addHeader("Authorization", SPUtils.getInstance().getString("token"))
                 .build()
                 .execute(object : StringCallback() {  //请求商品信息

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/data/FeedBackData.java

@@ -16,6 +16,7 @@ public class FeedBackData {
         private String messageboardid;
         private String userid;
         private String goodsid;
+        private String contactnum;
 
         public String getGoodsid() {
             return goodsid;
@@ -56,6 +57,14 @@ public class FeedBackData {
         public void setUserid(String userid) {
             this.userid = userid;
         }
+
+        public String getContactnum() {
+            return contactnum;
+        }
+
+        public void setContactnum(String contactnum) {
+            this.contactnum = contactnum;
+        }
     }
 
     public int getCode() {

app/src/main/java/mtp/polymer/com/main/my/sign/fragment/SignApplyFragment.java

@@ -30,6 +30,7 @@ import mtp.polymer.com.main.my.sign.adapter.SignApplyListAdapter;
 
 /**
  * 1.选择签约银行
+ * fixme 任务 #93385  签约流程去掉“2.阅读风险提示”字样 海商
  *
  * @author Administrator
  */
@@ -79,10 +80,10 @@ public class SignApplyFragment extends MyAppFragment implements OnClickListener,
         }
         ((SignFragment) getParentFragment()).setTtitle(title);// 设置title
 
-        if (Config.ZJSTATE || Config.ZJDEMOSTATE || Config.ZJREDESIGNSTATE) {
+//        if (Config.ZJSTATE || Config.ZJDEMOSTATE || Config.ZJREDESIGNSTATE ){
             apply_riskTips.setVisibility(View.GONE);
-            apply_line.setText(getString(R.string.p_line_input_sign_info));
-        }
+            apply_line.setText(getString(R.string. p_line_input_sign_info));
+//        }
         // 查看托管银行
         MessageHeadBase base = new MessageHeadBase();
         TaAccountInfoData taAccountInfo = GlobalDataCollention.getInstance().getCurr_accountInfoData();

app/src/main/java/mtp/polymer/com/main/my/sign/fragment/UserSignInfoFragment.java

@@ -131,10 +131,10 @@ public class UserSignInfoFragment extends MyAppFragment implements OnClickListen
         edtMobilePhone = view.findViewById(R.id.edtMobilePhone);//手机号码
         sign_riskTips = view.findViewById(R.id.sign_riskTips);
         sign_line = view.findViewById(R.id.sign_line);
-        if (Config.ZJSTATE || Config.ZJDEMOSTATE || Config.ZJREDESIGNSTATE) {
+//        if (Config.ZJSTATE || Config.ZJDEMOSTATE || Config.ZJREDESIGNSTATE) {
             sign_riskTips.setVisibility(View.GONE);
             sign_line.setText(getString(R.string.p_line_input_sign_info));
-        }
+//        }
 
 
     }

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

@@ -217,7 +217,7 @@
 
         <CheckBox
             android:checked="true"
-            android:layout_marginStart="25dp"
+            android:layout_marginStart="50dp"
             android:layout_width="wrap_content"
             android:id="@+id/p_tips"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -231,7 +231,7 @@
 
         <CheckBox
             android:checked="true"
-            android:layout_marginStart="25dp"
+            android:layout_marginStart="50dp"
             android:layout_width="wrap_content"
             android:id="@+id/p_tips"
             app:layout_constraintStart_toStartOf="parent"

businesslayer/src/main/java/mtp/polymer/com/businesslayer/models/queryCommon/qryPositionBase/HnHomeBannerData.java

@@ -20,6 +20,7 @@ public class HnHomeBannerData {
         private String sort;
 
 
+
         public String getConfigid() {
             return configid;
         }