feat : 微信支付，问诊弹窗

app/build.gradle

@@ -198,7 +198,8 @@ dependencies {
 
         api project(':m-home')
         api project(':m-confide')
-        api project(':ydl-medical-pay')
+//        api project(':ydl-medical-pay')
+        api rootProject.ext.dependencies["ydl-medical-pay"]
 
 
         implementation project(':ydl-flutter-base')

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -105,7 +105,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 
         yl_twwz.setOnClickListener {
             //医疗图文问诊
-            GraphicConsultationFlow1Activity.start(this@MainActivity,"10622","130953969")
+            GraphicConsultationFlow1Activity.start(this@MainActivity,"10586","130953108")
         }
 
         yl_yhdangan_list.setOnClickListener {

app/src/main/java/com/ydl/component/base/ComponentTestApp.java

@@ -67,10 +67,10 @@ public class ComponentTestApp extends BaseApp {
         }
 
         //umeng
-        String umAppkey = "56970affe0f55a9cda001e24";
+        String umAppkey = "6126f317a8f28d032fa7535c";
         channel = "android_" + channel;
         initUM(umAppkey, channel);
-        PlatformConfig.setWeixin("wx57a9d930270498c7", "17c031f02500ded3457a80e69d8e5e45");
+        PlatformConfig.setWeixin("wxdc73923f4cf27b53", "2927c4ee158eae6f25a50dd6e55ac0cb");
         PlatformConfig.setWXFileProvider("com.cxzapp.yidianling.fileprovider");
         PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR");
         PlatformConfig.setQQFileProvider("com.cxzapp.yidianling.fileprovider");

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.kt

@@ -122,13 +122,13 @@ class DemoAppLifecycles : IAppLifecycles {
 
                 //umeng
                 var umAppkey: String? = null
-                if (BuildConfig.FLAVOR.endsWith("ydl")) {
-                    umAppkey = "56970affe0f55a9cda001e24"
+                if (BuildConfig.FLAVOR.endsWith("ydl") || BuildConfig.FLAVOR.endsWith("medical")) {
+                    umAppkey = "6126f317a8f28d032fa7535c"
                     channel = "android_$channel"
                     initUM(umAppkey, channel, application)
                     PlatformConfig.setWeixin(
-                        "wx57a9d930270498c7",
-                        "17c031f02500ded3457a80e69d8e5e45"
+                        "wxa1f1331fa005f4e7",
+                        "4504c9a5ecf821e5d00c0922ad1f04b2"
                     )
                     PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR")
                 } else if (BuildConfig.FLAVOR.endsWith("xlzx")) {

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -19,9 +19,8 @@ import java.util.List;
  */
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
-    //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-    public static String appEnv = YDLConstants.ENV_TEST;
-//    public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
+//    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_NEW_TEST;
 //    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.03",
             "m-user"          : "0.0.61.84",
             "m-home"          : "0.0.22.70",
-            "m-im"            : "0.0.20.48",
+            "m-im"            : "0.0.20.55",
             "m-dynamic"       : "0.0.7.28",
             "m-article"       : "0.0.0.10",
 
@@ -39,7 +39,7 @@ ext {
             "ydl-webview"     : "0.0.38.53",
             "ydl-media"       : "0.0.21.10",
             "ydl-pay"         : "0.0.18.19",
-            "ydl-medical-pay" : "0.0.01.09",
+            "ydl-medical-pay" : "0.0.01.19",
             "m-audioim"       : "0.0.49.29.37",
             "ydl-flutter-base": "0.0.14.26",
 
@@ -94,7 +94,7 @@ ext {
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.84",
             "m-home"          : "0.0.22.70",
-            "m-im"            : "0.0.20.48",
+            "m-im"            : "0.0.20.55",
             "m-dynamic"       : "0.0.7.28",
             "m-article"       : "0.0.0.8",
 
@@ -122,7 +122,7 @@ ext {
             "ydl-webview"     : "0.0.38.53",
             "ydl-media"       : "0.0.21.10",
             "ydl-pay"         : "0.0.18.19",
-            "ydl-medical-pay" : "0.0.01.09",
+            "ydl-medical-pay" : "0.0.01.19",
             "m-audioim"       : "0.0.49.29.37",
             "ydl-flutter-base": "0.0.14.26",
 

m-im/src/main/java/com/yidianling/im/session/SessionHelper.java

@@ -285,30 +285,30 @@ public class SessionHelper {
             actions.add(new ImageAction());
             actions.add(new VideoAction());
             //语音视频
-            if ((ImIn.INSTANCE.getUserInfo().getUser_type() == 1 && (user_type == 1 || user_type == 3)) || user_type == -1) {//1代表用户不能和用户聊天
-            } else {
-                // 助理也不能跟用户电话/视频聊天
-                if (ImIn.INSTANCE.getUserInfo().getUser_type() != 3) {
-                    actions.add(new H5VideoAction(AVChatType.AUDIO));
-                }
-            }
-            if (user_type == 2) {
-                actions.add(new OrderAction());
-            }
+//            if ((ImIn.INSTANCE.getUserInfo().getUser_type() == 1 && (user_type == 1 || user_type == 3)) || user_type == -1) {//1代表用户不能和用户聊天
+//            } else {
+//                // 助理也不能跟用户电话/视频聊天
+//                if (ImIn.INSTANCE.getUserInfo().getUser_type() != 3) {
+//                    actions.add(new H5VideoAction(AVChatType.AUDIO));
+//                }
+//            }
+//            if (user_type == 2) {
+//                actions.add(new OrderAction());
+//            }
             //跟ios同步，助理也不展示帮助按钮
 //            if (ImIn.INSTANCE.getUserInfo().getUser_type() != 3) {
 //                actions.add(new HelpAction());
 //            }
 
-            if (user_type == 2) {
-                actions.add(new RedPacketAction());
-            }
+//            if (user_type == 2) {
+//                actions.add(new RedPacketAction());
+//            }
 
             //助理
-            if (ImIn.INSTANCE.getUserInfo().getUser_type() == 3) {
-                actions.add(new MakeCollectionsAction()); // 发起收款
-                actions.add(new SendCardAction()); // 发送客服名片
-            }
+//            if (ImIn.INSTANCE.getUserInfo().getUser_type() == 3) {
+//                actions.add(new MakeCollectionsAction()); // 发起收款
+//                actions.add(new SendCardAction()); // 发送客服名片
+//            }
 
             p2pCustomization.actions = actions;
 

m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt

@@ -160,6 +160,30 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
             backCheck()
         }
 
+        showDialogTip()
+    }
+
+    private fun showDialogTip() {
+        val builder = NormalDialog.Builder(this@GraphicConsultationFlow1Activity, "center", true)
+        builder.setTitle("")
+        builder.setMessage("\n为向您添加的就诊人提供问诊服务，您需要向我们提供该就诊人的身份证号码，并确保在提供前已取得该就诊人的授权同意；若该就诊人为儿童的，您需要在提供前征得该儿童监控人的同意。\n")
+        builder.setPositiveButton(
+            "不同意"
+        ) { dialog, which ->
+            //关闭页面
+            finish()
+            dialog.dismiss()
+        }.setNegativeButton(
+            "同意"
+        ) { dialog, which ->
+
+            dialog.dismiss()
+        }
+        builder.setRight_color("#3464EC")
+        builder.setLeft_color("#3464EC")
+        builder.setContent_color("#10233A")
+        builder.create().show()
+
     }
 
     @SuppressLint("CheckResult")

m-im/src/main/res/layout/im_nim_inquiry_end_layout.xml

@@ -5,7 +5,6 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
     android:layout_marginTop="@dimen/platform_dp_12"
-    android:layout_marginRight="8dp"
     android:background="#80d7dfea"
     app:cardBackgroundColor="#80d7dfea"
     android:elevation="0dp"

m-im/src/main/res/layout/im_nim_inquiry_receive_layout.xml

@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     android:layout_gravity="right"
     android:layout_marginTop="@dimen/platform_dp_12"
-    android:layout_marginRight="8dp"
     android:background="@color/white"
     android:elevation="0dp"
     android:maxWidth="263dp"

m-im/src/main/res/layout/medical_add_new_archives_activity.xml

@@ -197,7 +197,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="与受访者的关系"
+            android:text="与问诊人的关系"
             android:textColor="#ff0c1d31"
             android:textSize="14sp"
             app:layout_constraintLeft_toLeftOf="@id/tv_name"

m-im/src/main/res/layout/medical_edit_archives_activity.xml

@@ -150,7 +150,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="与受访者的关系"
+            android:text="与问诊人的关系"
             android:textColor="#ff0c1d31"
             android:textSize="14sp"
             app:layout_constraintLeft_toLeftOf="@id/tv_name"

m-im/src/main/res_uikit/layout/im_nim_message_item.xml

@@ -18,7 +18,7 @@
         android:layout_marginTop="@dimen/im_bubble_time_layout_margin_top"
         android:paddingLeft="6dp"
         android:paddingRight="6dp"
-        android:textColor="#cccccc"
+        android:textColor="#8595A9"
         android:textSize="12dp"
         android:visibility="gone"
         tools:visibility="visible"

ydl-medical-pay/src/main/java/com/medical/ydl/medical/pay/MedicalPayActivity.kt

@@ -112,6 +112,7 @@ class MedicalPayActivity : BaseActivity() {
         mPrice = intent.getStringExtra(PRICE_KEY)
         mOrderId = intent.getStringExtra(ORDER_KEY)
         mDoctorUid = intent.getStringExtra(DOCTORUID_KEY)
+        payType = PAY_WECHAT
 
         price.text = mPrice
         ll_alipay.setOnClickListener {
@@ -248,13 +249,12 @@ class MedicalPayActivity : BaseActivity() {
             // 必须异步调用
             var payThread = Thread(payRunnable)
             payThread.start()
-        } else {
+        } else if (payType == PAY_WECHAT) {
             var option = response.data
-            val api = WXAPIFactory.createWXAPI(this@MedicalPayActivity, null)
+            val api = WXAPIFactory.createWXAPI(applicationContext, option.appid, true)
             if (api.wxAppSupportAPI < Build.PAY_SUPPORTED_SDK_INT) {
                 ToastUtil.toastShort("目前您的微信版本过低或未安装微信，需要安装微信才能使用")
             }
-
             api.registerApp(option.appid)
             val request = PayReq()
             request.appId = option.appid
@@ -265,6 +265,9 @@ class MedicalPayActivity : BaseActivity() {
             request.timeStamp = option.timestamp
             request.sign = option.sign
             api.sendReq(request)
+
+        } else {
+            ToastUtil.toastShort("支付类型出错")
         }
 
     }